mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-11 12:15:34 +03:00
Merge 2169c86993
into haskell-updates
This commit is contained in:
commit
6a17058f9f
461 changed files with 5115 additions and 7743 deletions
|
@ -2102,6 +2102,14 @@ Note this method is preferred over adding parameters to builders, as that can
|
|||
result in packages depending on different variants and thereby causing
|
||||
collisions.
|
||||
|
||||
::: {.note}
|
||||
The `optional-dependencies` attribute should only be used for dependency groups
|
||||
as defined in package metadata. If a package gracefully handles missing
|
||||
dependencies in runtime but doesn't advertise it through package metadata, then
|
||||
these dependencies should not be listed at all. (One may still have to list
|
||||
them in `nativeCheckInputs` to pass test suite.)
|
||||
:::
|
||||
|
||||
### How to contribute a Python package to nixpkgs? {#tools}
|
||||
|
||||
Packages inside nixpkgs must use the [`buildPythonPackage`](#buildpythonpackage-function) or [`buildPythonApplication`](#buildpythonapplication-function) function directly,
|
||||
|
|
|
@ -121,8 +121,6 @@ let
|
|||
"uclibc"
|
||||
else if final.isAndroid then
|
||||
"bionic"
|
||||
else if final.isLLVMLibc then
|
||||
"llvm"
|
||||
else if
|
||||
final.isLinux # default
|
||||
then
|
||||
|
@ -248,7 +246,7 @@ let
|
|||
# don't support dynamic linking, but don't get the `staticMarker`.
|
||||
# `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always
|
||||
# has the `staticMarker`.
|
||||
isStatic = final.isWasi || final.isRedox || final.isLLVMLibc;
|
||||
isStatic = final.isWasi || final.isRedox;
|
||||
|
||||
# Just a guess, based on `system`
|
||||
inherit
|
||||
|
|
|
@ -386,7 +386,6 @@ rec {
|
|||
uclibceabi
|
||||
uclibceabihf
|
||||
];
|
||||
isLLVMLibc = [ { abi = abis.llvm; } ];
|
||||
|
||||
isEfi = [
|
||||
{
|
||||
|
|
|
@ -740,9 +740,6 @@ rec {
|
|||
};
|
||||
uclibc = { };
|
||||
|
||||
# LLVM libc
|
||||
llvm = { };
|
||||
|
||||
unknown = { };
|
||||
};
|
||||
|
||||
|
|
|
@ -12392,6 +12392,12 @@
|
|||
github = "kaeeraa";
|
||||
githubId = 99148867;
|
||||
};
|
||||
kagehisa = {
|
||||
name = "Sven Woelfel";
|
||||
email = "woelfel.pub@gmail.com";
|
||||
github = "kagehisa";
|
||||
githubId = 37015428;
|
||||
};
|
||||
kaiha = {
|
||||
email = "kai.harries@gmail.com";
|
||||
github = "KaiHa";
|
||||
|
|
|
@ -97,6 +97,7 @@ CROSS_TARGETS=(
|
|||
riscv64-unknown-linux-gnu
|
||||
s390x-unknown-linux-gnu
|
||||
x86_64-unknown-freebsd
|
||||
loongarch64-unknown-linux-gnu
|
||||
)
|
||||
|
||||
is_cross() {
|
||||
|
@ -264,14 +265,14 @@ EOF
|
|||
|
||||
# individual file entries
|
||||
cat <<EOF
|
||||
$attr = import <nix/fetchurl.nix> {
|
||||
$attr = import <nix/fetchurl.nix> {
|
||||
url = "http://tarballs.nixos.org/${s3_prefix}/${nixpkgs_revision}/$fname";
|
||||
hash = "${sri}";$(
|
||||
[[ -n ${executable_nix} ]] && printf "\n %s" "${executable_nix}"
|
||||
[[ -n ${name_nix} ]] && printf "\n %s" "${name_nix}"
|
||||
[[ -n ${unpack_nix} ]] && printf "\n %s" "${unpack_nix}"
|
||||
)
|
||||
};
|
||||
};
|
||||
EOF
|
||||
done
|
||||
# footer
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- Initial support for the [COSMIC DE](https://system76.com/cosmic), a Rust-based desktop environment by System76, makers of Pop!_OS. Toggle the greeter (login manager) using `services.displayManager.cosmic-greeter.enable` and the DE itself with `services.desktopManager.cosmic.enable`. Mostly stable but still experimental. Please report any issues to the [COSMIC DE tracker in Nixpkgs](https://github.com/NixOS/nixpkgs/issues/259641) instead of upstream.
|
||||
- NixOS now has initial support for the [**COSMIC DE**](https://system76.com/cosmic) which is currently at **Alpha 7**. COSMIC is a Rust-based Desktop Environment by System76, makers of Pop!_OS. Enable COSMIC by enabling the greeter (login manager) `services.displayManager.cosmic-greeter.enable` and the DE itself by enabling `services.desktopManager.cosmic.enable` options. The support in NixOS/nixpkgs is stable but still considered experimental because of the recent the addition. The COSMIC maintainers will be waiting for one more release of NixOS to determine if the experimental tag should be removed or not. Until then, please report any issues to the [COSMIC DE tracker in Nixpkgs](https://github.com/NixOS/nixpkgs/issues/259641) instead of upstream.
|
||||
|
||||
- `services.dex` now restarts upon changes to the `.environmentFile` or entries in `.settings.staticClients[].secretFile` when the entry is a `path` type.
|
||||
|
||||
|
@ -162,6 +162,8 @@
|
|||
|
||||
- [`yarr`](https://github.com/nkanaev/yarr), a small, web-based feed aggregator and RSS reader. Available as [services.yarr](#opt-services.yarr.enable).
|
||||
|
||||
- [OliveTin](https://www.olivetin.app/), gives safe and simple access to predefined shell commands from a web interface. Available as [services.olivetin](#opt-services.olivetin.enable).
|
||||
|
||||
- [Stash](https://github.com/stashapp/stash), An organizer for your adult videos/images, written in Go. Available as [services.stash](#opt-services.stash.enable).
|
||||
|
||||
- [vsmartcard-vpcd](https://frankmorgner.github.io/vsmartcard/virtualsmartcard/README.html), a virtual smart card driver. Available as [services.vsmartcard-vpcd](#opt-services.vsmartcard-vpcd.enable).
|
||||
|
@ -571,6 +573,11 @@
|
|||
|
||||
Note that all provided plugins must have versions/tags (string after `@`), even if upstream repo does not tag each release. For untagged plugins, you can either create an empty Go project and run `go get <plugin>` and see changes in `go.mod` to get the pseudo-version number, or provide a commit hash in place of version/tag for the first run, and update the plugin string based on the error output.
|
||||
|
||||
- `buildGoModule` now supports a self-referencing `finalAttrs:` parameter
|
||||
containing the final arguments including overrides.
|
||||
This allows packaging configuration to be overridden in a consistent manner by
|
||||
providing an alternative to `rec {}` syntax.
|
||||
|
||||
- KDE Partition Manager `partitionmanager`'s support for ReiserFS is removed.
|
||||
ReiserFS has not been actively maintained for many years. It has been marked as obsolete since Linux 6.6, and
|
||||
[is removed](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c01f664e4ca210823b7594b50669bbd9b0a3c3b0)
|
||||
|
|
|
@ -8,10 +8,19 @@
|
|||
}:
|
||||
|
||||
{
|
||||
imports = [ ../../../modules/virtualisation/cloudstack-config.nix ];
|
||||
imports = [
|
||||
|
||||
../../../modules/virtualisation/cloudstack-config.nix
|
||||
../../../modules/image/file-options.nix
|
||||
];
|
||||
|
||||
system.nixos.tags = [ "cloudstack" ];
|
||||
image.extension = "qcow2";
|
||||
system.build.image = config.system.build.cloudstackImage;
|
||||
system.build.cloudstackImage = import ../../../lib/make-disk-image.nix {
|
||||
inherit lib config pkgs;
|
||||
inherit (config.virtualisation) diskSize;
|
||||
baseName = config.image.baseName;
|
||||
format = "qcow2";
|
||||
configFile = pkgs.writeText "configuration.nix" ''
|
||||
{
|
||||
|
|
|
@ -11,6 +11,7 @@ let
|
|||
imageModules = {
|
||||
amazon = ../../maintainers/scripts/ec2/amazon-image.nix;
|
||||
azure = ../virtualisation/azure-image.nix;
|
||||
cloudstack = ../../maintainers/scripts/cloudstack/cloudstack-image.nix;
|
||||
digital-ocean = ../virtualisation/digital-ocean-image.nix;
|
||||
google-compute = ../virtualisation/google-compute-image.nix;
|
||||
hyperv = ../virtualisation/hyperv-image.nix;
|
||||
|
|
|
@ -185,7 +185,7 @@ in
|
|||
config = {
|
||||
hardware.enableAllHardware = true;
|
||||
|
||||
fileSystems = {
|
||||
fileSystems = lib.mkImageMediaOverride {
|
||||
"/boot/firmware" = {
|
||||
device = "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}";
|
||||
fsType = "vfat";
|
||||
|
|
|
@ -1604,6 +1604,7 @@
|
|||
./services/web-apps/mediagoblin.nix
|
||||
./services/web-apps/open-web-calendar.nix
|
||||
./services/web-apps/mobilizon.nix
|
||||
./services/web-apps/olivetin.nix
|
||||
./services/web-apps/openwebrx.nix
|
||||
./services/web-apps/outline.nix
|
||||
./services/web-apps/pds.nix
|
||||
|
|
|
@ -8,7 +8,10 @@ let
|
|||
cfg = config.programs.nh;
|
||||
in
|
||||
{
|
||||
meta.maintainers = [ lib.maintainers.viperML ];
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
NotAShelf
|
||||
viperML
|
||||
];
|
||||
|
||||
options.programs.nh = {
|
||||
enable = lib.mkEnableOption "nh, yet another Nix CLI helper";
|
||||
|
@ -19,9 +22,18 @@ in
|
|||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
description = ''
|
||||
The path that will be used for the `FLAKE` environment variable.
|
||||
The path that will be used for the `NH_FLAKE` environment variable.
|
||||
|
||||
`FLAKE` is used by nh as the default flake for performing actions, like `nh os switch`.
|
||||
`NH_FLAKE` is used by nh as the default flake for performing actions, such as
|
||||
`nh os switch`. This behaviour can be overriden per-command with environment
|
||||
variables that will take priority.
|
||||
|
||||
- `NH_OS_FLAKE`: will take priority for `nh os` commands.
|
||||
- `NH_HOME_FLAKE`: will take priority for `nh home` commands.
|
||||
- `NH_DARWIN_FLAKE`: will take priority for `nh darwin` commands.
|
||||
|
||||
The formerly valid `FLAKE` is now deprecated by nh, and will cause hard errors
|
||||
in future releases if `NH_FLAKE` is not set.
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -77,7 +89,7 @@ in
|
|||
environment = lib.mkIf cfg.enable {
|
||||
systemPackages = [ cfg.package ];
|
||||
variables = lib.mkIf (cfg.flake != null) {
|
||||
FLAKE = cfg.flake;
|
||||
NH_FLAKE = cfg.flake;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -286,7 +286,7 @@ in
|
|||
in
|
||||
{
|
||||
sudo = {
|
||||
source = "${cfg.package.out}/bin/sudo";
|
||||
source = "${lib.getExe cfg.package}";
|
||||
inherit
|
||||
owner
|
||||
group
|
||||
|
|
|
@ -20,6 +20,7 @@ let
|
|||
filter
|
||||
filterAttrsRecursive
|
||||
flatten
|
||||
getAttr
|
||||
hasAttrByPath
|
||||
isAttrs
|
||||
isDerivation
|
||||
|
@ -111,7 +112,9 @@ let
|
|||
hasAttrByPath (splitString "." component) cfg.config
|
||||
|| useComponentPlatform component
|
||||
|| useExplicitComponent component
|
||||
|| builtins.elem component (cfg.extraComponents ++ cfg.defaultIntegrations);
|
||||
|| builtins.elem component (
|
||||
cfg.extraComponents ++ cfg.defaultIntegrations ++ map (getAttr "domain") cfg.customComponents
|
||||
);
|
||||
|
||||
# Final list of components passed into the package to include required dependencies
|
||||
extraComponents = filter useComponent availableComponents;
|
||||
|
@ -842,6 +845,7 @@ in
|
|||
|
||||
# Custom components, maintained manually.
|
||||
"amshan"
|
||||
"benqprojector"
|
||||
];
|
||||
in
|
||||
{
|
||||
|
|
|
@ -12,7 +12,11 @@ in
|
|||
options.services.paretosecurity = {
|
||||
enable = lib.mkEnableOption "[ParetoSecurity](https://paretosecurity.com) [agent](https://github.com/ParetoSecurity/agent) and its root helper";
|
||||
package = lib.mkPackageOption pkgs "paretosecurity" { };
|
||||
trayIcon = lib.mkEnableOption "tray icon for ParetoSecurity";
|
||||
trayIcon = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = "Set to false to disable the tray icon and run as a CLI tool only.";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
|
152
nixos/modules/services/web-apps/olivetin.nix
Normal file
152
nixos/modules/services/web-apps/olivetin.nix
Normal file
|
@ -0,0 +1,152 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.olivetin;
|
||||
|
||||
settingsFormat = pkgs.formats.yaml { };
|
||||
in
|
||||
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ defelo ];
|
||||
|
||||
options.services.olivetin = {
|
||||
enable = lib.mkEnableOption "OliveTin";
|
||||
|
||||
package = lib.mkPackageOption pkgs "olivetin" { };
|
||||
|
||||
user = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "The user account under which OliveTin runs.";
|
||||
default = "olivetin";
|
||||
};
|
||||
|
||||
group = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "The group under which OliveTin runs.";
|
||||
default = "olivetin";
|
||||
};
|
||||
|
||||
path = lib.mkOption {
|
||||
type =
|
||||
with lib.types;
|
||||
listOf (oneOf [
|
||||
package
|
||||
str
|
||||
]);
|
||||
description = ''
|
||||
Packages added to the service's {env}`PATH`.
|
||||
'';
|
||||
defaultText = lib.literalExpression ''
|
||||
with pkgs; [ bash ]
|
||||
'';
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
description = ''
|
||||
Configuration of OliveTin. See <https://docs.olivetin.app/config.html> for more information.
|
||||
'';
|
||||
default = { };
|
||||
|
||||
type = lib.types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
|
||||
options = {
|
||||
ListenAddressSingleHTTPFrontend = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = ''
|
||||
The address to listen on for the internal "microproxy" frontend.
|
||||
'';
|
||||
default = "127.0.0.1:8000";
|
||||
example = "0.0.0.0:8000";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
extraConfigFiles = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.path;
|
||||
default = [ ];
|
||||
example = [ "/run/secrets/olivetin.yaml" ];
|
||||
description = ''
|
||||
Config files to merge into the settings defined in [](#opt-services.olivetin.settings).
|
||||
This is useful to avoid putting secrets into the nix store.
|
||||
See <https://docs.olivetin.app/config.html> for more information.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.olivetin = {
|
||||
path = with pkgs; [ bash ];
|
||||
};
|
||||
|
||||
systemd.services.olivetin = {
|
||||
description = "OliveTin";
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
wants = [
|
||||
"network-online.target"
|
||||
"local-fs.target"
|
||||
];
|
||||
after = [
|
||||
"network-online.target"
|
||||
"local-fs.target"
|
||||
];
|
||||
|
||||
inherit (cfg) path;
|
||||
|
||||
preStart = ''
|
||||
tmp="$(mktemp -d)"
|
||||
trap 'rm -rf "$tmp"' EXIT
|
||||
cd "$tmp"
|
||||
|
||||
cp ${settingsFormat.generate "olivetin-config.yaml" cfg.settings} config.yaml
|
||||
chmod +w config.yaml
|
||||
for ((i=0; i < ${toString (lib.length cfg.extraConfigFiles)}; i++)); do
|
||||
${lib.getExe pkgs.yq} -yi '
|
||||
def merge($y):
|
||||
. as $x |
|
||||
if ($x | type == "object") and ($y | type == "object") then
|
||||
$x + $y + with_entries(select(.key | in($y)) | .key as $key | .value |= merge($y[$key]))
|
||||
elif ($x | type == "array") and ($y | type == "array") then
|
||||
$x + $y
|
||||
else
|
||||
$y
|
||||
end;
|
||||
merge($f | fromjson)
|
||||
' config.yaml --rawfile f <(${lib.getExe pkgs.yq} -c . "$CREDENTIALS_DIRECTORY/config-$i.yaml")
|
||||
done
|
||||
chmod -w config.yaml
|
||||
|
||||
mkdir -p /run/olivetin/config
|
||||
mv config.yaml /run/olivetin/config/config.yaml
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
RuntimeDirectory = "olivetin";
|
||||
Restart = "always";
|
||||
|
||||
LoadCredential = lib.imap0 (i: path: "config-${toString i}.yaml:${path}") cfg.extraConfigFiles;
|
||||
|
||||
ExecStart = "${lib.getExe cfg.package} -configdir /run/olivetin/config";
|
||||
};
|
||||
};
|
||||
|
||||
users.users = lib.mkIf (cfg.user == "olivetin") {
|
||||
olivetin = {
|
||||
group = cfg.group;
|
||||
isSystemUser = true;
|
||||
};
|
||||
};
|
||||
|
||||
users.groups = lib.mkIf (cfg.group == "olivetin") { olivetin = { }; };
|
||||
};
|
||||
}
|
|
@ -111,6 +111,8 @@ in
|
|||
Enable this option if you want to ascertain that your documents are correct
|
||||
'';
|
||||
|
||||
package = lib.mkPackageOption pkgs "bootspec" { };
|
||||
|
||||
extensions = lib.mkOption {
|
||||
# NOTE(RaitoBezarius): this is not enough to validate: extensions."osRelease" = drv; those are picked up by cue validation.
|
||||
type = lib.types.attrsOf lib.types.anything; # <namespace>: { ...namespace-specific fields }
|
||||
|
|
|
@ -47,7 +47,7 @@ let
|
|||
|
||||
systemd = config.systemd.package;
|
||||
|
||||
bootspecTools = pkgs.bootspec;
|
||||
bootspecTools = config.boot.bootspec.package;
|
||||
|
||||
nix = config.nix.package.out;
|
||||
|
||||
|
|
|
@ -113,7 +113,7 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
fileSystems = {
|
||||
fileSystems = lib.mkImageMediaOverride {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/${cfg.label}";
|
||||
inherit (cfg) label;
|
||||
|
|
|
@ -8,9 +8,10 @@ with lib;
|
|||
];
|
||||
|
||||
config = {
|
||||
fileSystems."/" = {
|
||||
fileSystems."/" = lib.mkImageMediaOverride {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
boot.growPartition = true;
|
||||
|
|
|
@ -39,7 +39,7 @@ with lib;
|
|||
in
|
||||
mkMerge [
|
||||
{
|
||||
fileSystems."/" = lib.mkDefault {
|
||||
fileSystems."/" = lib.mkImageMediaOverride {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
|
|
|
@ -37,7 +37,7 @@ in
|
|||
boot.loader.systemd-boot.enable = lib.mkDefault cfg.efiSupport;
|
||||
boot.growPartition = lib.mkDefault true;
|
||||
|
||||
fileSystems = {
|
||||
fileSystems = lib.mkImageMediaOverride {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
|
|
|
@ -21,7 +21,7 @@ in
|
|||
../profiles/qemu-guest.nix
|
||||
];
|
||||
|
||||
fileSystems."/" = {
|
||||
fileSystems."/" = lib.mkImageMediaOverride {
|
||||
fsType = "ext4";
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
|
|
|
@ -73,15 +73,17 @@ in
|
|||
inherit config lib pkgs;
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems = lib.mkImageMediaOverride {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
};
|
||||
};
|
||||
|
||||
boot.growPartition = true;
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
];
|
||||
|
||||
config = {
|
||||
fileSystems."/" = {
|
||||
fileSystems."/" = lib.mkImageMediaOverride {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
fsType = "ext4";
|
||||
autoResize = true;
|
||||
|
|
|
@ -1,10 +1,8 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
{
|
||||
imports = [ ../profiles/qemu-guest.nix ];
|
||||
|
||||
|
@ -12,7 +10,7 @@ with lib;
|
|||
enable = true;
|
||||
|
||||
settings.PermitRootLogin = "prohibit-password";
|
||||
settings.PasswordAuthentication = mkDefault false;
|
||||
settings.PasswordAuthentication = lib.mkDefault false;
|
||||
};
|
||||
|
||||
networking = {
|
||||
|
@ -34,13 +32,13 @@ with lib;
|
|||
sysstat
|
||||
];
|
||||
|
||||
fileSystems."/" = {
|
||||
fileSystems."/" = lib.mkImageMediaOverride {
|
||||
fsType = "ext4";
|
||||
device = "/dev/sda";
|
||||
autoResize = true;
|
||||
};
|
||||
|
||||
swapDevices = mkDefault [ { device = "/dev/sdb"; } ];
|
||||
swapDevices = lib.mkDefault [ { device = "/dev/sdb"; } ];
|
||||
|
||||
# Enable LISH and Linode Booting w/ GRUB
|
||||
boot = {
|
||||
|
|
|
@ -30,15 +30,17 @@ in
|
|||
|
||||
boot.growPartition = true;
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
fsType = "ext4";
|
||||
autoResize = true;
|
||||
};
|
||||
fileSystems = lib.mkImageMediaOverride {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
fsType = "ext4";
|
||||
autoResize = true;
|
||||
};
|
||||
|
||||
fileSystems."/boot" = lib.mkIf cfg.efi {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
"/boot" = lib.mkIf cfg.efi {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
};
|
||||
};
|
||||
|
||||
boot.loader.efi.canTouchEfiVariables = false;
|
||||
|
|
|
@ -33,18 +33,22 @@ in
|
|||
];
|
||||
|
||||
config = {
|
||||
fileSystems."/" = mkIf (!cfg.zfs.enable) {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
fsType = "ext4";
|
||||
autoResize = true;
|
||||
};
|
||||
fileSystems."/" = mkIf (!cfg.zfs.enable) (
|
||||
lib.mkImageMediaOverride {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
fsType = "ext4";
|
||||
autoResize = true;
|
||||
}
|
||||
);
|
||||
|
||||
fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) {
|
||||
# The ZFS image uses a partition labeled ESP whether or not we're
|
||||
# booting with EFI.
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) (
|
||||
lib.mkImageMediaOverride {
|
||||
# The ZFS image uses a partition labeled ESP whether or not we're
|
||||
# booting with EFI.
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
}
|
||||
);
|
||||
|
||||
boot.growPartition = true;
|
||||
boot.kernelParams = [ "console=tty1" ];
|
||||
|
|
|
@ -70,12 +70,14 @@ in
|
|||
_: value: ((value.mount or null) != null)
|
||||
) config.openstack.zfs.datasets;
|
||||
in
|
||||
lib.mapAttrs' (
|
||||
dataset: opts:
|
||||
lib.nameValuePair opts.mount {
|
||||
device = dataset;
|
||||
fsType = "zfs";
|
||||
}
|
||||
) mountable;
|
||||
lib.mkImageMediaOverride (
|
||||
lib.mapAttrs' (
|
||||
dataset: opts:
|
||||
lib.nameValuePair opts.mount {
|
||||
device = dataset;
|
||||
fsType = "zfs";
|
||||
}
|
||||
) mountable
|
||||
);
|
||||
};
|
||||
}
|
||||
|
|
|
@ -306,7 +306,13 @@ with lib;
|
|||
''
|
||||
${vma}/bin/vma create "${config.image.baseName}.vma" \
|
||||
-c ${
|
||||
cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)
|
||||
cfgFile "qemu-server.conf" (
|
||||
(builtins.removeAttrs cfg.qemuConf [ "diskSize" ])
|
||||
// {
|
||||
inherit (config.virtualisation) diskSize;
|
||||
}
|
||||
// cfg.qemuExtraConf
|
||||
)
|
||||
}/qemu-server.conf drive-virtio0=$diskImage
|
||||
rm $diskImage
|
||||
${pkgs.zstd}/bin/zstd "${config.image.baseName}.vma"
|
||||
|
@ -346,14 +352,16 @@ with lib;
|
|||
];
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/boot" = lib.mkIf hasBootPartition {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
fileSystems = lib.mkImageMediaOverride {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
};
|
||||
"/boot" = lib.mkIf hasBootPartition {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
};
|
||||
};
|
||||
|
||||
networking = mkIf cfg.cloudInit.enable {
|
||||
|
|
|
@ -275,7 +275,7 @@ in
|
|||
};
|
||||
|
||||
fileSystems =
|
||||
{
|
||||
lib.mkImageMediaOverride {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
|
|
|
@ -83,15 +83,17 @@ in
|
|||
inherit config lib pkgs;
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems = lib.mkImageMediaOverride {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
autoResize = true;
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
};
|
||||
};
|
||||
|
||||
boot.growPartition = true;
|
||||
|
|
|
@ -966,6 +966,7 @@ in
|
|||
oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix { };
|
||||
obs-studio = runTest ./obs-studio.nix;
|
||||
oh-my-zsh = handleTest ./oh-my-zsh.nix { };
|
||||
olivetin = runTest ./olivetin.nix;
|
||||
ollama = runTest ./ollama.nix;
|
||||
ollama-cuda = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-cuda.nix;
|
||||
ollama-rocm = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-rocm.nix;
|
||||
|
|
|
@ -680,95 +680,97 @@ let
|
|||
in
|
||||
{
|
||||
# The configuration of the system used to run "nixos-install".
|
||||
installer = {
|
||||
imports = [
|
||||
commonConfig
|
||||
../modules/profiles/installation-device.nix
|
||||
../modules/profiles/base.nix
|
||||
extraInstallerConfig
|
||||
./common/auto-format-root-device.nix
|
||||
];
|
||||
installer =
|
||||
{ config, ... }:
|
||||
{
|
||||
imports = [
|
||||
commonConfig
|
||||
../modules/profiles/installation-device.nix
|
||||
../modules/profiles/base.nix
|
||||
extraInstallerConfig
|
||||
./common/auto-format-root-device.nix
|
||||
];
|
||||
|
||||
# In systemdStage1, also automatically format the device backing the
|
||||
# root filesystem.
|
||||
virtualisation.fileSystems."/".autoFormat = systemdStage1;
|
||||
# In systemdStage1, also automatically format the device backing the
|
||||
# root filesystem.
|
||||
virtualisation.fileSystems."/".autoFormat = systemdStage1;
|
||||
|
||||
boot.initrd.systemd.enable = systemdStage1;
|
||||
boot.initrd.systemd.enable = systemdStage1;
|
||||
|
||||
# Use a small /dev/vdb as the root disk for the
|
||||
# installer. This ensures the target disk (/dev/vda) is
|
||||
# the same during and after installation.
|
||||
virtualisation.emptyDiskImages = [ 512 ];
|
||||
virtualisation.rootDevice = "/dev/vdb";
|
||||
# Use a small /dev/vdb as the root disk for the
|
||||
# installer. This ensures the target disk (/dev/vda) is
|
||||
# the same during and after installation.
|
||||
virtualisation.emptyDiskImages = [ 512 ];
|
||||
virtualisation.rootDevice = "/dev/vdb";
|
||||
|
||||
hardware.enableAllFirmware = mkForce false;
|
||||
nix.package = selectNixPackage pkgs;
|
||||
nix.package = selectNixPackage pkgs;
|
||||
hardware.enableAllFirmware = mkForce false;
|
||||
|
||||
# The test cannot access the network, so any packages we
|
||||
# need must be included in the VM.
|
||||
system.extraDependencies =
|
||||
with pkgs;
|
||||
[
|
||||
bintools
|
||||
brotli
|
||||
brotli.dev
|
||||
brotli.lib
|
||||
desktop-file-utils
|
||||
docbook5
|
||||
docbook_xsl_ns
|
||||
kbd.dev
|
||||
kmod.dev
|
||||
libarchive.dev
|
||||
libxml2.bin
|
||||
libxslt.bin
|
||||
nixos-artwork.wallpapers.simple-dark-gray-bottom
|
||||
ntp
|
||||
perlPackages.ConfigIniFiles
|
||||
perlPackages.FileSlurp
|
||||
perlPackages.JSON
|
||||
perlPackages.ListCompare
|
||||
perlPackages.XMLLibXML
|
||||
# make-options-doc/default.nix
|
||||
(python3.withPackages (p: [ p.mistune ]))
|
||||
shared-mime-info
|
||||
sudo
|
||||
switch-to-configuration-ng
|
||||
texinfo
|
||||
unionfs-fuse
|
||||
xorg.lndir
|
||||
shellcheck-minimal
|
||||
|
||||
# add curl so that rather than seeing the test attempt to download
|
||||
# curl's tarball, we see what it's trying to download
|
||||
curl
|
||||
]
|
||||
++ optionals (bootLoader == "grub") (
|
||||
let
|
||||
zfsSupport = extraInstallerConfig.boot.supportedFilesystems.zfs or false;
|
||||
in
|
||||
# The test cannot access the network, so any packages we
|
||||
# need must be included in the VM.
|
||||
system.extraDependencies =
|
||||
with pkgs;
|
||||
[
|
||||
(pkgs.grub2.override { inherit zfsSupport; })
|
||||
(pkgs.grub2_efi.override { inherit zfsSupport; })
|
||||
pkgs.nixos-artwork.wallpapers.simple-dark-gray-bootloader
|
||||
pkgs.perlPackages.FileCopyRecursive
|
||||
pkgs.perlPackages.XMLSAX
|
||||
pkgs.perlPackages.XMLSAXBase
|
||||
]
|
||||
)
|
||||
++ optionals (bootLoader == "systemd-boot") [
|
||||
pkgs.zstd.bin
|
||||
pkgs.mypy
|
||||
pkgs.bootspec
|
||||
]
|
||||
++ optionals clevisTest [ pkgs.klibc ]
|
||||
++ optional systemdStage1 pkgs.chroot-realpath;
|
||||
bintools
|
||||
brotli
|
||||
brotli.dev
|
||||
brotli.lib
|
||||
desktop-file-utils
|
||||
docbook5
|
||||
docbook_xsl_ns
|
||||
kbd.dev
|
||||
kmod.dev
|
||||
libarchive.dev
|
||||
libxml2.bin
|
||||
libxslt.bin
|
||||
nixos-artwork.wallpapers.simple-dark-gray-bottom
|
||||
ntp
|
||||
perlPackages.ConfigIniFiles
|
||||
perlPackages.FileSlurp
|
||||
perlPackages.JSON
|
||||
perlPackages.ListCompare
|
||||
perlPackages.XMLLibXML
|
||||
# make-options-doc/default.nix
|
||||
(python3.withPackages (p: [ p.mistune ]))
|
||||
shared-mime-info
|
||||
sudo
|
||||
switch-to-configuration-ng
|
||||
texinfo
|
||||
unionfs-fuse
|
||||
xorg.lndir
|
||||
shellcheck-minimal
|
||||
|
||||
nix.settings = {
|
||||
substituters = mkForce [ ];
|
||||
hashed-mirrors = null;
|
||||
connect-timeout = 1;
|
||||
# add curl so that rather than seeing the test attempt to download
|
||||
# curl's tarball, we see what it's trying to download
|
||||
curl
|
||||
]
|
||||
++ optionals (bootLoader == "grub") (
|
||||
let
|
||||
zfsSupport = extraInstallerConfig.boot.supportedFilesystems.zfs or false;
|
||||
in
|
||||
[
|
||||
(pkgs.grub2.override { inherit zfsSupport; })
|
||||
(pkgs.grub2_efi.override { inherit zfsSupport; })
|
||||
pkgs.nixos-artwork.wallpapers.simple-dark-gray-bootloader
|
||||
pkgs.perlPackages.FileCopyRecursive
|
||||
pkgs.perlPackages.XMLSAX
|
||||
pkgs.perlPackages.XMLSAXBase
|
||||
]
|
||||
)
|
||||
++ optionals (bootLoader == "systemd-boot") [
|
||||
pkgs.zstd.bin
|
||||
pkgs.mypy
|
||||
config.boot.bootspec.package
|
||||
]
|
||||
++ optionals clevisTest [ pkgs.klibc ]
|
||||
++ optional systemdStage1 pkgs.chroot-realpath;
|
||||
|
||||
nix.settings = {
|
||||
substituters = mkForce [ ];
|
||||
hashed-mirrors = null;
|
||||
connect-timeout = 1;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
target = {
|
||||
imports = [ commonConfig ];
|
||||
|
|
57
nixos/tests/olivetin.nix
Normal file
57
nixos/tests/olivetin.nix
Normal file
|
@ -0,0 +1,57 @@
|
|||
{ lib, ... }:
|
||||
|
||||
{
|
||||
name = "olivetin";
|
||||
meta.maintainers = with lib.maintainers; [ defelo ];
|
||||
|
||||
nodes.machine = {
|
||||
services.olivetin = {
|
||||
enable = true;
|
||||
settings = {
|
||||
actions = [
|
||||
{
|
||||
id = "hello_world";
|
||||
title = "Say Hello";
|
||||
shell = "echo -n 'Hello World!' | tee /tmp/result";
|
||||
}
|
||||
];
|
||||
};
|
||||
extraConfigFiles = [
|
||||
(builtins.toFile "secrets.yaml" ''
|
||||
actions:
|
||||
- id: secret
|
||||
title: Secret Action
|
||||
shell: echo -n secret > /tmp/result2
|
||||
'')
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
interactive.nodes.machine = {
|
||||
services.olivetin.settings.ListenAddressSingleHTTPFrontend = "0.0.0.0:8000";
|
||||
networking.firewall.allowedTCPPorts = [ 8000 ];
|
||||
virtualisation.forwardPorts = [
|
||||
{
|
||||
from = "host";
|
||||
host.port = 8000;
|
||||
guest.port = 8000;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
import json
|
||||
|
||||
machine.wait_for_unit("olivetin.service")
|
||||
machine.wait_for_open_port(8000)
|
||||
|
||||
response = json.loads(machine.succeed("curl http://localhost:8000/api/StartActionByGetAndWait/hello_world"))
|
||||
assert response["logEntry"]["exitCode"] == 0
|
||||
assert response["logEntry"]["output"] == "Hello World!"
|
||||
assert machine.succeed("cat /tmp/result") == "Hello World!"
|
||||
|
||||
response = json.loads(machine.succeed("curl http://localhost:8000/api/StartActionByGetAndWait/secret"))
|
||||
assert response["logEntry"]["exitCode"] == 0
|
||||
assert machine.succeed("cat /tmp/result2") == "secret"
|
||||
'';
|
||||
}
|
|
@ -46,10 +46,7 @@
|
|||
{
|
||||
imports = [ ./common/user-account.nix ];
|
||||
|
||||
services.paretosecurity = {
|
||||
enable = true;
|
||||
trayIcon = true;
|
||||
};
|
||||
services.paretosecurity.enable = true;
|
||||
|
||||
services.xserver.enable = true;
|
||||
services.xserver.displayManager.lightdm.enable = true;
|
||||
|
@ -119,5 +116,16 @@
|
|||
xfce.wait_for_text("Pareto Security")
|
||||
xfce.succeed("xdotool click 1")
|
||||
xfce.wait_for_text("Run Checks")
|
||||
|
||||
# Test 5: paretosecurity:// URL handler is registered
|
||||
xfce.succeed("su - alice -c 'xdg-open paretosecurity://foo'")
|
||||
|
||||
# Test 6: Desktop entry
|
||||
xfce.succeed("xdotool mousemove 10 10")
|
||||
xfce.succeed("xdotool click 1") # hide the tray icon window
|
||||
xfce.succeed("xdotool click 1") # show the Applications menu
|
||||
xfce.succeed("xdotool mousemove 10 200")
|
||||
xfce.succeed("xdotool click 1")
|
||||
xfce.wait_for_text("Pareto Security")
|
||||
'';
|
||||
}
|
||||
|
|
|
@ -89,6 +89,7 @@ rec {
|
|||
{ }
|
||||
[
|
||||
"6_7"
|
||||
"6_8"
|
||||
];
|
||||
|
||||
testScript = ''
|
||||
|
|
|
@ -32,6 +32,8 @@
|
|||
taglib,
|
||||
util-linux,
|
||||
wrapQtAppsHook,
|
||||
sparsehash,
|
||||
rapidjson,
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -40,13 +42,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "strawberry";
|
||||
version = "1.2.7";
|
||||
version = "1.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonaski";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-EJE6GDyXYMjJUQeTRgmjd0HX3hf4ajSRGsv/2s2oItc=";
|
||||
hash = "sha256-ByZHyHkMlU571QSu1bbYZC7aEX4Jc8N3j05WbXRQaBY=";
|
||||
};
|
||||
|
||||
# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
|
||||
|
@ -73,6 +75,8 @@ stdenv.mkDerivation rec {
|
|||
qtbase
|
||||
sqlite
|
||||
taglib
|
||||
sparsehash
|
||||
rapidjson
|
||||
]
|
||||
++ optionals stdenv.hostPlatform.isLinux [
|
||||
libgpod
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch2,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
util-linux,
|
||||
|
@ -26,21 +25,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "bitcoin-knots" else "bitcoind-knots";
|
||||
version = "26.1.knots20240325";
|
||||
version = "28.1.knots20250305";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitcoinknots.org/files/26.x/${version}/bitcoin-${version}.tar.gz";
|
||||
hash = "sha256-PqpePDna2gpCzF2K43N4h6cV5Y9w/e5ZcUvaNEaFaIk=";
|
||||
url = "https://bitcoinknots.org/files/28.x/${version}/bitcoin-${version}.tar.gz";
|
||||
hash = "sha256-DKO3+43Tn/BTKQVrLrCkeMtzm8SfbaJD8rPlb6lDA8A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# upnp: add compatibility for miniupnpc 2.2.8
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/bitcoinknots/bitcoin/commit/643014424359a4783cf9c73bee3346ac2f04e713.patch?full_index=1";
|
||||
hash = "sha256-FdLoNH3+ZZTbqrwRvhbAeJuGz4SgnIvoWUBzRxjfzs8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
autoreconfHook
|
||||
|
|
|
@ -8,17 +8,18 @@
|
|||
qtbase,
|
||||
rocksdb_7_10,
|
||||
zeromq,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fulcrum";
|
||||
version = "1.11.1";
|
||||
version = "1.12.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cculianu";
|
||||
repo = "Fulcrum";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+hBc7jW1MVLVjYXNOV7QvFJJpZ5RzW5/c9NdqOXrsj0=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/RlvbZ6/f0Jxj6oCeHjGWqlktvtNUNczOXi2/wYw2LQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -26,8 +27,6 @@ stdenv.mkDerivation rec {
|
|||
qmake
|
||||
];
|
||||
|
||||
dontWrapQtApps = true; # no GUI
|
||||
|
||||
buildInputs = [
|
||||
python3
|
||||
qtbase
|
||||
|
@ -35,11 +34,15 @@ stdenv.mkDerivation rec {
|
|||
zeromq
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
dontWrapQtApps = true; # no GUI
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Fast & nimble SPV server for Bitcoin Cash & Bitcoin BTC";
|
||||
homepage = "https://github.com/cculianu/Fulcrum";
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with lib.maintainers; [ prusnak ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
58
pkgs/applications/display-managers/greetd/qtgreet.nix
Normal file
58
pkgs/applications/display-managers/greetd/qtgreet.nix
Normal file
|
@ -0,0 +1,58 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
kdePackages,
|
||||
qt6,
|
||||
dfl-ipc,
|
||||
dfl-utils,
|
||||
dfl-applications,
|
||||
dfl-login1,
|
||||
mpvSupport ? true,
|
||||
mpv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qtgreet";
|
||||
version = "2.0.3.95";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "marcusbritanicus";
|
||||
repo = "QtGreet";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-5csKvBiffW+yHuNyFqxOE5bcsTWlyoLwFxuPH0WlFAE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kdePackages.wayqt
|
||||
qt6.qtbase
|
||||
dfl-ipc
|
||||
dfl-utils
|
||||
dfl-applications
|
||||
dfl-login1
|
||||
] ++ lib.optionals mpvSupport [ mpv ];
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonOption "dynpath" "${placeholder "out"}/var/lib/qtgreet")
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Qt based greeter for greetd, to be run under wayfire or similar wlr-based compositors";
|
||||
homepage = "https://gitlab.com/marcusbritanicus/QtGreet";
|
||||
changelog = "https://gitlab.com/marcusbritanicus/QtGreet/-/blob/${finalAttrs.src.rev}/Changelog";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ arthsmn ];
|
||||
mainProgram = "qtgreet";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
|
@ -20,12 +20,12 @@ let
|
|||
sha256Hash = "sha256-VNXErfb4PhljcJwGq863ldh/3i8fMdJirlwolEIk+fI=";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2024.3.2.11"; # "Android Studio Meerkat Feature Drop | 2024.3.2 RC 2"
|
||||
sha256Hash = "sha256-pE17kbLnsEMRtaQencKqckW3uke9IliLkoHP6q3NrQg=";
|
||||
version = "2024.3.2.12"; # "Android Studio Meerkat Feature Drop | 2024.3.2 RC 3"
|
||||
sha256Hash = "sha256-wmCPkYV88/OwuPqm10t3jT1x+cFRK+7Mgy683Au1P3g=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2025.1.1.6"; # "Android Studio Narwhal | 2025.1.1 Canary 6"
|
||||
sha256Hash = "sha256-FUDb8/kyvO3M/NJp30VZCyNacJ90y/fawrDTFin7g6o=";
|
||||
version = "2025.1.1.7"; # "Android Studio Narwhal | 2025.1.1 Canary 7"
|
||||
sha256Hash = "sha256-RQOmTzmk0el8WXE3cnSBCnpginFk0bK45Aij7eil1uM=";
|
||||
};
|
||||
in
|
||||
{
|
||||
|
|
|
@ -4355,6 +4355,19 @@ final: prev: {
|
|||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
ecolog-nvim = buildVimPlugin {
|
||||
pname = "ecolog.nvim";
|
||||
version = "2025-04-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "t3ntxcl3s";
|
||||
repo = "ecolog.nvim";
|
||||
rev = "cfd19e7a8841c538fdb706ee6ba3a22943d45ca6";
|
||||
sha256 = "12mlhmzqgv45v98gi5jvqkn9bkl6nfixlgvb76b6ci6rzdkyxg52";
|
||||
};
|
||||
meta.homepage = "https://github.com/t3ntxcl3s/ecolog.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
edge = buildVimPlugin {
|
||||
pname = "edge";
|
||||
version = "2025-04-16";
|
||||
|
@ -11831,6 +11844,19 @@ final: prev: {
|
|||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
peek-nvim = buildVimPlugin {
|
||||
pname = "peek.nvim";
|
||||
version = "2024-04-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "toppair";
|
||||
repo = "peek.nvim";
|
||||
rev = "5820d937d5414baea5f586dc2a3d912a74636e5b";
|
||||
sha256 = "01bdrk1h1xaq2bbbgwsrb2h2cc9j2d88kjcx2k3p8j8kgk20yql4";
|
||||
};
|
||||
meta.homepage = "https://github.com/toppair/peek.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
persisted-nvim = buildVimPlugin {
|
||||
pname = "persisted.nvim";
|
||||
version = "2025-03-30";
|
||||
|
|
|
@ -7,12 +7,12 @@
|
|||
vimUtils,
|
||||
}:
|
||||
let
|
||||
version = "0-unstable-2025-01-13";
|
||||
version = "0-unstable-2025-04-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-pack";
|
||||
repo = "nvim-spectre";
|
||||
rev = "ddd7383e856a7c939cb4f5143278fe041bbb8cb9";
|
||||
sha256 = "sha256-pZ7AH1U95IWMmhk/uBO0Lsxx78H5H9ygPxk/HIqFFlY=";
|
||||
rev = "4497feffb18db4bab6e698bcb695228c19421282";
|
||||
hash = "sha256-pWSHOvV0VEouCyhrtn63k7+Lvs6reS81YJJCR3Ygnwg=";
|
||||
};
|
||||
|
||||
spectre_oxi = rustPlatform.buildRustPackage {
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "sonarlint.nvim";
|
||||
version = "0-unstable-2025-04-18";
|
||||
version = "0-unstable-2025-04-24";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "schrieveslaach";
|
||||
repo = "sonarlint.nvim";
|
||||
rev = "0b78f1db800f9ba76f81de773ba09ce2222bdcc2";
|
||||
hash = "sha256-EUwuIFFe4tmw8u6RqEvOLL0Yi8J5cLBQx7ICxnmkT4k=";
|
||||
rev = "89d3d3b0dd239dbbdf4c1d728e41759d5378f049";
|
||||
hash = "sha256-EOAdSvugcDEDuBuFv/HL35HXWvB/V97UtOJqdRuU7ak=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
|
|
|
@ -2744,6 +2744,10 @@ in
|
|||
];
|
||||
};
|
||||
|
||||
peek-nvim = super.peek-nvim.overrideAttrs {
|
||||
runtimeDeps = [ deno ];
|
||||
};
|
||||
|
||||
persisted-nvim = super.persisted-nvim.overrideAttrs {
|
||||
nvimSkipModules = [
|
||||
# /lua/persisted/init.lua:44: attempt to index upvalue 'config' (a nil value)
|
||||
|
|
|
@ -333,6 +333,7 @@ https://github.com/Bekaboo/dropbar.nvim/,HEAD,
|
|||
https://github.com/earthly/earthly.vim/,HEAD,
|
||||
https://github.com/GustavEikaas/easy-dotnet.nvim/,HEAD,
|
||||
https://github.com/Shougo/echodoc.vim/,,
|
||||
https://github.com/t3ntxcl3s/ecolog.nvim/,HEAD,
|
||||
https://github.com/sainnhe/edge/,,
|
||||
https://github.com/geldata/edgedb-vim/,,
|
||||
https://github.com/folke/edgy.nvim/,HEAD,
|
||||
|
@ -908,6 +909,7 @@ https://github.com/frankroeder/parrot.nvim/,HEAD,
|
|||
https://github.com/lewis6991/pckr.nvim/,HEAD,
|
||||
https://github.com/tmsvg/pear-tree/,,
|
||||
https://github.com/steelsojka/pears.nvim/,,
|
||||
https://github.com/toppair/peek.nvim/,HEAD,
|
||||
https://github.com/olimorris/persisted.nvim/,HEAD,
|
||||
https://github.com/folke/persistence.nvim/,,
|
||||
https://github.com/Weissle/persistent-breakpoints.nvim/,,
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
libGLU,
|
||||
OpenGL,
|
||||
libpng,
|
||||
binutils,
|
||||
makeDesktopItem,
|
||||
}:
|
||||
|
||||
|
@ -33,10 +34,17 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
copyDesktopItems
|
||||
graphicsmagick
|
||||
SDL # for sdl-config during build time
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
binutils # build calls `ar`
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "vice-${type}";
|
||||
version = "0-unstable-2025-03-28";
|
||||
version = "0-unstable-2025-04-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "vice-libretro";
|
||||
rev = "9b201cdd612bfb12c8d86696656b79eaf25924ab";
|
||||
hash = "sha256-YilHxQLZC8MVnZ9EekCqtU8rgOB/0FH2vKFdn6l3i5Q=";
|
||||
rev = "e5b036f0be19f7a70fde75cc0e8b1b43476adc13";
|
||||
hash = "sha256-GzvsXPZcBfGvA0g7zLR3R7w5CEIw2slL3EyQdcDjqCc=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
|
|
@ -127,10 +127,27 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Since the bug described in https://github.com/NixOS/nixpkgs/issues/135438,
|
||||
# it is not possible to use substituteAll
|
||||
postPatch = ''
|
||||
substituteInPlace src/emu/emuopts.cpp \
|
||||
--subst-var-by mamePath "$out/opt/mame"
|
||||
'';
|
||||
postPatch =
|
||||
''
|
||||
substituteInPlace src/emu/emuopts.cpp \
|
||||
--subst-var-by mamePath "$out/opt/mame"
|
||||
''
|
||||
# MAME's build system uses `sw_vers` to test whether it needs to link with
|
||||
# the Metal framework or not. However:
|
||||
# a) that would return the build system's version, not the target's, and
|
||||
# b) it can't actually find `sw_vers` in $PATH, so it thinks it's on macOS
|
||||
# version 0, and doesn't link with Metal - causing missing symbol errors
|
||||
# when it gets to the link step, because other parts of the build system
|
||||
# _do_ use the correct target version number.
|
||||
# This replaces the `sw_vers` call with the macOS version actually being
|
||||
# targeted, so everything gets linked correctly.
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
for file in scripts/src/osd/{mac,sdl}.lua; do
|
||||
substituteInPlace "$file" --replace-fail \
|
||||
'backtick("sw_vers -productVersion")' \
|
||||
"os.getenv('MACOSX_DEPLOYMENT_TARGET') or '$darwinMinVersion'"
|
||||
done
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
|
|
|
@ -34,13 +34,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vengi-tools";
|
||||
version = "0.0.35";
|
||||
version = "0.0.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vengi-voxel";
|
||||
repo = "vengi";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-8rGnW+VtqNJYqUqQDp0yOVIQd7w+cq7PIpqqIQPhkbE=";
|
||||
hash = "sha256-6MJw8BaHvd9cZNCMIFwAtk8UzxP+RSfnuv9py8sUgnY=";
|
||||
};
|
||||
|
||||
prePatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
|
|
|
@ -18,13 +18,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpxsee";
|
||||
version = "13.38";
|
||||
version = "13.40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ftVuFuoseXtpeXzOMZA66O2Z6wxKd7G6l3Kx8WOgor0=";
|
||||
hash = "sha256-xxMnqUsYfmTD1ZNAm+lFMLvXvo6qRrq88m234ZtYiuA=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
@ -787,7 +787,7 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "135.0.7049.95",
|
||||
"version": "135.0.7049.114",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "85ec2718b5a29990c7eb67778348c9f76a00f392",
|
||||
|
@ -798,16 +798,16 @@
|
|||
"hash": "sha256-8NynNvLNCHxy8EYmsnPovKhXu9DcDcYBhg4A6d2QIfY="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "135.0.7049.95-1",
|
||||
"hash": "sha256-kLLtJti5GIF9TT0cH8zvsxywJzD22X8u2bB/tqENSjo="
|
||||
"rev": "135.0.7049.114-1",
|
||||
"hash": "sha256-frUL7b+4CyrzBa5T1HzFseWHwFa2MPgkpkrFeASWyLA="
|
||||
},
|
||||
"npmHash": "sha256-wNrZaugdKJCyV1WchkKXzr/I1OW1AtjiC2p7qTZZOqU="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "de2eb485a1951079e63bdb57ce25544d2dc79c15",
|
||||
"hash": "sha256-6ydyJWsDawt0bfYAFHotTB9ujmIYsqUUpNwB6q6RNQE=",
|
||||
"rev": "63fd8a7d9d09e41ba37b84386c85d5f249f848f7",
|
||||
"hash": "sha256-U6OJHocA6vI36QCU8UITUsVlentm210CwdThCwlDw5E=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
|
|
|
@ -398,6 +398,7 @@ buildStdenv.mkDerivation {
|
|||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ rsync ]
|
||||
++ lib.optionals stdenv.hostPlatform.isx86 [ nasm ]
|
||||
++ lib.optionals crashreporterSupport [
|
||||
dump_syms
|
||||
patchelf
|
||||
|
@ -573,7 +574,6 @@ buildStdenv.mkDerivation {
|
|||
libGL
|
||||
libGLU
|
||||
libstartup_notification
|
||||
nasm
|
||||
perl
|
||||
zip
|
||||
]
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "edge";
|
||||
version = "25.4.2";
|
||||
sha256 = "0i0z2x9x2sf9lpkvw9pnvwp74hxm9rqbdhx9v91qwlsnw8clc950";
|
||||
vendorHash = "sha256-jIL/08mSvz6xLlB1Iyj2F9vnfOkadeYf92CeXXx0Otw=";
|
||||
version = "25.4.4";
|
||||
sha256 = "1zdi6ziz8ys231xszzildi1rk0pz15cp27xf7zpy6hl0n2b1vbij";
|
||||
vendorHash = "sha256-xr/RMfVYYXtfWpnPmm3tG/TwJITIyRRFzoZwbBQwSc8=";
|
||||
}
|
||||
|
|
|
@ -317,13 +317,13 @@
|
|||
"vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
|
||||
},
|
||||
"datadog": {
|
||||
"hash": "sha256-7V4nSuksCvy2fSyQbzVo0RlEaevUwCIlX61y3GEBqVk=",
|
||||
"hash": "sha256-bRC17BNrJYaEcqRUuuywhCAJSHe/NLJ5syayQGk8k6k=",
|
||||
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
|
||||
"owner": "DataDog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v3.59.1",
|
||||
"rev": "v3.60.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-vOg972dcpX9MEZ/GaPGcm0OIC1xu+p6KMcflEUPx0hU="
|
||||
"vendorHash": "sha256-Q3D0YEJkDKiDOqUIewATOrctHbLDEn85EFEgyUW9W+8="
|
||||
},
|
||||
"deno": {
|
||||
"hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=",
|
||||
|
@ -534,13 +534,13 @@
|
|||
"vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
|
||||
},
|
||||
"grafana": {
|
||||
"hash": "sha256-uWRFi0jYGwlZ1b8qvVoL/NslI6e5bv76QmlWL5C7fA8=",
|
||||
"hash": "sha256-uPvG2/miG5CCZkSinFwGUj1wmGBPyI2jCkYS31559NY=",
|
||||
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
|
||||
"owner": "grafana",
|
||||
"repo": "terraform-provider-grafana",
|
||||
"rev": "v3.22.2",
|
||||
"rev": "v3.22.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-wqGNczKE2IFq/wLb8fj5+k07Vh1dR1oXwW06fIWV6Eg="
|
||||
"vendorHash": "sha256-8KsQan5KxNj3/NSzj/M+IR44PiQ5E7PL/K4vVC5KovA="
|
||||
},
|
||||
"gridscale": {
|
||||
"hash": "sha256-Ygt3L/dzwycccQZmuwbcaLHp9FBGNHgU19wSNmY8PzQ=",
|
||||
|
@ -831,13 +831,13 @@
|
|||
"vendorHash": "sha256-1nm2Y4T9/mCWMXMjXEzBz3w08AYHjQJeb9mYPQeWPs0="
|
||||
},
|
||||
"mongodbatlas": {
|
||||
"hash": "sha256-V1kQPFNW0/C1Rw6gbHpQ1+yK5L8dO+zFIHkQs93a56Y=",
|
||||
"hash": "sha256-9fgaBOzly/B1kTvTmevoaEHs6s3/i3kGokFqzKWKwwg=",
|
||||
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
|
||||
"owner": "mongodb",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v1.32.0",
|
||||
"rev": "v1.33.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-VznDrCvaY6O8n1bl/fx/PIdKfFD32pQaGn5Ti1sJucU="
|
||||
"vendorHash": "sha256-yKNhCFxs2BRU4X9P7ZREmR64u5/8QFFGMk8khXyqUsA="
|
||||
},
|
||||
"namecheap": {
|
||||
"hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",
|
||||
|
@ -1102,11 +1102,11 @@
|
|||
"vendorHash": "sha256-lkooWo0DbpL4zjNQ20TRw+hsHXWZP9u7u95n1WyzTQk="
|
||||
},
|
||||
"rootly": {
|
||||
"hash": "sha256-bIn3TshuK06MCNznghPeFS5jfFMshz2Zmc9DKoHUEWs=",
|
||||
"hash": "sha256-HvUvRDoRalOzHHnCM0uBR+xc0i0ItfglgoJ0H1QLovg=",
|
||||
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
|
||||
"owner": "rootlyhq",
|
||||
"repo": "terraform-provider-rootly",
|
||||
"rev": "v2.26.5",
|
||||
"rev": "v2.26.8",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-IJJjA7SCQib5GdqbS2rnZtbBNB8sYYPYH+vHMGf1Bfk="
|
||||
},
|
||||
|
|
|
@ -17,17 +17,17 @@
|
|||
}:
|
||||
|
||||
let
|
||||
rev = 3546;
|
||||
rev = 3627;
|
||||
jre' = if preferZulu then zulu else jre;
|
||||
gtk' = if preferGtk3 then gtk3 else gtk2;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "davmail";
|
||||
version = "6.2.2";
|
||||
version = "6.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip";
|
||||
hash = "sha256-45paGy6SfUFXK6vY8L4tHFYiio1/5ah9vTyGImdgwHI=";
|
||||
hash = "sha256-Yh61ZHsEMF6SchLEyBV3rRI7pJ/bvR2K4G8U6jrPa3A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -85,8 +85,8 @@ rec {
|
|||
thunderbird = thunderbird-latest;
|
||||
|
||||
thunderbird-latest = common {
|
||||
version = "137.0.1";
|
||||
sha512 = "387f04aff9380c7261c574e7ef2e4972d63ebfb2768e25aa41a5ee2f3a755780a84099532cf4c1b5635db3412ab543e9b17b0a0476ec06c547b2dc678f19795f";
|
||||
version = "137.0.2";
|
||||
sha512 = "6cc631d14780f1bf9224208881c14834cef078688ffa006f50dfdd3a4e81c95255fb455f530a09a0f296dc494af104aefe2414ac53c6b8c9956ca1a9d7a7e053";
|
||||
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "thunderbirdPackages.thunderbird-latest";
|
||||
|
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "protonvpn-gui";
|
||||
version = "4.9.5";
|
||||
version = "4.9.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "proton-vpn-gtk-app";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mXRTXr7u049pgPRK5gwaGfQUmUl4vlKca4lRH06HZj8=";
|
||||
tag = "${version}";
|
||||
hash = "sha256-Undf3qSClcRa1e9f6B/1hLPIjc2KPG745AXxYHQA0nE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -51,13 +51,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "remmina";
|
||||
version = "1.4.39";
|
||||
version = "1.4.40";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Remmina";
|
||||
repo = "Remmina";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-gsQtPa6NLQC3nMfemmZv416hyqFg8Z1GDMALhNaPAOw=";
|
||||
hash = "sha256-AfZ9tWoaZTRs7GZOdli74e7/X/OMgbvfez9BipoZ/ng=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
# overridable. This is useful when the upstream archive was replaced
|
||||
# and nixpkgs is not in sync yet.
|
||||
officeVersion ? {
|
||||
version = "1222";
|
||||
version = "1224";
|
||||
edition = "";
|
||||
hash = "sha256-8ya9RYpd9G5SITYOpvhxjQE8ieV8TuAApkjNwCf9nHs=";
|
||||
hash = "sha256-Y6x5E8WeI7Pf/wczWNKnHsCbXWW4Jdzo4ToBdzgmOF8=";
|
||||
},
|
||||
|
||||
...
|
||||
|
|
|
@ -7,9 +7,9 @@
|
|||
# Softmaker Office or when the upstream archive was replaced and
|
||||
# nixpkgs is not in sync yet.
|
||||
officeVersion ? {
|
||||
version = "1222";
|
||||
version = "1224";
|
||||
edition = "2024";
|
||||
hash = "sha256-eyYBK5ZxPcBakOvXUQZIU2aftyH6PXh/rtqC/1BJhg4=";
|
||||
hash = "sha256-ix9R9Xlugvu5qmKAqC2DsZFhyJ+VVsD7MSpBv+4lmTY=";
|
||||
},
|
||||
|
||||
...
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
{
|
||||
"version": "17.10.4",
|
||||
"repo_hash": "1ppfg904q1ikl21k21iyzknpd7l51zxpi144416myr5m1a6a3kza",
|
||||
"yarn_hash": "0fw84hf9qswajmjhds59fn6l6xmyha6vja13dvb5slfw9cmbq9pi",
|
||||
"version": "17.11.1",
|
||||
"repo_hash": "1sw1qw1fsxvdyzc48f03p89njklm3zn7fd090jjryr881fpcvgcd",
|
||||
"yarn_hash": "0z06jaxqbg2wnq7yhpkba0cpxp4w4iy2cxla8nhc6kgx49xk179v",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v17.10.4-ee",
|
||||
"rev": "v17.11.1-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "17.10.4",
|
||||
"GITLAB_PAGES_VERSION": "17.10.4",
|
||||
"GITALY_SERVER_VERSION": "17.11.1",
|
||||
"GITLAB_PAGES_VERSION": "17.11.1",
|
||||
"GITLAB_SHELL_VERSION": "14.41.0",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "17.10.4"
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.5.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "17.11.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -82,7 +82,7 @@ let
|
|||
cp Cargo.lock $out
|
||||
'';
|
||||
};
|
||||
hash = "sha256-VJR3F+6l8nYj1ZCHOWxnX82C68giXX45RkhIVpZvRLo=";
|
||||
hash = "sha256-Jr3lS3gQI/jojWIUxEBp7a950mcOvnbjlRIFXvfGays=";
|
||||
};
|
||||
|
||||
dontBuild = false;
|
||||
|
|
|
@ -10,7 +10,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "17.10.4";
|
||||
version = "17.11.1";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
|
@ -22,7 +22,7 @@ buildGoModule rec {
|
|||
|
||||
sourceRoot = "${src.name}/workhorse";
|
||||
|
||||
vendorHash = "sha256-rPTFHQ7b3l9wPURu50sur+PsxKYI4xiRs5uHNab9YUg=";
|
||||
vendorHash = "sha256-76JO/oayqhv36WM7zC/a85l8CK1orsMuMksBYbmDN1o=";
|
||||
buildInputs = [ git ];
|
||||
ldflags = [ "-X main.Version=${version}" ];
|
||||
doCheck = false;
|
||||
|
|
|
@ -45,7 +45,11 @@ gem 'bootsnap', '~> 1.18.3', require: false, feature_category: :shared
|
|||
|
||||
# Avoid the precompiled native gems because Omnibus needs to build this to ensure
|
||||
# LD_LIBRARY_PATH is correct: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7730
|
||||
gem 'ffi', '~> 1.17', force_ruby_platform: true, feature_category: :shared
|
||||
if RUBY_PLATFORM.include?('darwin')
|
||||
gem 'ffi', '~> 1.17', feature_category: :shared
|
||||
else
|
||||
gem 'ffi', '~> 1.17', force_ruby_platform: true, feature_category: :shared
|
||||
end
|
||||
|
||||
gem 'openssl', '~> 3.0', feature_category: :shared
|
||||
|
||||
|
@ -95,7 +99,8 @@ gem 'doorkeeper', '~> 5.8', '>= 5.8.1', feature_category: :system_access
|
|||
gem 'doorkeeper-openid_connect', '~> 1.8.10', feature_category: :system_access
|
||||
gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access
|
||||
gem 'rexml', '~> 3.4.0', feature_category: :shared
|
||||
gem 'ruby-saml', '~> 1.18.0', path: 'vendor/gems/ruby-saml', feature_category: :system_access
|
||||
gem 'ruby-saml', '~> 1.18', feature_category: :system_access
|
||||
gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access
|
||||
gem 'omniauth', '~> 2.1.0', feature_category: :system_access
|
||||
gem 'omniauth-auth0', '~> 3.1', feature_category: :system_access
|
||||
gem 'omniauth-azure-activedirectory-v2', '~> 2.0', feature_category: :system_access
|
||||
|
@ -105,7 +110,6 @@ gem 'omniauth-github', '2.0.1', feature_category: :system_access
|
|||
gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab', feature_category: :system_access
|
||||
gem 'omniauth-google-oauth2', '~> 1.1', feature_category: :system_access
|
||||
gem 'omniauth-oauth2-generic', '~> 0.2.2', feature_category: :system_access
|
||||
gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access
|
||||
gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth', feature_category: :system_access
|
||||
# See vendor/gems/omniauth_crowd/README.md
|
||||
gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd', feature_category: :system_access
|
||||
|
@ -167,7 +171,6 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
|
|||
gem 'graphql', '2.4.11', path: 'vendor/gems/graphql', feature_category: :api
|
||||
gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api
|
||||
gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
|
||||
gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import)
|
||||
|
||||
# Cells
|
||||
gem 'gitlab-topology-service-client', '~> 0.1',
|
||||
|
@ -267,7 +270,7 @@ gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdow
|
|||
gem 'rouge', '~> 4.5.0', feature_category: :shared
|
||||
gem 'truncato', '~> 0.7.13', feature_category: :team_planning
|
||||
gem 'nokogiri', '~> 1.18', feature_category: :shared
|
||||
gem 'gitlab-glfm-markdown', '~> 0.0.27', feature_category: :markdown
|
||||
gem 'gitlab-glfm-markdown', '~> 0.0.29', feature_category: :markdown
|
||||
gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown
|
||||
gem 'unicode-emoji', '~> 4.0', feature_category: :markdown
|
||||
|
||||
|
@ -292,7 +295,7 @@ end
|
|||
gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared
|
||||
|
||||
# Background jobs
|
||||
gem 'sidekiq', path: 'vendor/gems/sidekiq-7.2.4', require: 'sidekiq', feature_category: :scalability
|
||||
gem 'sidekiq', '~> 7.3.9', feature_category: :scalability
|
||||
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
|
||||
gem 'gitlab-sidekiq-fetcher',
|
||||
path: 'vendor/gems/sidekiq-reliable-fetch',
|
||||
|
@ -378,7 +381,7 @@ gem 'gitlab_chronic_duration', '~> 0.12', feature_category: :shared
|
|||
|
||||
gem 'rack-proxy', '~> 0.7.7', feature_category: :shared
|
||||
|
||||
gem 'cssbundling-rails', '1.4.2', feature_category: :shared
|
||||
gem 'cssbundling-rails', '1.4.3', feature_category: :shared
|
||||
gem 'terser', '1.0.2', feature_category: :shared
|
||||
|
||||
gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client', feature_category: :database
|
||||
|
@ -398,7 +401,7 @@ gem 'sentry-sidekiq', '~> 5.22.0', feature_category: :observability
|
|||
|
||||
# PostgreSQL query parsing
|
||||
#
|
||||
gem 'pg_query', '~> 6.0.0', feature_category: :database
|
||||
gem 'pg_query', '~> 6.1.0', feature_category: :database
|
||||
|
||||
gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_category: :shared
|
||||
gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared
|
||||
|
@ -518,11 +521,11 @@ group :development, :test do
|
|||
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
|
||||
gem 'minitest', '~> 5.11.0', feature_category: :shared
|
||||
|
||||
gem 'spring', '~> 4.1.0', feature_category: :shared
|
||||
gem 'spring', '~> 4.3.0', feature_category: :shared
|
||||
gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared
|
||||
|
||||
gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false
|
||||
gem 'haml_lint', '~> 0.58', feature_category: :tooling
|
||||
gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false
|
||||
|
||||
# Benchmarking & profiling
|
||||
gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared
|
||||
|
@ -551,6 +554,8 @@ group :development, :test do
|
|||
gem 'vite_ruby', '~> 3.9.0', feature_category: :shared
|
||||
|
||||
gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling
|
||||
|
||||
gem 'yard', '~> 0.9', require: false, feature_category: :tooling
|
||||
end
|
||||
|
||||
group :development, :test, :danger do
|
||||
|
@ -724,7 +729,7 @@ gem 'cvss-suite', '~> 3.3.0', require: 'cvss_suite', feature_category: :software
|
|||
gem 'arr-pm', '~> 0.0.12', feature_category: :package_registry
|
||||
|
||||
# Remote Development
|
||||
gem 'devfile', '~> 0.1.1', feature_category: :workspaces
|
||||
gem 'devfile', '~> 0.4.0', feature_category: :workspaces
|
||||
|
||||
# Apple plist parsing
|
||||
gem 'CFPropertyList', '~> 3.0.0', feature_category: :mobile_devops
|
||||
|
@ -755,4 +760,4 @@ gem 'paper_trail', '~> 15.0', feature_category: :shared
|
|||
|
||||
gem "i18n_data", "~> 0.13.1", feature_category: :system_access
|
||||
|
||||
gem "gitlab-cloud-connector", "~> 1.0.0", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
|
||||
gem "gitlab-cloud-connector", "~> 1.5", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
|
||||
|
|
|
@ -214,26 +214,10 @@ PATH
|
|||
nokogiri (>= 1.4.4)
|
||||
omniauth (~> 2.0)
|
||||
|
||||
PATH
|
||||
remote: vendor/gems/ruby-saml
|
||||
specs:
|
||||
ruby-saml (1.18.0)
|
||||
nokogiri (>= 1.13.10)
|
||||
rexml
|
||||
|
||||
PATH
|
||||
remote: vendor/gems/sidekiq-7.2.4
|
||||
specs:
|
||||
sidekiq (7.2.4)
|
||||
concurrent-ruby (< 2)
|
||||
connection_pool (>= 2.3.0)
|
||||
rack (>= 2.2.4)
|
||||
redis-client (>= 0.19.0)
|
||||
|
||||
PATH
|
||||
remote: vendor/gems/sidekiq-reliable-fetch
|
||||
specs:
|
||||
gitlab-sidekiq-fetcher (0.12.0)
|
||||
gitlab-sidekiq-fetcher (0.12.1)
|
||||
json (>= 2.5)
|
||||
sidekiq (~> 7.0)
|
||||
|
||||
|
@ -245,7 +229,7 @@ GEM
|
|||
nkf
|
||||
rexml
|
||||
RedCloth (4.3.4)
|
||||
acme-client (2.0.20)
|
||||
acme-client (2.0.21)
|
||||
base64 (~> 0.2.0)
|
||||
faraday (>= 1.0, < 3.0.0)
|
||||
faraday-retry (>= 1.0, < 3.0.0)
|
||||
|
@ -344,7 +328,7 @@ GEM
|
|||
asciidoctor-plantuml (0.0.16)
|
||||
asciidoctor (>= 2.0.17, < 3.0.0)
|
||||
ast (2.4.2)
|
||||
async (2.23.0)
|
||||
async (2.23.1)
|
||||
console (~> 1.29)
|
||||
fiber-annotation
|
||||
io-event (~> 1.9)
|
||||
|
@ -482,7 +466,7 @@ GEM
|
|||
git
|
||||
css_parser (1.14.0)
|
||||
addressable
|
||||
cssbundling-rails (1.4.2)
|
||||
cssbundling-rails (1.4.3)
|
||||
railties (>= 6.0.0)
|
||||
csv (3.3.0)
|
||||
cvss-suite (3.3.0)
|
||||
|
@ -535,7 +519,7 @@ GEM
|
|||
thor (>= 0.19, < 2)
|
||||
descendants_tracker (0.0.4)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
devfile (0.1.1)
|
||||
devfile (0.4.0)
|
||||
device_detector (1.0.0)
|
||||
devise (4.9.4)
|
||||
bcrypt (~> 3.0)
|
||||
|
@ -748,7 +732,7 @@ GEM
|
|||
terminal-table (>= 1.5.1)
|
||||
gitlab-chronic (0.10.6)
|
||||
numerizer (~> 0.2)
|
||||
gitlab-cloud-connector (1.0.0)
|
||||
gitlab-cloud-connector (1.6.0)
|
||||
activesupport (~> 7.0)
|
||||
jwt (~> 2.9.3)
|
||||
gitlab-dangerfiles (4.8.1)
|
||||
|
@ -767,7 +751,7 @@ GEM
|
|||
mime-types
|
||||
net-http-persistent (~> 4.0)
|
||||
nokogiri (~> 1, >= 1.10.8)
|
||||
gitlab-glfm-markdown (0.0.28)
|
||||
gitlab-glfm-markdown (0.0.29)
|
||||
rb_sys (~> 0.9.109)
|
||||
gitlab-kas-grpc (17.9.1)
|
||||
grpc (~> 1.0)
|
||||
|
@ -792,12 +776,14 @@ GEM
|
|||
activesupport (>= 5.2.0)
|
||||
rake (~> 13.0)
|
||||
snowplow-tracker (~> 0.8.0)
|
||||
gitlab-secret_detection (0.19.0)
|
||||
grpc (~> 1.63)
|
||||
gitlab-secret_detection (0.23.0)
|
||||
grpc (~> 1.63.0)
|
||||
grpc-tools (~> 1.63)
|
||||
grpc_reflection (~> 0.1)
|
||||
parallel (~> 1)
|
||||
re2 (~> 2.7)
|
||||
sentry-ruby (~> 5.22)
|
||||
stackprof (~> 0.2.27)
|
||||
toml-rb (~> 2.2)
|
||||
gitlab-security_report_schemas (0.1.2.min15.0.0.max15.2.1)
|
||||
activesupport (>= 6, < 8)
|
||||
|
@ -952,13 +938,7 @@ GEM
|
|||
grape_logging (1.8.4)
|
||||
grape
|
||||
rack
|
||||
graphlient (0.8.0)
|
||||
faraday (~> 2.0)
|
||||
graphql-client
|
||||
graphlyte (1.0.0)
|
||||
graphql-client (0.23.0)
|
||||
activesupport (>= 3.0)
|
||||
graphql (>= 1.13.0)
|
||||
graphql-docs (5.0.0)
|
||||
commonmarker (~> 0.23, >= 0.23.6)
|
||||
escape_utils (~> 1.2)
|
||||
|
@ -1064,7 +1044,7 @@ GEM
|
|||
character_set (~> 1.4)
|
||||
regexp_parser (~> 2.5)
|
||||
regexp_property_values (~> 1.0)
|
||||
json (2.10.1)
|
||||
json (2.10.2)
|
||||
json-jwt (1.16.6)
|
||||
activesupport (>= 4.2)
|
||||
aes_key_wrap
|
||||
|
@ -1120,8 +1100,9 @@ GEM
|
|||
railties (>= 6.1)
|
||||
rexml
|
||||
libyajl2 (2.1.0)
|
||||
license_finder (7.1.0)
|
||||
license_finder (7.2.1)
|
||||
bundler
|
||||
csv (~> 3.2)
|
||||
rubyzip (>= 1, < 3)
|
||||
thor (~> 1.2)
|
||||
tomlrb (>= 1.3, < 2.1)
|
||||
|
@ -1226,7 +1207,7 @@ GEM
|
|||
nio4r (2.7.0)
|
||||
nkf (0.2.0)
|
||||
no_proxy_fix (0.1.2)
|
||||
nokogiri (1.18.3)
|
||||
nokogiri (1.18.7)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
notiffany (0.1.3)
|
||||
|
@ -1290,9 +1271,9 @@ GEM
|
|||
omniauth-oauth2-generic (0.2.8)
|
||||
omniauth-oauth2 (~> 1.0)
|
||||
rake
|
||||
omniauth-saml (2.2.2)
|
||||
omniauth-saml (2.2.3)
|
||||
omniauth (~> 2.1)
|
||||
ruby-saml (~> 1.17)
|
||||
ruby-saml (~> 1.18)
|
||||
omniauth-shibboleth-redux (2.0.0)
|
||||
omniauth (>= 2.0.0)
|
||||
omniauth_openid_connect (0.8.0)
|
||||
|
@ -1460,7 +1441,7 @@ GEM
|
|||
peek (1.1.0)
|
||||
railties (>= 4.0.0)
|
||||
pg (1.5.9)
|
||||
pg_query (6.0.0)
|
||||
pg_query (6.1.0)
|
||||
google-protobuf (>= 3.25.3)
|
||||
plist (3.7.0)
|
||||
png_quantizator (0.2.1)
|
||||
|
@ -1503,7 +1484,7 @@ GEM
|
|||
pyu-ruby-sasl (0.0.3.3)
|
||||
raabro (1.4.0)
|
||||
racc (1.8.1)
|
||||
rack (2.2.11)
|
||||
rack (2.2.13)
|
||||
rack-accept (0.4.5)
|
||||
rack (>= 0.4)
|
||||
rack-attack (6.7.0)
|
||||
|
@ -1707,7 +1688,7 @@ GEM
|
|||
ruby-fogbugz (0.3.0)
|
||||
crack (~> 0.4)
|
||||
multipart-post (~> 2.0)
|
||||
ruby-lsp (0.23.10)
|
||||
ruby-lsp (0.23.13)
|
||||
language_server-protocol (~> 3.17.0)
|
||||
prism (>= 1.2, < 2.0)
|
||||
rbs (>= 3, < 4)
|
||||
|
@ -1719,6 +1700,9 @@ GEM
|
|||
ruby-magic (0.6.0)
|
||||
mini_portile2 (~> 2.8)
|
||||
ruby-progressbar (1.11.0)
|
||||
ruby-saml (1.18.0)
|
||||
nokogiri (>= 1.13.10)
|
||||
rexml
|
||||
ruby-statistics (4.1.0)
|
||||
ruby2_keywords (0.0.5)
|
||||
rubyntlm (0.6.3)
|
||||
|
@ -1764,6 +1748,12 @@ GEM
|
|||
shellany (0.0.1)
|
||||
shoulda-matchers (6.4.0)
|
||||
activesupport (>= 5.2.0)
|
||||
sidekiq (7.3.9)
|
||||
base64
|
||||
connection_pool (>= 2.3.0)
|
||||
logger
|
||||
rack (>= 2.2.4)
|
||||
redis-client (>= 0.22.2)
|
||||
sidekiq-cron (1.12.0)
|
||||
fugit (~> 1.8)
|
||||
globalid (>= 1.0.1)
|
||||
|
@ -1812,7 +1802,7 @@ GEM
|
|||
sorbet-runtime (0.5.11647)
|
||||
spamcheck (1.3.3)
|
||||
grpc (~> 1.63)
|
||||
spring (4.1.0)
|
||||
spring (4.3.0)
|
||||
spring-commands-rspec (1.0.4)
|
||||
spring (>= 0.9.1)
|
||||
sprite-factory (1.7.1)
|
||||
|
@ -1916,11 +1906,12 @@ GEM
|
|||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
uber (0.1.0)
|
||||
undercover (0.6.3)
|
||||
undercover (0.6.4)
|
||||
base64
|
||||
bigdecimal
|
||||
imagen (>= 0.2.0)
|
||||
rainbow (>= 2.1, < 4.0)
|
||||
rugged (>= 0.27, < 1.8)
|
||||
rugged (>= 0.27, < 1.10)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.8.2)
|
||||
|
@ -2054,7 +2045,7 @@ DEPENDENCIES
|
|||
coverband (= 6.1.4)
|
||||
creole (~> 0.5.0)
|
||||
crystalball (~> 0.7.0)
|
||||
cssbundling-rails (= 1.4.2)
|
||||
cssbundling-rails (= 1.4.3)
|
||||
csv_builder!
|
||||
cvss-suite (~> 3.3.0)
|
||||
database_cleaner-active_record (~> 2.2.0)
|
||||
|
@ -2062,7 +2053,7 @@ DEPENDENCIES
|
|||
declarative_policy (~> 1.1.0)
|
||||
deprecation_toolkit (~> 1.5.1)
|
||||
derailed_benchmarks
|
||||
devfile (~> 0.1.1)
|
||||
devfile (~> 0.4.0)
|
||||
device_detector
|
||||
devise (~> 4.9.3)
|
||||
devise-pbkdf2-encryptable (~> 0.0.0)!
|
||||
|
@ -2108,12 +2099,12 @@ DEPENDENCIES
|
|||
gitlab-active-context!
|
||||
gitlab-backup-cli!
|
||||
gitlab-chronic (~> 0.10.5)
|
||||
gitlab-cloud-connector (~> 1.0.0)
|
||||
gitlab-cloud-connector (~> 1.5)
|
||||
gitlab-dangerfiles (~> 4.8.0)
|
||||
gitlab-duo-workflow-service-client (~> 0.1)!
|
||||
gitlab-experiment (~> 0.9.1)
|
||||
gitlab-fog-azure-rm (~> 2.2.0)
|
||||
gitlab-glfm-markdown (~> 0.0.27)
|
||||
gitlab-glfm-markdown (~> 0.0.29)
|
||||
gitlab-housekeeper!
|
||||
gitlab-http!
|
||||
gitlab-kas-grpc (~> 17.9.0.pre.rc2)
|
||||
|
@ -2160,7 +2151,6 @@ DEPENDENCIES
|
|||
grape-swagger (~> 2.1.2)
|
||||
grape-swagger-entity (~> 0.5.5)
|
||||
grape_logging (~> 1.8, >= 1.8.4)
|
||||
graphlient (~> 0.8.0)
|
||||
graphlyte (~> 1.0.0)
|
||||
graphql (= 2.4.11)!
|
||||
graphql-docs (~> 5.0.0)
|
||||
|
@ -2269,7 +2259,7 @@ DEPENDENCIES
|
|||
parslet (~> 1.8)
|
||||
peek (~> 1.1)
|
||||
pg (~> 1.5.6)
|
||||
pg_query (~> 6.0.0)
|
||||
pg_query (~> 6.1.0)
|
||||
png_quantizator (~> 0.2.1)
|
||||
premailer-rails (~> 1.12.0)
|
||||
prometheus-client-mmap (~> 1.2.9)
|
||||
|
@ -2312,7 +2302,7 @@ DEPENDENCIES
|
|||
ruby-lsp-rspec (~> 0.1.10)
|
||||
ruby-magic (~> 0.6)
|
||||
ruby-progressbar (~> 1.10)
|
||||
ruby-saml (~> 1.18.0)!
|
||||
ruby-saml (~> 1.18)
|
||||
rubyzip (~> 2.3.2)
|
||||
rugged (~> 1.6)
|
||||
sanitize (~> 6.0.2)
|
||||
|
@ -2324,7 +2314,7 @@ DEPENDENCIES
|
|||
sentry-ruby (~> 5.22.0)
|
||||
sentry-sidekiq (~> 5.22.0)
|
||||
shoulda-matchers (~> 6.4.0)
|
||||
sidekiq!
|
||||
sidekiq (~> 7.3.9)
|
||||
sidekiq-cron (~> 1.12.0)
|
||||
sigdump (~> 0.2.4)
|
||||
simple_po_parser (~> 1.1.6)
|
||||
|
@ -2335,7 +2325,7 @@ DEPENDENCIES
|
|||
snowplow-tracker (~> 0.8.0)
|
||||
solargraph (~> 0.47.2)
|
||||
spamcheck (~> 1.3.0)
|
||||
spring (~> 4.1.0)
|
||||
spring (~> 4.3.0)
|
||||
spring-commands-rspec (~> 1.0.4)
|
||||
sprite-factory (~> 1.7)
|
||||
sprockets (~> 3.7.0)
|
||||
|
@ -2372,6 +2362,7 @@ DEPENDENCIES
|
|||
webrick (~> 1.8.1)
|
||||
wikicloth (= 0.8.1)
|
||||
yajl-ruby (~> 1.4.3)
|
||||
yard (~> 0.9)
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.2
|
||||
2.6.6
|
||||
|
|
|
@ -9,10 +9,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1bixpb7sp6m7wp56icrs5094f0lvr2di1yspfwcmz6373d3ba2v5";
|
||||
sha256 = "0hbn563v0rc85md0fcx3z968dvq7n2ra64wbgyxg09ndjgwl9870";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.20";
|
||||
version = "2.0.21";
|
||||
};
|
||||
actioncable = {
|
||||
dependencies = [
|
||||
|
@ -456,10 +456,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0p29xccd3y96m7yb15yr96j362cz855ramn2x83g5z2642ag68w3";
|
||||
sha256 = "01jh5b1wh9gvgrkl2bgc93pimc0ncjbi5vsadgxxp9a8d4s9fb31";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.23.0";
|
||||
version = "2.23.1";
|
||||
};
|
||||
atlassian-jwt = {
|
||||
dependencies = [ "jwt" ];
|
||||
|
@ -1377,10 +1377,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1kscxk81incimp3y9dkaqbn8d1awzm2nn7dx24lq1nbs15l5fp18";
|
||||
sha256 = "0hbfji8lddlvsk9x70s5xvafl3w31v6mm5wjrn7rrb14gmdcvbjk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
};
|
||||
csv = {
|
||||
groups = [
|
||||
|
@ -1623,10 +1623,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0yf8ckwr0pkzbdhs4y57gv9a80hvasdjv815fn67yhs4zpphqs5f";
|
||||
sha256 = "1yca2rd1xb9h3his5kpnawjgki2rpgslchrn44imhig9v8l7fnw8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.1";
|
||||
version = "0.4.0";
|
||||
};
|
||||
device_detector = {
|
||||
groups = [ "default" ];
|
||||
|
@ -2868,10 +2868,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1bsis23gkm8p2q7p24l2si3iw3r329ygmklahakbh7lfd4yd3wpd";
|
||||
sha256 = "0karz59rpw7vz4ckxc37gjs7lgb6zsa1pvsr57wzqfbpppgx5swa";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
version = "1.6.0";
|
||||
};
|
||||
gitlab-dangerfiles = {
|
||||
dependencies = [
|
||||
|
@ -2942,10 +2942,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "188laljplhci8pr8crxi3b0sj9501zya74ipqyg33gkv0cf4h3ln";
|
||||
sha256 = "09mjdrgjyad1l2lcaiy62486hnajpv9mgyxcv6vrhga0dncqm6m1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.28";
|
||||
version = "0.0.29";
|
||||
};
|
||||
gitlab-housekeeper = {
|
||||
dependencies = [
|
||||
|
@ -3142,16 +3142,18 @@ src: {
|
|||
"grpc_reflection"
|
||||
"parallel"
|
||||
"re2"
|
||||
"sentry-ruby"
|
||||
"stackprof"
|
||||
"toml-rb"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "04sn44br9qcv5s4p2z0sjv402nlpiw0ial5gx0np9v1dcppqfpcr";
|
||||
sha256 = "1rv3r1wj5pnwjbkw3333y7kxj1hzzq0vnf6xdjj95n8m5b9krpck";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.19.0";
|
||||
version = "0.23.0";
|
||||
};
|
||||
gitlab-security_report_schemas = {
|
||||
dependencies = [
|
||||
|
@ -3178,7 +3180,7 @@ src: {
|
|||
path = "${src}/vendor/gems/sidekiq-reliable-fetch";
|
||||
type = "path";
|
||||
};
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
};
|
||||
gitlab-styles = {
|
||||
dependencies = [
|
||||
|
@ -3818,20 +3820,6 @@ src: {
|
|||
};
|
||||
version = "1.8.4";
|
||||
};
|
||||
graphlient = {
|
||||
dependencies = [
|
||||
"faraday"
|
||||
"graphql-client"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1cbwirpx8hclxyrxfbjz5c62l7i6nsqg6x72yplm8d083pd0ii4q";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.8.0";
|
||||
};
|
||||
graphlyte = {
|
||||
groups = [ "test" ];
|
||||
platforms = [ ];
|
||||
|
@ -3860,20 +3848,6 @@ src: {
|
|||
};
|
||||
version = "2.4.11";
|
||||
};
|
||||
graphql-client = {
|
||||
dependencies = [
|
||||
"activesupport"
|
||||
"graphql"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1hdb5fd1vd1zs7kc84ng7lj95081dqwrapyidg8alsv7a7jbhf7j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.23.0";
|
||||
};
|
||||
graphql-docs = {
|
||||
dependencies = [
|
||||
"commonmarker"
|
||||
|
@ -4466,10 +4440,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1p4l5ycdxfsr8b51gnvlvhq6s21vmx9z4x617003zbqv3bcqmj6x";
|
||||
sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
};
|
||||
json-jwt = {
|
||||
dependencies = [
|
||||
|
@ -4740,6 +4714,7 @@ src: {
|
|||
};
|
||||
license_finder = {
|
||||
dependencies = [
|
||||
"csv"
|
||||
"rubyzip"
|
||||
"thor"
|
||||
"tomlrb"
|
||||
|
@ -4754,10 +4729,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0v66fb85majc816qip42kbwcn41lr6rm5w6zim4a2kgp74v0n0kd";
|
||||
sha256 = "057ghx449d70bakmn3fjr4x6f4rq4cj61l9gnww0c5sbnqcsv7hp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.1.0";
|
||||
version = "7.2.1";
|
||||
};
|
||||
licensee = {
|
||||
dependencies = [
|
||||
|
@ -5513,10 +5488,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0npx535cs8qc33n0lpbbwl0p9fi3a5bczn6ayqhxvknh9yqw77vb";
|
||||
sha256 = "0cgv8vzp7kl20ip8qdzmrbr1vaaw4mjjy4mksg8k13z4xxfzyqvb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.18.3";
|
||||
version = "1.18.7";
|
||||
};
|
||||
notiffany = {
|
||||
dependencies = [
|
||||
|
@ -5799,10 +5774,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1czvs3nj1d8pmf39vgghpbp7g1hgzbxlv8d563agr16nq856bk44";
|
||||
sha256 = "1c2i8yry06qpqg4k8xps5aj0hfw7l7m5vdqf85sbpr04ngfdpq6l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
};
|
||||
omniauth-shibboleth-redux = {
|
||||
dependencies = [ "omniauth" ];
|
||||
|
@ -6588,10 +6563,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "012w1ypcbzy6w4dsxiziqn1vqddwzpza3zdvw9hivvhcj179mw7v";
|
||||
sha256 = "07j86a2mf90dhjlm6ns7p59ij91axg860k63hxc2rw89w8lm404b";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
};
|
||||
plist = {
|
||||
groups = [ "default" ];
|
||||
|
@ -6851,10 +6826,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "12mv97fz3jp6nl4bc36wiqwdiivv5lgqcpfnan91w20rzapljk22";
|
||||
sha256 = "1yzhcwvfkrlb8l79w24yjclv636jn6rnznp95shmssk934bi1vnc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.11";
|
||||
version = "2.2.13";
|
||||
};
|
||||
rack-accept = {
|
||||
dependencies = [ "rack" ];
|
||||
|
@ -7925,10 +7900,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0v2dag8wl2zpd51qml5w0icb4wp77z7gfjcfq696zimxyf7v1pvi";
|
||||
sha256 = "0j4zcp7nncrr6sn0m3scnqsxcf7j2v82pxcd7p3436m70ncmm1x1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.23.10";
|
||||
version = "0.23.13";
|
||||
};
|
||||
ruby-lsp-rails = {
|
||||
dependencies = [ "ruby-lsp" ];
|
||||
|
@ -7985,8 +7960,9 @@ src: {
|
|||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
path = "${src}/vendor/gems/ruby-saml";
|
||||
type = "path";
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0vgsvdaglz1spx9gxrr6xh7qqhi4qd8jd06h2ihwxmazj9ajld6y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.18.0";
|
||||
};
|
||||
|
@ -8268,18 +8244,20 @@ src: {
|
|||
};
|
||||
sidekiq = {
|
||||
dependencies = [
|
||||
"concurrent-ruby"
|
||||
"base64"
|
||||
"connection_pool"
|
||||
"logger"
|
||||
"rack"
|
||||
"redis-client"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
path = "${src}/vendor/gems/sidekiq-7.2.4";
|
||||
type = "path";
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "19xm4s49hq0kpfbmvhnjskzmfjjxw5d5sm7350mh12gg3lp7220i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.2.4";
|
||||
version = "7.3.9";
|
||||
};
|
||||
sidekiq-cron = {
|
||||
dependencies = [
|
||||
|
@ -8545,10 +8523,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1jx3y1krmx7flrp8fldb354cap1xxlln4yl97ik8smfzn07hhzzi";
|
||||
sha256 = "08kizsvrb7a19aps7a8rpmndfq16jb8q2j45fn155s1qrsyg7aha";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.1.0";
|
||||
version = "4.3.0";
|
||||
};
|
||||
spring-commands-rspec = {
|
||||
dependencies = [ "spring" ];
|
||||
|
@ -9234,6 +9212,7 @@ src: {
|
|||
};
|
||||
undercover = {
|
||||
dependencies = [
|
||||
"base64"
|
||||
"bigdecimal"
|
||||
"imagen"
|
||||
"rainbow"
|
||||
|
@ -9247,10 +9226,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1yk5rgr82zl0k1vjpfs42lpw2lzk5hgc970zd03abl1ypi344k57";
|
||||
sha256 = "06pc56qly4c8ygwg9hyay1vmxq75clm62ljw0s9ljamm57qzqd1w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
};
|
||||
unf = {
|
||||
dependencies = [ "unf_ext" ];
|
||||
|
|
|
@ -191,7 +191,7 @@ def update_rubyenv():
|
|||
# [comment]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435#note_1979750600
|
||||
# [upstream issue]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435
|
||||
subprocess.check_output(
|
||||
["sed", "-i", "s|gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq'|gem 'sidekiq', '~> 7.1.6'|g", "Gemfile"],
|
||||
["sed", "-i", "s|gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq'|gem 'sidekiq', '~> 7.3.9'|g", "Gemfile"],
|
||||
cwd=rubyenv_dir,
|
||||
)
|
||||
|
||||
|
@ -241,6 +241,9 @@ def update_rubyenv():
|
|||
)
|
||||
subprocess.check_output(["rm", "-rf", "vendor", "gems"], cwd=rubyenv_dir)
|
||||
|
||||
# Reformat gemset.nix
|
||||
subprocess.check_output(["nix-shell", "--run", "treefmt pkgs/applications/version-management/gitlab"], cwd=NIXPKGS_PATH)
|
||||
|
||||
|
||||
@cli.command("update-gitaly")
|
||||
def update_gitaly():
|
||||
|
@ -375,15 +378,12 @@ def commit_gitlab(old_version: str, new_version: str, new_rev: str) -> None:
|
|||
[
|
||||
"git",
|
||||
"add",
|
||||
"data.json",
|
||||
"rubyEnv",
|
||||
"gitaly",
|
||||
"gitlab-pages",
|
||||
"gitlab-shell",
|
||||
"gitlab-workhorse",
|
||||
"gitlab-elasticsearch-indexer",
|
||||
"pkgs/applications/version-management/gitlab",
|
||||
"pkgs/by-name/gi/gitaly",
|
||||
"pkgs/by-name/gi/gitlab-elasticsearch-indexer",
|
||||
"pkgs/by-name/gi/gitlab-pages",
|
||||
],
|
||||
cwd=GITLAB_DIR,
|
||||
cwd=NIXPKGS_PATH,
|
||||
)
|
||||
subprocess.run(
|
||||
[
|
||||
|
@ -392,13 +392,20 @@ def commit_gitlab(old_version: str, new_version: str, new_rev: str) -> None:
|
|||
"--message",
|
||||
f"""gitlab: {old_version} -> {new_version}\n\nhttps://gitlab.com/gitlab-org/gitlab/-/blob/{new_rev}/CHANGELOG.md""",
|
||||
],
|
||||
cwd=GITLAB_DIR,
|
||||
cwd=NIXPKGS_PATH,
|
||||
)
|
||||
|
||||
|
||||
def commit_container_registry(old_version: str, new_version: str) -> None:
|
||||
"""Commits the gitlab-container-registry changes for you"""
|
||||
subprocess.run(["git", "add", "gitlab-container-registry"], cwd=GITLAB_DIR)
|
||||
subprocess.run(
|
||||
[
|
||||
"git",
|
||||
"add",
|
||||
"pkgs/by-name/gi/gitlab-container-registry"
|
||||
],
|
||||
cwd=NIXPKGS_PATH,
|
||||
)
|
||||
subprocess.run(
|
||||
[
|
||||
"git",
|
||||
|
@ -406,7 +413,7 @@ def commit_container_registry(old_version: str, new_version: str) -> None:
|
|||
"--message",
|
||||
f"gitlab-container-registry: {old_version} -> {new_version}\n\nhttps://gitlab.com/gitlab-org/container-registry/-/blob/v{new_version}-gitlab/CHANGELOG.md",
|
||||
],
|
||||
cwd=GITLAB_DIR,
|
||||
cwd=NIXPKGS_PATH,
|
||||
)
|
||||
|
||||
|
||||
|
|
|
@ -81,14 +81,12 @@ lib.makeOverridable (
|
|||
inherit scriptName;
|
||||
}
|
||||
// lib.optionalAttrs (runtime-dependencies != [ ]) {
|
||||
extraWrapperArgs =
|
||||
[
|
||||
"--prefix"
|
||||
"PATH"
|
||||
":"
|
||||
]
|
||||
++ (map lib.makeBinPath runtime-dependencies)
|
||||
++ args.passthru.extraWrapperArgs or [ ];
|
||||
extraWrapperArgs = [
|
||||
"--prefix"
|
||||
"PATH"
|
||||
":"
|
||||
(lib.makeBinPath runtime-dependencies)
|
||||
] ++ args.passthru.extraWrapperArgs or [ ];
|
||||
};
|
||||
meta =
|
||||
{
|
||||
|
|
|
@ -9,21 +9,21 @@
|
|||
|
||||
buildLua (finalAttrs: {
|
||||
pname = "uosc";
|
||||
version = "5.6.2";
|
||||
version = "5.8.0";
|
||||
scriptPath = "src/uosc";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomasklaen";
|
||||
repo = "uosc";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-UbSEJGlLSX5wZpfj+Cb3LfWw17pnjxIJUNtP8dclKoU=";
|
||||
hash = "sha256-O8GLYsFoDQmYvHWLwfWo1zcQvCsV2RqAe/m+R5cOITI=";
|
||||
};
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
tools = buildGoModule {
|
||||
pname = "uosc-bin";
|
||||
inherit (finalAttrs) version src;
|
||||
vendorHash = "sha256-nkY0z2GiDxfNs98dpe+wZNI3dAXcuHaD/nHiZ2XnZ1Y=";
|
||||
vendorHash = "sha256-oRXChHeVQj6nXvKOVV125sM8wD33Dxxv0r/S7sl6SxQ=";
|
||||
};
|
||||
|
||||
# the script uses custom "texture" fonts as the background for ui elements.
|
||||
|
|
|
@ -43,17 +43,17 @@ in
|
|||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = binName;
|
||||
|
||||
version = "0.21.2";
|
||||
version = "0.21.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "toeverything";
|
||||
repo = "AFFiNE";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-d5dHHiiCXhzn8qJlCqJVw0qC86PvKyDZstPivX9bpCI=";
|
||||
hash = "sha256-Xd8b+JXL46r9Jv5Uv5wdtvSKwnHafEo52v1aERmyxrI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-0vhUeqCStM7P8+sDs3ZI+JlEzPAreoP+1X8x5zKOJUo=";
|
||||
hash = "sha256-1BTSvHaSPE55v6awnvRry1Exms+zeGug3PNldZ2v2HY=";
|
||||
};
|
||||
yarnOfflineCache = stdenvNoCC.mkDerivation {
|
||||
name = "yarn-offline-cache";
|
||||
|
@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
dontInstall = true;
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-pJiMCyBJSuTaxix3kKnSCrURL2+t26zB4Y59gGdxalo=";
|
||||
outputHash = "sha256-w9Lz8wFq34VXInoE5pUeg1B7N92D+TnBWbL2qJ/q8ik=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals hostPlatform.isDarwin [
|
||||
|
|
|
@ -4,31 +4,34 @@
|
|||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ain";
|
||||
version = "1.4.1";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonaslu";
|
||||
repo = "ain";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JEavBPnF3WW6oCZ1OC8g1dZev4qC7bi74/q2nvXK3mo=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jZTdFA3ZNb0xIN7+ne5bz6jMpj4jqZ/JHxz2x83fBm8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+72Y8SKvx7KBK5AIBWKlDqQYpHnZc9CNxCdo4yakPb0=";
|
||||
vendorHash = "sha256-VLn7JPYYFmQ/9c0zKHWJBqtxwCbWgsN4FHlXrQiKMj4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=main.gitSha=${src.rev}"
|
||||
"-X=main.gitSha=${finalAttrs.src.tag}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
# need network
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "HTTP API client for the terminal";
|
||||
homepage = "https://github.com/jonaslu/ain";
|
||||
changelog = "https://github.com/jonaslu/ain/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
changelog = "https://github.com/jonaslu/ain/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ figsoda ];
|
||||
mainProgram = "ain";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -53,7 +53,7 @@ let
|
|||
|
||||
vcvRackSdk = srcOnly vcv-rack;
|
||||
pname = "airwin2rack";
|
||||
version = "2.13.0";
|
||||
version = "2.13.0-unstable-2025-04-07";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
|
@ -62,8 +62,8 @@ stdenv.mkDerivation {
|
|||
src = fetchFromGitHub {
|
||||
owner = "baconpaul";
|
||||
repo = "airwin2rack";
|
||||
tag = "DAWPlugin";
|
||||
hash = "sha256-xjE9M5fMeOOYncq7xe+v++XvfUL6QZc2tF0jnYWSwKQ=";
|
||||
rev = "595eb7c7ccec5f9e662f8d620579a91dab60c1ff";
|
||||
hash = "sha256-gBphJ6WSPw6DOQk64w8GmLrtuYSF7NFEf6xK1oxOF3w=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "alistral";
|
||||
version = "0.5.6";
|
||||
version = "0.5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RustyNova016";
|
||||
repo = "Alistral";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6p2KMFTdC04lEhNQiu88ALBPrpQUF9JhXDacntoq4lE=";
|
||||
hash = "sha256-LSuNVfGus9kO1g4EfVCw6yWxudvYqBnM5mpJWH7MBCs=";
|
||||
};
|
||||
|
||||
# remove if updating to rust 1.85
|
||||
|
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-2pi2hfQTLs2HAlgp1DQCMFp/nMJQfcuQFhGlrsWgy5E=";
|
||||
cargoHash = "sha256-lq+0R5g4MwVm8ESjKpz+aymjpqcaAE856XnBtYXYs8A=";
|
||||
|
||||
env.RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
|
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
let
|
||||
pname = "altus";
|
||||
version = "5.7.0";
|
||||
version = "5.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
name = "altus-${version}.AppImage";
|
||||
url = "https://github.com/amanharwara/altus/releases/download/${version}/Altus-${version}.AppImage";
|
||||
hash = "sha256-75mNEXH+C/gRptq3Cx2GUdm3+goDbIvHzpYl0tU3WoU=";
|
||||
hash = "sha256-G0jKBnobMKJWZmLtyYLpdruNxEVGt5rZHPFJYJkY8Y4=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
@ -7,18 +7,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "amazon-q-cli";
|
||||
version = "1.7.3";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "amazon-q-developer-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Hi0klNNxtWlZvcqobb8Y2hLsw/Pck1YQZB4AYBmcNKI=";
|
||||
hash = "sha256-fOz9oz+xNwX2Bzl6szgQ9oai6lqP+EzbaCNzHPUT2cA=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
cargoHash = "sha256-XK6B2OTCnWMow3KHWU6OK1HsyQW7apcLoYRP7viTte0=";
|
||||
cargoHash = "sha256-H9bCke3vQDuS6RDEg8dzeFiBWCex64A8KSRhfgyp8e8=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
|
|
|
@ -34,14 +34,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "anydesk";
|
||||
version = "6.4.3";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
|
||||
"https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
|
||||
];
|
||||
hash = "sha256-P90BPUayKG+uYszIQkbYcBg1vObQvueq67HU+su+GSI=";
|
||||
hash = "sha256-AEj4/S4k6mnCb/CagEDhpCtExB8pIqv7V2b/br4nC/8=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
@ -6,17 +6,17 @@
|
|||
}:
|
||||
|
||||
let
|
||||
snapshot = "20240601172844";
|
||||
snapshot = "20250105225747";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "apparency";
|
||||
version = "2.0";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchurl {
|
||||
# Use externally archived download URL because
|
||||
# upstream does not provide stable URLs for versioned releases
|
||||
url = "https://web.archive.org/web/${snapshot}/https://www.mothersruin.com/software/downloads/Apparency.dmg";
|
||||
hash = "sha256-XKxWxqfxy9AQneILLrN9XqLt4/k2N8yumZ5mrSvczFk=";
|
||||
hash = "sha256-nktNbyJOXDydQPwb43Uq3nQv65XcwrqZTKu5OCcLyfU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
@ -34,10 +34,10 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
description = "App That Opens Apps";
|
||||
description = "Toolkit for analysing macOS applications";
|
||||
homepage = "https://www.mothersruin.com/software/Apparency/";
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ andre4ik3 ];
|
||||
mainProgram = "appy";
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qt5,
|
||||
|
@ -27,6 +28,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
hash = "sha256-b2RqSw0Ksn9OLxQV9+3reBiqrty+Kx9OwV93jlvuPnY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "include-algorithm-header.patch";
|
||||
url = "https://github.com/AppImageCommunity/AppImageUpdate/commit/5e91de84aba775ba8d3a4771e4f7f06056f9b764.patch";
|
||||
hash = "sha256-RX2HFAlGsEjXona7cL3WdwwiiA0u9CnfvHMC6S0DeLY=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'VERSION 1-alpha' 'VERSION ${finalAttrs.version}' \
|
||||
|
|
|
@ -12,18 +12,18 @@
|
|||
aptly,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "aptly";
|
||||
version = "1.5.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aptly-dev";
|
||||
repo = "aptly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LqGOLXXaGfQfoj2r+aY9SdOKUDI9+22EsHKBhHMidyk=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oGogOK0oQTdmlQUrIOo2BT/8wEk9kZ3mJbj0K5s9tiU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6l3OFKFTtFWT68Ylav6woczBlMhD75C9ZoQ6OeLz0Cs=";
|
||||
vendorHash = "sha256-4z0JFC+Cz72e48ygfgA4DYJVkpInPIyA5yh//eedt8Q=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
@ -33,21 +33,24 @@ buildGoModule rec {
|
|||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.Version=${version}"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
echo ${finalAttrs.version} > VERSION
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash --name aptly completion.d/aptly
|
||||
installShellCompletion --zsh --name _aptly completion.d/_aptly
|
||||
wrapProgram "$out/bin/aptly" \
|
||||
--prefix PATH ":" "${
|
||||
wrapProgram $out/bin/aptly \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
gnupg
|
||||
bzip2
|
||||
xz
|
||||
graphviz
|
||||
]
|
||||
}"
|
||||
}
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
@ -57,12 +60,12 @@ buildGoModule rec {
|
|||
command = "aptly version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://www.aptly.info";
|
||||
description = "Debian repository management tool";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ montag451 ] ++ teams.bitnomial.members;
|
||||
changelog = "https://github.com/aptly-dev/aptly/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.montag451 ] ++ lib.teams.bitnomial.members;
|
||||
changelog = "https://github.com/aptly-dev/aptly/releases/tag/v${finalAttrs.version}";
|
||||
mainProgram = "aptly";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -4,16 +4,17 @@
|
|||
fetchFromGitHub,
|
||||
jdk,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "async-profiler";
|
||||
version = "3.0";
|
||||
version = "4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jvm-profiling-tools";
|
||||
repo = "async-profiler";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0CCJoRjRLq4LpiRD0ibzK8So9qSQymePCTYUI60Oy2k=";
|
||||
hash = "sha256-4S5Lbhqu2V7TzrbFf3G3G4OEYLU6w5lcgUl49k9YqSA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -35,6 +36,8 @@ stdenv.mkDerivation rec {
|
|||
wrapProgram $out/bin/async-profiler --prefix PATH : ${lib.makeBinPath [ jdk ]}
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Low overhead sampling profiler for Java that does not suffer from Safepoint bias problem";
|
||||
homepage = "https://github.com/jvm-profiling-tools/async-profiler";
|
||||
|
|
|
@ -8,19 +8,19 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "atlas";
|
||||
version = "0.32.0";
|
||||
version = "0.32.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ariga";
|
||||
repo = "atlas";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-iM+Qy8tQAjonXpt36WWIEIAmtqnR0wWtMMxIh76Fv0U=";
|
||||
hash = "sha256-1uPOS5r13nGNAPxCCphrmWyvxg+OoopMP0U/VhR+gDQ=";
|
||||
};
|
||||
|
||||
modRoot = "cmd/atlas";
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-kSKxZmguHasRlxI3h2Gm/0sj8dQwUd8F9bL1yp6stRE=";
|
||||
vendorHash = "sha256-K94zOisolCplE/cFrWmv4/MWl5DD27lRekPTl+o4Jwk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -25,14 +25,14 @@ in
|
|||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "awsebcli";
|
||||
version = "3.22";
|
||||
version = "3.23.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-elastic-beanstalk-cli";
|
||||
tag = version;
|
||||
hash = "sha256-I85VteUjPPWRixXC1mEiMmk46mYPzQJoaYcHV8ztMU4=";
|
||||
hash = "sha256-nZP3eepp3hUT2hCxz75vTP1N2akOZPQhyFRN6ecJvU4=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
@ -9,10 +9,10 @@
|
|||
}:
|
||||
let
|
||||
pname = "beeper";
|
||||
version = "4.0.623";
|
||||
version = "4.0.640";
|
||||
src = fetchurl {
|
||||
url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
|
||||
hash = "sha256-K043RQ5BoS1ysnmY+LpRixBmMx2XCbRzhWnWsxg26dg=";
|
||||
hash = "sha256-hYbTYvfrTpRPRwXXgNCqKeEtiRpuLj6sYIYnfJ3aMv4=";
|
||||
};
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit version pname src;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Generated by ./update.sh - do not update manually!
|
||||
{
|
||||
version = "1.16.3-3";
|
||||
arm64-hash = "sha256-tZlTNK3kBvIjYARQO7YSj/dbQ0iCuPeWM7+XYFYg8/M=";
|
||||
x86_64-hash = "sha256-o3QP3gfotqRisN6tCch6JFlf8jNVbv6XB8xAnQpYQqA=";
|
||||
version = "1.16.4-1";
|
||||
arm64-hash = "sha256-x+sVupWT8CrEPSTOJFW1DYuc3tuVepHXjRF7+8NdTbw=";
|
||||
x86_64-hash = "sha256-zMw8NfeLNMBbJZqoZeNy9j65otJ8iWnq79PLqzlR+6I=";
|
||||
}
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
opencolorio,
|
||||
openexr,
|
||||
openimagedenoise,
|
||||
openimageio,
|
||||
openimageio_2,
|
||||
openjpeg,
|
||||
openpgl,
|
||||
opensubdiv,
|
||||
|
@ -251,7 +251,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
|||
libwebp
|
||||
opencolorio
|
||||
openexr
|
||||
openimageio
|
||||
openimageio_2
|
||||
openjpeg
|
||||
openpgl
|
||||
(opensubdiv.override { inherit cudaSupport; })
|
||||
|
|
39
pkgs/by-name/bo/bootspec-lix/package.nix
Normal file
39
pkgs/by-name/bo/bootspec-lix/package.nix
Normal file
|
@ -0,0 +1,39 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitea,
|
||||
fetchpatch,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bootspec-lix";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.lix.systems";
|
||||
owner = "lix-community";
|
||||
repo = "bootspec";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5IGSMHeL0eKfl7teDejAckYQjc8aeLwfwIQSzQ8YaAg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/DeterminateSystems/bootspec/pull/127
|
||||
# Fixes the synthesize tool for aarch64-linux
|
||||
(fetchpatch {
|
||||
name = "aarch64-support.patch";
|
||||
url = "https://github.com/DeterminateSystems/bootspec/commit/1d0e925f360f0199f13422fb7541225fd162fd4f.patch";
|
||||
sha256 = "sha256-wU/jWnOqVBrU2swANdXbQfzRpNd/JIS4cxSyCvixZM0=";
|
||||
})
|
||||
];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-65jk8UlXZgQoxuwRcGlMnI4e+LpCJuP2TaqK+Kn4GnQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Vendor-neutral implementation of RFC-0125's datatype and synthesis tooling";
|
||||
homepage = "https://git.lix.systems/lix-community/bootspec";
|
||||
license = licenses.mit;
|
||||
maintainers = [ lib.maintainers.raitobezarius ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
|
@ -3,24 +3,24 @@
|
|||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.77.97";
|
||||
version = "1.77.101";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-1MIcibP89EMCOK4A9lbXxGgwvMKCB+3UxrT+UYiwmtk=";
|
||||
hash = "sha256-/JY1eBLw3xTxeAinctlpTSbwk6QibPdMVhZcBkbe7G4=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-6JO67t5yR2psvlYhOMERnMgta+YYTIQx/zen7y3B1Ec=";
|
||||
hash = "sha256-mRbRGCsvkrNVfwYrlfgGyU94dEezFTI/ittkbVynp7Q=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-d2MQMf1twOhcAouIPpdjG5jB/tZ7FGi/lrRJZ/A/ibs=";
|
||||
hash = "sha256-tn5HdMLoVRY1oLAYc/O2v2mVblb6KYud53yoHloEQ44=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-vEF26I1+nqBERFdZEKLcDZBDru0RXcwytvblRuqL8/M=";
|
||||
hash = "sha256-HJel3HVz5MoOWXGTEH8Gu+Fq2Xur7xHXeZTUmWcWksk=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -12,17 +12,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "brush";
|
||||
version = "0.2.16";
|
||||
version = "0.2.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reubeno";
|
||||
repo = "brush";
|
||||
tag = "brush-shell-v${version}";
|
||||
hash = "sha256-ZQ1IiWkM888CWEtwWJ+dMjJO1sGvBTA8E6f9v9JLh/w=";
|
||||
hash = "sha256-64xj9yu6OCNTnuymEd5ihdE0s8RWfrSMfTz9TlMQ6Sg=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Vg5efRierCc7sT+7b94/4i4+3L5CoOrDoeMx/Rzg5mE=";
|
||||
cargoHash = "sha256-AIEgSUl3YFCa6FOgoZYpPc1qc2EOfpm1lZEQYlBgkGg=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "buildkit";
|
||||
version = "0.20.2";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "buildkit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2zLXkiouPLmjxveoggsr+WUmdcZEN+FzeiVR1Dk6EA8=";
|
||||
hash = "sha256-0QzbRswTPfO2U6lrClpAsH2QbTfE7JcMjv1Qt033UZs=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bustools";
|
||||
version = "0.44.1";
|
||||
version = "0.45.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BUStools";
|
||||
repo = "bustools";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0Y+9T9V+l20hqxpKbSWsEB0tt8A/ctYcoPN2n/roxvg=";
|
||||
sha256 = "sha256-Af2WUryx4HQuAlNJ1RWJK1Mj2M7X+4Ckap3rqEJ3vto=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
let
|
||||
pname = "cables";
|
||||
version = "0.5.11";
|
||||
version = "0.5.12";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage";
|
||||
sha256 = "sha256-d6IKORuySXrVk5ifevtPlposSuxk7n9b/dxD8CRfdMQ=";
|
||||
sha256 = "sha256-uQWfll9aYVNmR9Sw0PnupxY6n/gv+nV0pIttsmzGM9A=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "camunda-modeler";
|
||||
version = "5.33.1";
|
||||
version = "5.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
|
||||
hash = "sha256-YZSekLBjyADmBauGn5gonJ98bpW7ubHeKDS7J0IxsJo=";
|
||||
hash = "sha256-3A8f371zyfx2GWJSwL0e+pD9M1Nitk4P7voq+V8Fojs=";
|
||||
};
|
||||
sourceRoot = "camunda-modeler-${version}-linux-x64";
|
||||
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/cargo-geiger/src/lib.rs b/cargo-geiger/src/lib.rs
|
||||
index cc08146..d220ad9 100644
|
||||
--- a/cargo-geiger/src/lib.rs
|
||||
+++ b/cargo-geiger/src/lib.rs
|
||||
@@ -5,7 +5,6 @@
|
||||
#![deny(clippy::cargo)]
|
||||
#![deny(clippy::doc_markdown)]
|
||||
#![forbid(unsafe_code)]
|
||||
-#![deny(warnings)]
|
||||
|
||||
/// Argument parsing
|
||||
pub mod args;
|
|
@ -1,48 +0,0 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 48c5606f..4c796675 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -2238,6 +2238,12 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "num-conv"
|
||||
+version = "0.1.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
||||
+
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.17"
|
||||
@@ -3148,13 +3154,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
-version = "0.3.30"
|
||||
+version = "0.3.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
|
||||
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"itoa",
|
||||
"libc",
|
||||
+ "num-conv",
|
||||
"num_threads",
|
||||
"powerfmt",
|
||||
"serde",
|
||||
@@ -3170,10 +3177,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
-version = "0.2.15"
|
||||
+version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
|
||||
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
|
||||
dependencies = [
|
||||
+ "num-conv",
|
||||
"time-core",
|
||||
]
|
||||
|
|
@ -1,92 +1,79 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
openssl,
|
||||
# darwin dependencies
|
||||
darwin,
|
||||
libiconv,
|
||||
curl,
|
||||
# testing
|
||||
testers,
|
||||
cargo-geiger,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-geiger";
|
||||
version = "0.11.7";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-secure-code";
|
||||
owner = "geiger-rs";
|
||||
repo = "cargo-geiger";
|
||||
rev = "cargo-geiger@v${version}";
|
||||
hash = "sha256-/5yuayqneZV6aVQ6YFgqNS2XY3W6yETRQ0kE5ovc7p8=";
|
||||
tag = "cargo-geiger-${version}";
|
||||
hash = "sha256-OW/LOZUCGOIl7jeWnzt4SXTo3gplJx/wbC21S1TdZx0=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# https://github.com/geiger-rs/cargo-geiger/pull/528
|
||||
./fix-build-with-rust-1.80.patch
|
||||
];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-n6RfulzrK9QebC1tgVVd/YnBc21Jf0OSfHApRO1c0ew=";
|
||||
cargoHash = "sha256-aDgpEfX0QRkQD6c4ant6uSN18WLHVnZISRr7lyu9IzA=";
|
||||
|
||||
patches = [
|
||||
./allow-warnings.patch
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
[
|
||||
CoreFoundation
|
||||
Security
|
||||
libiconv
|
||||
curl
|
||||
]
|
||||
);
|
||||
nativeBuildInputs =
|
||||
[ pkg-config ]
|
||||
# curl-sys wants to run curl-config on darwin
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ curl.dev ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
# skip tests with networking or other failures
|
||||
checkFlags = [
|
||||
"--skip serialize_test1_quick_report"
|
||||
# panics
|
||||
"--skip serialize_test2_quick_report"
|
||||
"--skip serialize_test3_quick_report"
|
||||
"--skip serialize_test4_quick_report"
|
||||
"--skip serialize_test6_quick_report"
|
||||
"--skip serialize_test7_quick_report"
|
||||
"--skip serialize_test1_report"
|
||||
"--skip serialize_test2_report"
|
||||
"--skip serialize_test3_report"
|
||||
"--skip serialize_test4_report"
|
||||
"--skip serialize_test6_report"
|
||||
"--skip serialize_test7_report"
|
||||
# multiple test cases that time-out or cause memory leaks
|
||||
"--skip test_package"
|
||||
# requires networking
|
||||
"--skip test_package::case_2"
|
||||
"--skip test_package::case_3"
|
||||
"--skip test_package::case_6"
|
||||
"--skip test_package::case_9"
|
||||
# panics, snapshot assertions fails
|
||||
"--skip test_package_update_readme::case_2"
|
||||
"--skip test_package_update_readme::case_3"
|
||||
"--skip test_package_update_readme::case_5"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rust-secure-code/cargo-geiger";
|
||||
changelog = "https://github.com/rust-secure-code/cargo-geiger/blob/cargo-geiger-${version}/CHANGELOG.md";
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = cargo-geiger;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Detects usage of unsafe Rust in a Rust crate and its dependencies";
|
||||
mainProgram = "cargo-geiger";
|
||||
longDescription = ''
|
||||
A cargo plugin that detects the usage of unsafe Rust in a Rust crate and
|
||||
its dependencies. It provides information to aid auditing and guide
|
||||
dependency selection but it can not help you decide when and why unsafe
|
||||
code is appropriate.
|
||||
'';
|
||||
license = with licenses; [
|
||||
homepage = "https://github.com/geiger-rs/cargo-geiger";
|
||||
changelog = "https://github.com/geiger-rs/cargo-geiger/blob/cargo-geiger-${version}/CHANGELOG.md";
|
||||
mainProgram = "cargo-geiger";
|
||||
license = with lib.licenses; [
|
||||
asl20 # or
|
||||
mit
|
||||
];
|
||||
maintainers = with maintainers; [
|
||||
maintainers = with lib.maintainers; [
|
||||
evanjs
|
||||
gepbird
|
||||
jk
|
||||
|
|
|
@ -13,17 +13,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-semver-checks";
|
||||
version = "0.40.0";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "obi1kenobi";
|
||||
repo = "cargo-semver-checks";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bit8/o5MqlIL4vvCS9fGR2rNtD/Dn58aFqsmyhKueUI=";
|
||||
hash = "sha256-84tRzqJqvm+ermtWMCkOIUmNeH/RLf8IUTIsEVPbGQk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-/8Juz8F5vJ/JLDYZUG9tyxkLSN7YPh5yAKJflpuSZ0w=";
|
||||
cargoHash = "sha256-8VtSQZHR8L6nijcN71ey9nW5nrAsPK6qyqJSWQDz8uw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
|
@ -18,18 +18,18 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cartero";
|
||||
version = "0.1.5";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danirod";
|
||||
repo = "cartero";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1pSOyVGGl+G6mspdzzYP/BoQueVvAHTP6Vwqt6zL80c=";
|
||||
hash = "sha256-EJhp/UQmD5Otf3n7wpd3s4oKt9g02q29tZA6bGKMQc8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-qqxoP/T9de4w2wQJaCtQGRsoD+/dF7ir4iwYY69R+/I=";
|
||||
hash = "sha256-szzQNFF+jMn7YLMjbmpM624T+qK0I++dNnZnJcPKZrw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdecl";
|
||||
version = "18.4.1";
|
||||
version = "18.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paul-j-lucas";
|
||||
repo = "cdecl";
|
||||
tag = "cdecl-${finalAttrs.version}";
|
||||
hash = "sha256-GtNB55zFIpt6yYE3olC3yQr2RLsS9AMewzJKDcb67GM=";
|
||||
hash = "sha256-adM+EoumgZs207WpqMHG09RknC3gcaaemqPCZF3P6gU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue