Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-10-21 12:07:41 +00:00
committed by GitHub
87 changed files with 1131 additions and 899 deletions
+6
View File
@@ -242,6 +242,12 @@
- `mariadb` now defaults to `mariadb_114` instead of `mariadb_1011`, meaning the default version was upgraded from 10.11.x to 11.4.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-11-to-mariadb-11-4/) for potential issues.
- `qt5.full` and `qt6.full` aliases have been removed. Their use has always been discouraged, and downstream projects should use `qtN.env` with the right set of packages.
- `python3Packages.duckduckgo-search` has been updated to v9+ and therefore has been renamed to ddgs.
Use `python3Packages.ddgs` instead.
See [release note for v9.0.0](https://github.com/deedy5/ddgs/releases/tag/v9.0.0)
## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+1
View File
@@ -309,6 +309,7 @@ with lib.maintainers;
xanderio
blitz
snu
e1mo
];
scope = "Team for Cyberus Technology employees who collectively maintain packages.";
shortName = "Cyberus Technology employees";
@@ -91,6 +91,7 @@ in
kio-admin # managing files as admin
kio-extras # stuff for MTP, AFC, etc
kio-fuse # fuse interface for KIO
knighttime # night mode switching daemon
kpackage # provides kpackagetool tool
kservice # provides kbuildsycoca6 tool
kunifiedpush # provides a background service and a KCM
@@ -266,6 +267,7 @@ in
services.udisks2.enable = true;
services.upower.enable = config.powerManagement.enable;
services.libinput.enable = mkDefault true;
services.geoclue2.enable = mkDefault true;
# Extra UDEV rules used by Solid
services.udev.packages = [
+1 -1
View File
@@ -1243,7 +1243,7 @@ in
"services.postfix.relayPort was removed in favor of services.postfix.settings.main.relayhost, which now takes a list of host:port."
)
(lib.mkRemovedOptionModule [ "services" "postfix" "extraConfig" ]
"services.postfix.extraConfig was replaced by the structured freeform service.postfix.settings.main option."
"services.postfix.extraConfig was replaced by the structured freeform services.postfix.settings.main option."
)
(lib.mkRenamedOptionModule
[ "services" "postfix" "networks" ]
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "claude-code";
publisher = "anthropic";
version = "2.0.22";
hash = "sha256-ystT5nHh0ivpFLwhHr6Uw5PyubkdY/kWm841wzIfyJ4=";
version = "2.0.24";
hash = "sha256-5lPa2xBDqdVFdwVBiGz0u8Cp/oHvUTNEzvyKy4t2qvw=";
};
meta = {
@@ -9,6 +9,7 @@ K3s is a simplified [Kubernetes](https://wiki.nixos.org/wiki/Kubernetes) version
## Configuration Examples
* [Nvidia GPU Passthru](docs/examples/NVIDIA.md)
* [Intel GPU Passthru](docs/examples/INTEL.md)
* [Storage Examples](docs/examples/STORAGE.md)
## Cluster Maintenance and Troubleshooting
@@ -0,0 +1,168 @@
# Intel GPU Support in k3s
This article makes the following assumptions:
1. `services.k3s.enable` is already set to true
2. The Linux kernel running is modern enough to support your GPU out of the box
3. The desired driver is `i915` -- modify as needed for other drivers
> Note: at the time of writing, the author was using an Intel Arc A770 in k3s. The majority of this guide likely should work on other Kubernetes distributions, and will likely work identically for integrated graphics capabilities.
### Enable the Intel driver in NixOS
Add the following NixOS configuration to enable the Intel driver (necessary on headless deployments):
```
services.xserver.videoDrivers = [ "i915" ];
```
After rebuilding the configuration, reboot the host for the GPU driver to be assigned to the GPU. Use the following command to ensure the GPU is using the i915 kernel:
```
sudo lspci -k
```
i.e. the output looks like this on a host with the Intel Arc A770:
```
sudo lspci -k | grep -A 3 'Arc'
03:00.0 VGA compatible controller: Intel Corporation DG2 [Arc A770] (rev 08)
Subsystem: ASRock Incorporation Device 6010
Kernel driver in use: i915
Kernel modules: i915, xe
```
## Install Intel Node Feature Discovery (NFD) in k3s
Intel's device plugin for kubernetes provides Node Feature Discovery (NFD). NFD allows for GPU capabilities on a node to be automatically discovered if a discrete GPU is installed and the Intel drivers have been properly assigned.
> Documentation for Intel NFD installation is here for reference: [Install with NFD](https://intel.github.io/intel-device-plugins-for-kubernetes/cmd/gpu_plugin/README.html#install-with-nfd)
The following commands will install NFD in the cluster (assumes `curl`, `jq` and `kubectl` are all installed/configured):
```
# Use the latest release
export LATEST_RELEASE=$(curl -s https://api.github.com/repos/intel/intel-device-plugins-for-kubernetes/releases/latest | jq -r '.tag_name')
# Use Kustomize to deploy the configuration
kubectl apply -k "https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/nfd?ref=$LATEST_RELEASE"
kubectl apply -k "https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/nfd/overlays/node-feature-rules?ref=$LATEST_RELEASE"
kubectl apply -k "https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/gpu_plugin/overlays/nfd_labeled_nodes?ref=$LATEST_RELEASE"
```
NFD should automatically apply relevant labels to your node. This can be verified with the following command:
```
kubectl get nodes -o yaml | grep gpu.intel.com | sort -u
```
Output should look similar to the following:
```
kubectl get nodes -o yaml | grep gpu.intel.com | sort -u
gpu.intel.com/device-id.0300-56a0.count: "1"
gpu.intel.com/device-id.0300-56a0.present: "true"
gpu.intel.com/family: A_Series
gpu.intel.com/i915: "1"
gpu.intel.com/i915_monitoring: "0"
nfd.node.kubernetes.io/feature-labels: gpu.intel.com/device-id.0300-56a0.count,gpu.intel.com/device-id.0300-56a0.present,gpu.intel.com/family,intel.feature.node.kubernetes.io/gpu
```
> Note: `gpu.intel.com/i915: "1"` indicates only one pod can use the GPU -- see below for a fix.
Now, GPU-enabled pods can be run with this configuration:
```
spec:
containers:
resources:
requests:
gpu.intel.com/i915: "1"
limits:
gpu.intel.com/i915: "1"
```
### Allowing more than one pod to use the GPU
In the default configuration, only one pod can use the GPU. To enable multiple pods to use the GPU, apply the following Kustomize patch:
```
patches:
- target:
kind: DaemonSet
name: intel-gpu-plugin
patch: |
- op: add
path: /spec/template/spec/containers/0/args
value:
- -shared-dev-num=10
```
Or, manually edit the `intel-gpu-plugin` DaemonSet to run with `-shared-dev-num=10` (or however many max pods can access the GPU), like so:
```
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: intel-gpu-plugin
spec:
spec:
containers:
- args:
- -shared-dev-num=10
```
Verify the number has been applied like so:
```
kubectl get nodes -o yaml | grep gpu.intel.com/i915 | sort -u
```
i.e. in this configuration, up to 10 pods can use the GPU:
```
kubectl get nodes -o yaml | grep gpu.intel.com/i915 | sort -u
gpu.intel.com/i915: "10"
```
### Test pod
This is a complete pod configuration for reference/testing:
```
---
apiVersion: v1
kind: Pod
metadata:
name: intel-gpu-test
namespace: default
spec:
containers:
- name: intel-gpu-test
image: docker.io/ubuntu:24.04
command: [ "/bin/bash", "-c", "--" ]
args: [ "while true; do sleep 30; done;" ]
resources:
requests:
gpu.intel.com/i915: "1"
limits:
gpu.intel.com/i915: "1"
```
Once the pod is running, use the following command to test that the GPU is available:
```
kubectl exec -n default -it pod/intel-gpu-test -- ls /dev/dri
```
If the GPU is available, the output will look like the following:
```
kubectl exec -n default -it pod/intel-gpu-test -- ls /dev/dri
by-path card1 renderD128
```
Delete the pod so as to not count against the GPU limit:
```
kubectl delete -n default pod/intel-gpu-test
```
+4 -1
View File
@@ -1,5 +1,7 @@
{
lib,
stdenv,
clang_20,
buildNpmPackage,
bruno,
pkg-config,
@@ -24,7 +26,8 @@ buildNpmPackage {
nativeBuildInputs = [
pkg-config
];
]
++ lib.optional stdenv.isDarwin clang_20; # clang_21 breaks gyp builds
buildInputs = [
pango
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "@anthropic-ai/claude-code",
"version": "2.0.22",
"version": "2.0.24",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@anthropic-ai/claude-code",
"version": "2.0.22",
"version": "2.0.24",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"
+3 -3
View File
@@ -7,14 +7,14 @@
}:
buildNpmPackage (finalAttrs: {
pname = "claude-code";
version = "2.0.22";
version = "2.0.24";
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
hash = "sha256-SDXYXEb7Vi150Hx04y9kd+Owzu11VSqVRgej36P2khU=";
hash = "sha256-pi8EdN/XyzMGWBcTiV8pr9GODcBs0uPFarWjQMoCaEs=";
};
npmDepsHash = "sha256-kphPXek1YoEs4yvikOYg/CmkKuq1rMUJC6Rkrhydkxo=";
npmDepsHash = "sha256-XylBq0/zu7iSTPiLAkewQFeh1OmtJv9nUfnCb66opVE=";
postPatch = ''
cp ${./package-lock.json} package-lock.json
+9 -8
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "containerlab";
version = "0.69.3";
version = "0.70.2";
src = fetchFromGitHub {
owner = "srl-labs";
repo = "containerlab";
tag = "v${finalAttrs.version}";
hash = "sha256-RJNJ5LUCGaARn5NOSepTL/0Owr/ozFUYAvlynDTyqfY=";
hash = "sha256-QBv0SZ7XxVc0yWbOxPKdfzk9AKYlMJyeZwpAx1jbamk=";
};
vendorHash = "sha256-28Q1R6P2rpER5RxagnsKy9W3b4FUeRRbkPPovzag//U=";
vendorHash = "sha256-XttJ/GXhNKVHLR33A/o3N3OYHsyKWHBhD5QOz0AlfFk=";
nativeBuildInputs = [
installShellFiles
@@ -27,9 +27,9 @@ buildGoModule (finalAttrs: {
ldflags = [
"-s"
"-w"
"-X github.com/srl-labs/containerlab/cmd/version.Version=${finalAttrs.version}"
"-X github.com/srl-labs/containerlab/cmd/version.commit=${finalAttrs.src.rev}"
"-X github.com/srl-labs/containerlab/cmd/version.date=1970-01-01T00:00:00Z"
"-X github.com/srl-labs/containerlab/cmd.Version=${finalAttrs.version}"
"-X github.com/srl-labs/containerlab/cmd.commit=${finalAttrs.src.rev}"
"-X github.com/srl-labs/containerlab/cmd.date=1970-01-01T00:00:00Z"
];
preCheck = ''
@@ -37,9 +37,10 @@ buildGoModule (finalAttrs: {
export USER="runner"
'';
# TestVerifyLinks wants to use docker.sock, which is not available in the Nix build environment.
# TestVerifyLinks wants to use docker.sock which is not available in the Nix build env
# KernelModulesLoaded wants to use /proc/modules which is not available in Nix build env
checkFlags = [
"-skip=^TestVerifyLinks$"
"-skip=^TestVerifyLinks$|^TestIsKernelModuleLoaded$"
];
postInstall = ''
+9 -9
View File
@@ -9,26 +9,26 @@ let
inherit (stdenv) hostPlatform;
sources = {
x86_64-linux = fetchurl {
url = "https://downloads.cursor.com/lab/2025.10.02-bd871ac/linux/x64/agent-cli-package.tar.gz";
hash = "sha256-tqppTOkeChlyw3IjSkhGpNvMX9U5s2hiu13/RWakENg=";
url = "https://downloads.cursor.com/lab/2025.10.20-f1b214f/linux/x64/agent-cli-package.tar.gz";
hash = "sha256-v6wGVuKrK4JFFaJN55le5+wZV7LI9Bc70Osc05F0PeQ=";
};
aarch64-linux = fetchurl {
url = "https://downloads.cursor.com/lab/2025.10.02-bd871ac/linux/arm64/agent-cli-package.tar.gz";
hash = "sha256-Gf/2wLS2+xQ6Mu4u96n4hI1I4L2iIG16R668BQCNZaw=";
url = "https://downloads.cursor.com/lab/2025.10.20-f1b214f/linux/arm64/agent-cli-package.tar.gz";
hash = "sha256-j3z3K2tt2wl54OjLMPudGnCP2+9U2dOspM0G0Ob68Ds=";
};
x86_64-darwin = fetchurl {
url = "https://downloads.cursor.com/lab/2025.10.02-bd871ac/darwin/x64/agent-cli-package.tar.gz";
hash = "sha256-/qznJxLpyUBH4L6zJSDB5mVFVk2Y7UJCt2Uw5g7U6AQ=";
url = "https://downloads.cursor.com/lab/2025.10.20-f1b214f/darwin/x64/agent-cli-package.tar.gz";
hash = "sha256-KRECUSqYohrCiF3YySZeJ0MaRhb7h+O+KyqCfpCbV8w=";
};
aarch64-darwin = fetchurl {
url = "https://downloads.cursor.com/lab/2025.10.02-bd871ac/darwin/arm64/agent-cli-package.tar.gz";
hash = "sha256-drbaPM4ho5/1vmQWMgBelmqR7Np45w/XR0ZsfR53vZI=";
url = "https://downloads.cursor.com/lab/2025.10.20-f1b214f/darwin/arm64/agent-cli-package.tar.gz";
hash = "sha256-4S1HMPielrUwP5pyA/tp1FuByge9dcRx2XndTFnBKbY=";
};
};
in
stdenv.mkDerivation {
pname = "cursor-cli";
version = "0-unstable-2025-10-02";
version = "0-unstable-2025-10-20";
src = sources.${hostPlatform.system};
+3 -3
View File
@@ -7,7 +7,7 @@
}:
let
version = "18.4.2";
version = "18.5.0";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -21,10 +21,10 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
hash = "sha256-jwImYofmGfpnj43FinFmo9SQP6vpM0C4K6fmUECifG0=";
hash = "sha256-kVFO8brtXWWGU2nWTtHR1q5RrTIXy2ssra9YjtWsglU=";
};
vendorHash = "sha256-DNZgdP7juELUX0cs0tnyqdf1yiUJ0S17nm0xqTk3KHQ=";
vendorHash = "sha256-I2YMn84wEAY+Z02bmkyP/b0eix7FW3hP/noyEKYsEaQ=";
ldflags = [
"-X ${gitaly_package}/internal/version.version=${version}"
@@ -6,7 +6,7 @@
buildGo124Module rec {
pname = "gitlab-container-registry";
version = "4.28.0";
version = "4.29.0";
rev = "v${version}-gitlab";
# nixpkgs-update: no auto update
@@ -14,10 +14,10 @@ buildGo124Module rec {
owner = "gitlab-org";
repo = "container-registry";
inherit rev;
hash = "sha256-0v39mQ0wLq2VUYNeDU6E2M8Ny/e/A3VrE8+pmpwJgug=";
hash = "sha256-SUhlJi0LEDXl9pwnT2JATtEBIUnCA2yyEaMzDpL/QCM=";
};
vendorHash = "sha256-tCOXSZjJOWHTIdWYxdBaH6STKAwqlHsuDfhGd2KPx1Q=";
vendorHash = "sha256-Ee9OmKkFrm00BN/V5kuLFbFV/6HkJ4hk7AAXMptTyxs=";
checkFlags =
let
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gitlab-code-parser";
version = "0.16.1";
version = "0.19.3";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "rust/gitlab-code-parser";
tag = "v${finalAttrs.version}";
hash = "sha256-GskOPKv1Jp3eqd+a9nEwZPfHfOw6luyglPXzJZAPvBc=";
hash = "sha256-gwldgZsiHjNafebtgiy5mVAmNNAj0Mz+krz4sI18zj4=";
};
cargoHash = "sha256-g6FV8kX3/9wk692FJLNyGNzv3ffE8RWmMYmvmUIqzVs=";
cargoHash = "sha256-h6JWOhdjN4Ikwzvuv7PIYmsk1KxJyGHbjibJKVWtExY=";
nativeBuildInputs = [
pkg-config
@@ -11,17 +11,17 @@ let
in
buildGoModule rec {
pname = "gitlab-elasticsearch-indexer";
version = "5.9.1";
version = "5.9.4";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-elasticsearch-indexer";
rev = "v${version}";
hash = "sha256-Xt22fyTM4rfqUpNE6Q3yfT9r4vqME3KmqxYCqUKmnLQ=";
hash = "sha256-Vj3QqskgrQIMF9mNY8WzvHL0KCU9Ebr3eDm4mUwQJL0=";
};
vendorHash = "sha256-pY8hHFy0AxMwol00BN85jPR0ZnHVgno10Tp+Opz65tQ=";
vendorHash = "sha256-nmgRQwjf6F7IkED0S7Q03T6Wad5sEmYLbBHLyA33WjU=";
buildInputs = [ icu ];
nativeBuildInputs = [ pkg-config ];
+3 -3
View File
@@ -6,17 +6,17 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "18.4.2";
version = "18.5.0";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-21VCBUE6wGU7DT98YYPuEz7lw6EMqCfe14mofbai0lk=";
hash = "sha256-7jMiKN2L4rF4YyqoJW8pzj5rP5g6ScwZ3qkY+OCZOZ8=";
};
vendorHash = "sha256-FdmozSo/eWTnAxrO+/TZOKataLwDkKfwGOXymkRBVCI=";
vendorHash = "sha256-VWD/AXqEVWo7G9p1q1BM2LUNwAFmkPm+Gm2s9EPu6nM=";
subPackages = [ "." ];
ldflags = [
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "gitlab-runner";
version = "18.4.0";
version = "18.5.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-runner";
tag = "v${finalAttrs.version}";
hash = "sha256-kLUQTxj4t6H/by6lzsLmG8S3Ft1QFdUjTa4Y9aCT88o=";
hash = "sha256-xuRYnK5Ev2M/vrVWMHcTcK7LLwlQ30MVadMjA67fHpY=";
};
vendorHash = "sha256-zXyyfJ3VBBcB3Qfsex2pDcDJIRg/HRgFAytWloHHUnM=";
vendorHash = "sha256-5Gh9jQ4GkvtN8inEUphehbsnmfyQldvxjbxBkXQ63wc=";
# For patchShebangs
buildInputs = [ bash ];
+2 -2
View File
@@ -8,14 +8,14 @@
buildGoModule rec {
pname = "gitlab-shell";
version = "14.45.2";
version = "14.45.3";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
hash = "sha256-FxtqTRCa1sYSeTR+V2UKEsb480llU6cHWVwNiNFtUmE=";
hash = "sha256-S8LtWQgzyDKr4Jnk7Qn/pfLzZYYnVfZNVqNBFyqr5cM=";
};
buildInputs = [
+10 -9
View File
@@ -1,15 +1,16 @@
{
"version": "18.4.2",
"repo_hash": "053fw6g1rrqlmgr22phbsv57pg04iy20yv3yvgz1hm4jn2jm0zln",
"yarn_hash": "1s9fz2apb7wkpppq14b3020b2pqdah917wblvzk32np8s2dqqc14",
"version": "18.5.0",
"repo_hash": "0r1q6byqv3zziwsw63z7km5jjap7q6222j91lnr048w6cf425n1w",
"yarn_hash": "16f7r4v4mjjdsfbzy5vy1g18p0l3gnjvfvzrl2xrxdibx7a3b4xs",
"frontend_islands_yarn_hash": "0kks9hzm5fq3fss9ys8zxls3d3860l1fvsfcrbhf9rccmwvmjn3l",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v18.4.2-ee",
"rev": "v18.5.0-ee",
"passthru": {
"GITALY_SERVER_VERSION": "18.4.2",
"GITLAB_PAGES_VERSION": "18.4.2",
"GITLAB_SHELL_VERSION": "14.45.2",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.1",
"GITLAB_WORKHORSE_VERSION": "18.4.2"
"GITALY_SERVER_VERSION": "18.5.0",
"GITLAB_PAGES_VERSION": "18.5.0",
"GITLAB_SHELL_VERSION": "14.45.3",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.4",
"GITLAB_WORKHORSE_VERSION": "18.5.0"
}
}
@@ -10,7 +10,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "18.4.2";
version = "18.5.0";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
@@ -22,7 +22,7 @@ buildGoModule rec {
sourceRoot = "${src.name}/workhorse";
vendorHash = "sha256-R9hI+y4n+6YM0dXIRvNZWwy1gAasdKHBWmFBXJaI1G0=";
vendorHash = "sha256-wO+QuWptrcpqy3K3tvYpQQFzlr7A2m2rhPM64Or3qaY=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;
+26 -1
View File
@@ -83,7 +83,7 @@ let
cp Cargo.lock $out
'';
};
hash = "sha256-NJLpfIgVgqbf1fHIzEKxzpHOKvtY9QHXVQPpRdvH0Uo=";
hash = "sha256-IPVpUj0ixYKQg8ZUKLGcS9RcR2zOWCrqkwJFUF1cmdI=";
};
dontBuild = false;
@@ -146,6 +146,10 @@ let
yarnLock = src + "/yarn.lock";
sha256 = data.yarn_hash;
};
frontendIslandsYarnOfflineCache = fetchYarnDeps {
yarnLock = src + "/ee/frontend_islands/apps/duo_next/yarn.lock";
sha256 = data.frontend_islands_yarn_hash;
};
nativeBuildInputs = [
rubyEnv.wrappedRuby
@@ -171,6 +175,7 @@ let
# of rake tasks fails.
GITLAB_LOG_PATH = "log";
FOSS_ONLY = !gitlabEnterprise;
SKIP_FRONTEND_ISLANDS_BUILD = lib.optionalString (!gitlabEnterprise) "true";
SKIP_YARN_INSTALL = 1;
NODE_OPTIONS = "--max-old-space-size=8192";
@@ -184,6 +189,26 @@ let
mv config/gitlab.yml.example config/gitlab.yml
patchShebangs scripts/frontend/
patchShebangs scripts/
''
+ lib.optionalString gitlabEnterprise ''
# Get node modules for frontend islands
export HOME=$(mktemp -d)
pushd ee/frontend_islands/apps/duo_next
yarn config --offline set yarn-offline-mirror "$frontendIslandsYarnOfflineCache"
fixup-yarn-lock yarn.lock
yarn install \
--frozen-lockfile \
--force \
--production=false \
--ignore-engines \
--ignore-platform \
--ignore-scripts \
--no-progress \
--non-interactive \
--offline
patchShebangs node_modules
popd
'';
buildPhase = ''
+18 -17
View File
@@ -161,6 +161,7 @@ gem 'grape-entity', '~> 1.0.1', feature_category: :api
gem 'grape-swagger', '~> 2.1.2', group: [:development, :test], feature_category: :api
gem 'grape-swagger-entity', '~> 0.5.5', group: [:development, :test], feature_category: :api
gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api
gem 'gitlab-grape-openapi', path: 'gems/gitlab-grape-openapi', feature_category: :api
gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
# GraphQL API
@@ -175,7 +176,7 @@ gem 'gitlab-topology-service-client', '~> 0.1',
feature_category: :cell
# Duo Workflow
gem 'gitlab-duo-workflow-service-client', '~> 0.3',
gem 'gitlab-duo-workflow-service-client', '~> 0.4',
path: 'vendor/gems/gitlab-duo-workflow-service-client',
feature_category: :agent_foundations
@@ -223,9 +224,9 @@ gem 'google-cloud-storage', '~> 1.57.0', feature_category: :shared
gem 'google-apis-core', '~> 0.18.0', '>= 0.18.0', feature_category: :shared
gem 'google-apis-compute_v1', '~> 0.129.0', feature_category: :shared
gem 'google-apis-container_v1', '~> 0.100.0', feature_category: :shared
gem 'google-apis-container_v1beta1', '~> 0.90.0', feature_category: :shared
gem 'google-apis-container_v1beta1', '~> 0.91.0', feature_category: :shared
gem 'google-apis-cloudbilling_v1', '~> 0.22.0', feature_category: :shared
gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0', feature_category: :shared
gem 'google-apis-cloudresourcemanager_v1', '~> 0.44.0', feature_category: :shared
gem 'google-apis-iam_v1', '~> 0.73.0', feature_category: :shared
gem 'google-apis-serviceusage_v1', '~> 0.28.0', feature_category: :shared
gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared
@@ -267,10 +268,10 @@ gem 'asciidoctor', '~> 2.0.18', feature_category: :markdown
gem 'asciidoctor-include-ext', '~> 0.4.0', require: false, feature_category: :markdown
gem 'asciidoctor-plantuml', '~> 0.0.16', feature_category: :markdown
gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdown
gem 'rouge', '~> 4.6.0', feature_category: :shared
gem 'rouge', '~> 4.6.1', 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.33', feature_category: :markdown
gem 'gitlab-glfm-markdown', '~> 0.0.36', feature_category: :markdown
gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown
gem 'unicode-emoji', '~> 4.0', feature_category: :markdown
@@ -380,7 +381,7 @@ gem 'rack-proxy', '~> 0.7.7', feature_category: :shared
gem 'cssbundling-rails', '1.4.3', feature_category: :shared
gem 'terser', '1.0.2', feature_category: :shared
gem 'click_house-client', '0.5.1', feature_category: :database
gem 'click_house-client', '0.8.0', feature_category: :database
gem 'addressable', '~> 2.8', feature_category: :shared
gem 'gon', '~> 6.5.0', feature_category: :shared
gem 'request_store', '~> 1.7.0', feature_category: :shared
@@ -403,7 +404,7 @@ gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_c
gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared
gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications
gem 'gitlab-labkit', '~> 0.40.0', feature_category: :shared
gem 'gitlab-labkit', '~> 0.42.0', feature_category: :shared
gem 'thrift', '~> 0.22.0', feature_category: :shared
# I18n
@@ -430,7 +431,7 @@ gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_
# Event-driven reactor for Ruby
# Required manually in config/initializers/require_async_gem
gem 'async', '~> 2.28.0', require: false, feature_category: :shared
gem 'async', '~> 2.32.0', require: false, feature_category: :shared
gem 'io-event', '~> 1.12', require: false, feature_category: :shared
# Security report schemas used to validate CI job artifacts of security jobs
@@ -473,7 +474,7 @@ end
gem 'warning', '~> 1.5.0', feature_category: :shared
group :development do
gem 'lefthook', '~> 1.12.0', require: false, feature_category: :tooling
gem 'lefthook', '~> 1.13.0', require: false, feature_category: :tooling
gem 'rubocop', feature_category: :tooling, require: false
gem 'debug', '~> 1.11.0', feature_category: :shared
@@ -490,11 +491,11 @@ group :development do
gem 'listen', '~> 3.7', feature_category: :shared
gem 'ruby-lsp', "~> 0.23.0", require: false, feature_category: :tooling
gem 'ruby-lsp', "~> 0.26.0", require: false, feature_category: :tooling
gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling
gem 'ruby-lsp-rails', "~> 0.4.8", feature_category: :tooling
gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling
gem 'ruby-lsp-rspec', "~> 0.1.27", require: false, feature_category: :tooling
gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling
@@ -512,7 +513,7 @@ group :development, :test do
gem 'pry-rails', '~> 0.3.9', feature_category: :shared
gem 'pry-shell', '~> 0.6.4', feature_category: :shared
gem 'awesome_print', require: false, feature_category: :shared
gem 'amazing_print', require: false, feature_category: :shared
gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database
gem 'rspec-rails', '~> 7.1.0', feature_category: :shared
@@ -634,7 +635,7 @@ gem 'sys-filesystem', '~> 1.4.3', feature_category: :shared
gem 'net-ntp', feature_category: :shared
# SSH keys support
gem 'ssh_data', '~> 1.3', feature_category: :shared
gem 'ssh_data', '~> 2.0', feature_category: :shared
# Spamcheck GRPC protocol definitions
gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
@@ -643,9 +644,9 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
gem 'gitaly', '~> 18.4.0.pre.rc1', feature_category: :gitaly
# KAS GRPC protocol definitions
gem 'gitlab-kas-grpc', '~> 18.3.0', feature_category: :deployment_management
gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management
gem 'grpc', '~> 1.74.0', feature_category: :shared
gem 'grpc', '~> 1.75.0', feature_category: :shared
gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
@@ -656,7 +657,7 @@ gem 'flipper', '~> 0.28.0', feature_category: :shared
gem 'flipper-active_record', '~> 0.28.0', feature_category: :shared
gem 'flipper-active_support_cache_store', '~> 0.28.0', feature_category: :shared
gem 'unleash', '~> 3.2.2', feature_category: :shared
gem 'gitlab-experiment', '~> 0.9.1', feature_category: :shared
gem 'gitlab-experiment', '~> 1.0.0', feature_category: :shared
# Structured logging
gem 'lograge', '~> 0.5', feature_category: :shared
+89 -77
View File
@@ -49,7 +49,7 @@ PATH
google-cloud-storage_transfer (~> 1.2.0)
google-protobuf (~> 3.25, >= 3.25.3)
googleauth (~> 1.14)
grpc (~> 1.74.0)
grpc (~> 1.75)
json (~> 2.7)
jwt (~> 2.5)
logger (~> 1.5)
@@ -62,12 +62,19 @@ PATH
rexml (~> 3.4.0)
thor (~> 1.3)
PATH
remote: gems/gitlab-grape-openapi
specs:
gitlab-grape-openapi (0.1.0)
grape (~> 2.0.0)
grape-entity (~> 1.0.1)
PATH
remote: gems/gitlab-housekeeper
specs:
gitlab-housekeeper (0.1.0)
activesupport
awesome_print
amazing_print
httparty
rubocop
@@ -149,7 +156,7 @@ PATH
PATH
remote: vendor/gems/gitlab-duo-workflow-service-client
specs:
gitlab-duo-workflow-service-client (0.3)
gitlab-duo-workflow-service-client (0.5)
grpc
PATH
@@ -203,7 +210,7 @@ GEM
nkf
rexml
RedCloth (4.3.4)
acme-client (2.0.25)
acme-client (2.0.26)
base64 (~> 0.2)
faraday (>= 1.0, < 3.0.0)
faraday-retry (>= 1.0, < 3.0.0)
@@ -294,6 +301,7 @@ GEM
amatch (0.4.1)
mize
tins (~> 1.0)
amazing_print (1.8.1)
android_key_attestation (0.3.0)
apollo_upload_server (2.1.6)
actionpack (>= 6.1.6)
@@ -311,7 +319,7 @@ GEM
asciidoctor-plantuml (0.0.16)
asciidoctor (>= 2.0.17, < 3.0.0)
ast (2.4.2)
async (2.28.0)
async (2.32.0)
console (~> 1.29)
fiber-annotation
io-event (~> 1.11)
@@ -364,7 +372,7 @@ GEM
base64 (0.2.0)
batch-loader (2.0.5)
bcrypt (3.1.20)
benchmark (0.4.0)
benchmark (0.4.1)
benchmark-ips (2.14.0)
benchmark-malloc (0.2.0)
benchmark-memory (0.2.0)
@@ -375,14 +383,14 @@ GEM
erubi (>= 1.0.0)
rack (>= 0.9.0)
rouge (>= 1.0.0)
bigdecimal (3.1.7)
bigdecimal (3.2.3)
bindata (2.4.11)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
bootsnap (1.18.6)
msgpack (~> 1.2)
browser (5.3.1)
builder (3.2.4)
builder (3.3.0)
bullet (8.0.8)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
@@ -424,7 +432,7 @@ GEM
cork
nap
open4 (~> 1.3)
click_house-client (0.5.1)
click_house-client (0.8.0)
activerecord (>= 7.0, < 9.0)
activesupport (>= 7.0, < 9.0)
addressable (~> 2.8)
@@ -433,7 +441,7 @@ GEM
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
colored2 (3.1.2)
commonmarker (0.23.11)
commonmarker (0.23.12)
concurrent-ruby (1.3.5)
connection_pool (2.5.4)
console (1.29.2)
@@ -477,9 +485,9 @@ GEM
danger-gitlab (8.0.0)
danger
gitlab (~> 4.2, >= 4.2.0)
database_cleaner-active_record (2.2.1)
database_cleaner-active_record (2.2.2)
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (~> 2.0)
database_cleaner-core (2.0.1)
date (3.4.1)
deb_version (1.0.2)
@@ -545,15 +553,18 @@ GEM
dotenv (2.7.6)
drb (2.2.3)
dry-cli (1.0.0)
dry-core (1.0.1)
dry-core (1.1.0)
concurrent-ruby (~> 1.0)
logger
zeitwerk (~> 2.6)
dry-inflector (1.0.0)
dry-logic (1.5.0)
dry-inflector (1.2.0)
dry-logic (1.6.0)
bigdecimal
concurrent-ruby (~> 1.0)
dry-core (~> 1.0, < 2)
dry-core (~> 1.1)
zeitwerk (~> 2.6)
dry-types (1.7.1)
dry-types (1.8.3)
bigdecimal (~> 3.0)
concurrent-ruby (~> 1.0)
dry-core (~> 1.0)
dry-inflector (~> 1.0)
@@ -630,7 +641,7 @@ GEM
fast_gettext (4.1.0)
prime
racc
ffaker (2.24.0)
ffaker (2.25.0)
ffi (1.17.2)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
@@ -719,14 +730,14 @@ GEM
git (1.19.1)
addressable (~> 2.8)
rchardet (~> 1.8)
gitaly (18.4.0.pre.rc1)
gitaly (18.4.1)
grpc (~> 1.0)
gitlab (4.19.0)
httparty (~> 0.20)
terminal-table (>= 1.5.1)
gitlab-chronic (0.10.6)
numerizer (~> 0.2)
gitlab-cloud-connector (1.32.0)
gitlab-cloud-connector (1.33.0)
activesupport (~> 7.0)
jwt (~> 2.9)
gitlab-crystalball (1.1.1)
@@ -736,7 +747,7 @@ GEM
danger (>= 9.3.0)
danger-gitlab (>= 8.0.0)
rake (~> 13.0)
gitlab-experiment (0.9.1)
gitlab-experiment (1.0.0)
activesupport (>= 3.0)
request_store (>= 1.0)
gitlab-fog-azure-rm (2.4.0)
@@ -748,11 +759,11 @@ GEM
mime-types
net-http-persistent (~> 4.0)
nokogiri (~> 1, >= 1.10.8)
gitlab-glfm-markdown (0.0.33)
gitlab-glfm-markdown (0.0.36)
rb_sys (~> 0.9.109)
gitlab-kas-grpc (18.3.2)
gitlab-kas-grpc (18.5.0.pre.rc4)
grpc (~> 1.0)
gitlab-labkit (0.40.0)
gitlab-labkit (0.42.0)
actionpack (>= 5.0.0, < 8.1.0)
activesupport (>= 5.0.0, < 8.1.0)
google-protobuf (~> 3)
@@ -777,7 +788,7 @@ GEM
activesupport (>= 5.2.0)
rake (~> 13.0)
snowplow-tracker (~> 0.8.0)
gitlab-secret_detection (0.33.3)
gitlab-secret_detection (0.35.1)
grpc (>= 1.63.0, < 2)
grpc_reflection (~> 0.1)
parallel (~> 1)
@@ -805,7 +816,7 @@ GEM
omniauth (>= 1.3, < 3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
gitlab_quality-test_tooling (2.20.0)
gitlab_quality-test_tooling (2.20.3)
activesupport (>= 7.0, < 7.3)
amatch (~> 0.4.1)
fog-google (~> 1.24, >= 1.24.1)
@@ -831,13 +842,13 @@ GEM
google-apis-core (>= 0.15.0, < 2.a)
google-apis-cloudbilling_v1 (0.22.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-cloudresourcemanager_v1 (0.31.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-cloudresourcemanager_v1 (0.44.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-compute_v1 (0.129.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-container_v1 (0.100.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-container_v1beta1 (0.90.0)
google-apis-container_v1beta1 (0.91.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-core (0.18.0)
addressable (~> 2.5, >= 2.5.1)
@@ -964,7 +975,7 @@ GEM
logger (~> 1.6)
ostruct (~> 0.6)
sass-embedded (~> 1.58)
grpc (1.74.1)
grpc (1.75.0)
google-protobuf (>= 3.25, < 5.0)
googleapis-common-protos-types (~> 1.0)
grpc-google-iam-v1 (1.5.0)
@@ -992,7 +1003,7 @@ GEM
haml (5.2.2)
temple (>= 0.8.0)
tilt
haml_lint (0.64.0)
haml_lint (0.66.0)
haml (>= 5.0)
parallel (~> 1.10)
rainbow
@@ -1003,7 +1014,7 @@ GEM
thor
tilt
hana (1.3.7)
hashdiff (1.2.0)
hashdiff (1.2.1)
hashie (5.0.0)
health_check (3.1.0)
railties (>= 5.0)
@@ -1030,7 +1041,7 @@ GEM
mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (1.14.4)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
i18n_data (0.13.1)
icalendar (2.10.3)
@@ -1112,10 +1123,10 @@ GEM
jsonpath (~> 1.0)
recursive-open-struct (~> 1.1, >= 1.1.1)
rest-client (~> 2.0)
language_server-protocol (3.17.0.3)
language_server-protocol (3.17.0.5)
launchy (2.5.2)
addressable (~> 2.8)
lefthook (1.12.3)
lefthook (1.13.0)
letter_opener (1.10.0)
launchy (>= 2.2, < 4)
letter_opener_web (3.0.0)
@@ -1188,7 +1199,7 @@ GEM
mini_histogram (0.3.1)
mini_magick (4.13.2)
mini_mime (1.1.2)
mini_portile2 (2.8.8)
mini_portile2 (2.8.9)
minitest (5.11.3)
mixlib-cli (2.1.8)
mixlib-config (3.0.27)
@@ -1203,7 +1214,7 @@ GEM
multi_xml (0.6.0)
multipart-post (2.2.3)
murmurhash3 (0.1.7)
mustermann (3.0.0)
mustermann (3.0.4)
ruby2_keywords (~> 0.0.1)
mustermann-grape (1.0.2)
mustermann (>= 1.0.0)
@@ -1232,7 +1243,7 @@ GEM
nio4r (2.7.0)
nkf (0.2.0)
no_proxy_fix (0.1.2)
nokogiri (1.18.9)
nokogiri (1.18.10)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
notiffany (0.1.3)
@@ -1270,8 +1281,9 @@ GEM
ostruct (>= 0.2)
oj-introspect (0.8.0)
oj (>= 3.16.10)
omniauth (2.1.3)
omniauth (2.1.4)
hashie (>= 3.4.6)
logger
rack (>= 2.2.3)
rack-protection
omniauth-alicloud (3.0.0)
@@ -1323,7 +1335,7 @@ GEM
opensearch-ruby (3.4.0)
faraday (>= 1.0, < 3)
multi_json (>= 1.0)
openssl (3.3.0)
openssl (3.3.1)
openssl-signature_algorithm (1.3.0)
openssl (> 2.0)
opentelemetry-api (1.2.5)
@@ -1496,7 +1508,7 @@ GEM
prime (0.1.3)
forwardable
singleton
prism (1.2.0)
prism (1.4.0)
proc_to_ast (0.1.0)
coderay
parser
@@ -1527,7 +1539,7 @@ GEM
pyu-ruby-sasl (0.0.3.3)
raabro (1.4.0)
racc (1.8.1)
rack (2.2.17)
rack (2.2.18)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (6.7.0)
@@ -1597,7 +1609,7 @@ GEM
ffi (~> 1.0)
rb_sys (0.9.110)
rake-compiler-dock (= 1.9.1)
rbs (3.6.1)
rbs (3.9.5)
logger
rbtrace (0.5.2)
ffi (>= 1.0.6)
@@ -1606,8 +1618,8 @@ GEM
rchardet (1.8.0)
rdoc (6.13.0)
psych (>= 4.0.0)
re2 (2.19.0)
mini_portile2 (~> 2.8.7)
re2 (2.20.0)
mini_portile2 (~> 2.8.9)
recaptcha (5.12.3)
json
recursive-open-struct (1.1.3)
@@ -1618,7 +1630,7 @@ GEM
actionpack (>= 5)
redis-rack (>= 2.1.0, < 4)
redis-store (>= 1.1.0, < 2)
redis-client (0.25.3)
redis-client (0.26.1)
connection_pool
redis-cluster-client (0.13.5)
redis-client (~> 0.24)
@@ -1653,10 +1665,10 @@ GEM
retriable (3.1.2)
reverse_markdown (3.0.0)
nokogiri
rexml (3.4.2)
rexml (3.4.4)
rinku (2.0.0)
rotp (6.3.0)
rouge (4.6.0)
rouge (4.6.1)
rqrcode (2.2.0)
chunky_png (~> 1.0)
rqrcode_core (~> 1.0)
@@ -1737,15 +1749,14 @@ GEM
rubocop-rspec_rails (2.30.0)
rubocop (~> 1.61)
rubocop-rspec (~> 3, >= 3.0.1)
ruby-lsp (0.23.20)
ruby-lsp (0.26.1)
language_server-protocol (~> 3.17.0)
prism (>= 1.2, < 2.0)
rbs (>= 3, < 4)
sorbet-runtime (>= 0.5.10782)
ruby-lsp-rails (0.3.31)
ruby-lsp (>= 0.23.0, < 0.24.0)
ruby-lsp-rspec (0.1.24)
ruby-lsp (~> 0.23.19)
rbs (>= 3, < 5)
ruby-lsp-rails (0.4.8)
ruby-lsp (>= 0.26.0, < 0.27.0)
ruby-lsp-rspec (0.1.27)
ruby-lsp (~> 0.26.0)
ruby-magic (0.6.0)
mini_portile2 (~> 2.8)
ruby-progressbar (1.11.0)
@@ -1853,9 +1864,8 @@ GEM
tilt (~> 2.0)
yard (~> 0.9, >= 0.9.24)
yard-solargraph (~> 0.1)
solargraph-rspec (0.5.2)
solargraph (~> 0.52, >= 0.52.0)
sorbet-runtime (0.5.11647)
solargraph-rspec (0.5.4)
solargraph (>= 0.52.0)
spamcheck (1.3.3)
grpc (~> 1.63)
spring (4.3.0)
@@ -1870,7 +1880,8 @@ GEM
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
ssh_data (1.3.0)
ssh_data (2.0.0)
base64 (~> 0.1)
ssrf_filter (1.0.8)
stackprof (0.2.27)
state_machines (0.5.0)
@@ -2060,7 +2071,7 @@ GEM
yard (0.9.37)
yard-solargraph (0.1.0)
yard (~> 0.9)
zeitwerk (2.6.7)
zeitwerk (2.7.3)
PLATFORMS
ruby
@@ -2072,6 +2083,7 @@ DEPENDENCIES
activerecord-gitlab!
addressable (~> 2.8)
akismet (~> 3.0)
amazing_print
apollo_upload_server (~> 2.1.6)
app_store_connect
arr-pm (~> 0.0.12)
@@ -2079,10 +2091,9 @@ DEPENDENCIES
asciidoctor-include-ext (~> 0.4.0)
asciidoctor-kroki (~> 0.10.0)
asciidoctor-plantuml (~> 0.0.16)
async (~> 2.28.0)
async (~> 2.32.0)
atlassian-jwt (~> 0.2.1)
attr_encrypted (~> 4.2)
awesome_print
aws-sdk-cloudformation (~> 1)
aws-sdk-core (~> 3.226.0)
aws-sdk-s3 (~> 1.193.0)
@@ -2104,7 +2115,7 @@ DEPENDENCIES
carrierwave (~> 1.3)
charlock_holmes (~> 0.7.9)
circuitbox (= 2.0.0)
click_house-client (= 0.5.1)
click_house-client (= 0.8.0)
commonmarker (~> 0.23.10)
concurrent-ruby (~> 1.1)
connection_pool (~> 2.5.3)
@@ -2168,14 +2179,15 @@ DEPENDENCIES
gitlab-cloud-connector (~> 1.26)
gitlab-crystalball (~> 1.1.0)
gitlab-dangerfiles (~> 4.10.0)
gitlab-duo-workflow-service-client (~> 0.3)!
gitlab-experiment (~> 0.9.1)
gitlab-duo-workflow-service-client (~> 0.4)!
gitlab-experiment (~> 1.0.0)
gitlab-fog-azure-rm (~> 2.4.0)
gitlab-glfm-markdown (~> 0.0.33)
gitlab-glfm-markdown (~> 0.0.36)
gitlab-grape-openapi!
gitlab-housekeeper!
gitlab-http!
gitlab-kas-grpc (~> 18.3.0)
gitlab-labkit (~> 0.40.0)
gitlab-kas-grpc (~> 18.5.0.pre.rc4)
gitlab-labkit (~> 0.42.0)
gitlab-license (~> 2.6)
gitlab-mail_room (~> 0.0.24)
gitlab-markup (~> 2.0.0)
@@ -2197,10 +2209,10 @@ DEPENDENCIES
gon (~> 6.5.0)
google-apis-androidpublisher_v3 (~> 0.86.0)
google-apis-cloudbilling_v1 (~> 0.22.0)
google-apis-cloudresourcemanager_v1 (~> 0.31.0)
google-apis-cloudresourcemanager_v1 (~> 0.44.0)
google-apis-compute_v1 (~> 0.129.0)
google-apis-container_v1 (~> 0.100.0)
google-apis-container_v1beta1 (~> 0.90.0)
google-apis-container_v1beta1 (~> 0.91.0)
google-apis-core (~> 0.18.0, >= 0.18.0)
google-apis-iam_v1 (~> 0.73.0)
google-apis-serviceusage_v1 (~> 0.28.0)
@@ -2222,7 +2234,7 @@ DEPENDENCIES
graphlyte (~> 1.0.0)
graphql (= 2.5.11)
graphql-docs (~> 5.2.0)
grpc (~> 1.74.0)
grpc (~> 1.75.0)
gssapi (~> 1.3.1)
guard-rspec
haml_lint (~> 0.58)
@@ -2249,7 +2261,7 @@ DEPENDENCIES
knapsack (~> 4.0.0)
kramdown (~> 2.5.0)
kubeclient (~> 4.12.0)
lefthook (~> 1.12.0)
lefthook (~> 1.13.0)
letter_opener_web (~> 3.0.0)
license_finder (~> 7.0)
licensee (~> 9.16)
@@ -2361,7 +2373,7 @@ DEPENDENCIES
responders (~> 3.0)
retriable (~> 3.1.2)
rexml (~> 3.4.0)
rouge (~> 4.6.0)
rouge (~> 4.6.1)
rqrcode (~> 2.2)
rspec-benchmark (~> 0.6.0)
rspec-parameterized (~> 1.0, >= 1.0.2)
@@ -2370,9 +2382,9 @@ DEPENDENCIES
rspec_junit_formatter
rspec_profiling (~> 0.0.9)
rubocop
ruby-lsp (~> 0.23.0)
ruby-lsp-rails (~> 0.3.6)
ruby-lsp-rspec (~> 0.1.10)
ruby-lsp (~> 0.26.0)
ruby-lsp-rails (~> 0.4.8)
ruby-lsp-rspec (~> 0.1.27)
ruby-magic (~> 0.6)
ruby-progressbar (~> 1.10)
ruby-saml (~> 1.18)
@@ -2404,7 +2416,7 @@ DEPENDENCIES
sprite-factory (~> 1.7)
sprockets (~> 3.7.0)
sprockets-rails (~> 3.5.1)
ssh_data (~> 1.3)
ssh_data (~> 2.0)
stackprof (~> 0.2.26)
state_machines-activerecord (~> 0.8.0)
state_machines-rspec (~> 0.6)
+135 -111
View File
@@ -9,10 +9,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0c8gxs7vhsl0hi7wnyd9wi3aqmqkm0y77y1k17z9zzc5yywsgfz0";
sha256 = "1g93cpxhk3n0lp42accb7b76km2di300lw9zpsrb2rigvnjmw3h6";
type = "gem";
};
version = "2.0.25";
version = "2.0.26";
};
actioncable = {
dependencies = [
@@ -336,6 +336,19 @@ src: {
};
version = "0.4.1";
};
amazing_print = {
groups = [
"development"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0s3d1nf5afapjrk8746c8qfydl17l33l0a12rdircgzmh4c4wfzm";
type = "gem";
};
version = "1.8.1";
};
android_key_attestation = {
groups = [ "default" ];
platforms = [ ];
@@ -454,10 +467,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0vhmmn7n92ilvkvbdbav85hyg8w047zm20vbfzk502g0j495sv4n";
sha256 = "11s733zhjvriqbzca85ry29j33p3y7n24xjwwvjyga4rba5brzvr";
type = "gem";
};
version = "2.28.0";
version = "2.32.0";
};
atlassian-jwt = {
dependencies = [ "jwt" ];
@@ -734,10 +747,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl";
type = "gem";
};
version = "0.4.0";
version = "0.4.1";
};
benchmark-ips = {
groups = [
@@ -821,14 +834,20 @@ src: {
version = "2.10.1";
};
bigdecimal = {
groups = [ "default" ];
groups = [
"coverage"
"default"
"development"
"monorepo"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7";
sha256 = "06sfv80bmxfczkqi3pb3yc9zicqhf94adh5f8hpkn3bsqqd1vlgz";
type = "gem";
};
version = "3.1.7";
version = "3.2.3";
};
bindata = {
groups = [ "default" ];
@@ -879,15 +898,16 @@ src: {
groups = [
"default"
"development"
"monorepo"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9";
type = "gem";
};
version = "3.2.4";
version = "3.3.0";
};
bullet = {
dependencies = [
@@ -1128,10 +1148,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0s9dgq9k6caappqr6y6vbzx3d8pmcb58cbp37am9slmfyvq2l0hh";
sha256 = "166j9r2pn6hbqqhgjx37c245yhd60dz00jphp18snrsfcxx841ds";
type = "gem";
};
version = "0.5.1";
version = "0.8.0";
};
coderay = {
groups = [
@@ -1190,10 +1210,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1gyjwd7in1nlf8zai2fxazxi8cy6xjzswdcjway520blb39ka7cx";
sha256 = "1k9wa8fnfz08lyn86vpqhdv4jffznlxcx6p6qr11rdf7qy4jybfs";
type = "gem";
};
version = "0.23.11";
version = "0.23.12";
};
concurrent-ruby = {
groups = [
@@ -1451,10 +1471,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1jxzgg3yccp3gjncl5ih0y13dcappmy0y8pq85wgjj0yx5fh0ixy";
sha256 = "1203q6zdw14vwmnr2hw0d6b1rdz4d07w3kjg1my1zhw862gnnac8";
type = "gem";
};
version = "2.2.1";
version = "2.2.2";
};
database_cleaner-core = {
groups = [
@@ -1821,6 +1841,7 @@ src: {
dry-core = {
dependencies = [
"concurrent-ruby"
"logger"
"zeitwerk"
];
groups = [
@@ -1831,10 +1852,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "03a5qn74c4lk2rpy6wlhv66synjlyzc4wn086xzphkpmw12l4bzk";
sha256 = "15di39ssfkwigyyqla65n4x6cfhgwa4cv8j5lmyrlr07jwd840q9";
type = "gem";
};
version = "1.0.1";
version = "1.1.0";
};
dry-inflector = {
groups = [
@@ -1845,13 +1866,14 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "09hnvna3lg2x36li63988kv664d0zvy7y0z33803yvrdr9hj7lka";
sha256 = "0blgyg9l4gpzhb7rs9hqq9j7br80ngiigjp2ayp78w6m1ysx1x92";
type = "gem";
};
version = "1.0.0";
version = "1.2.0";
};
dry-logic = {
dependencies = [
"bigdecimal"
"concurrent-ruby"
"dry-core"
"zeitwerk"
@@ -1864,13 +1886,14 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "05nldkc154r0qzlhss7n5klfiyyz05x2fkq08y13s34py6023vcr";
sha256 = "18nf8mbnhgvkw34drj7nmvpx2afmyl2nyzncn3wl3z4h1yyfsvys";
type = "gem";
};
version = "1.5.0";
version = "1.6.0";
};
dry-types = {
dependencies = [
"bigdecimal"
"concurrent-ruby"
"dry-core"
"dry-inflector"
@@ -1885,10 +1908,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1f6dz0hm67rhybh6xq2s3vvr700cp43kf50z2lids62s2i0mh5hj";
sha256 = "1g61cnmmwzff05sf8bh95qjd3hikasgvrmf3q0qk29zdw12pmndm";
type = "gem";
};
version = "1.7.1";
version = "1.8.3";
};
dumb_delegator = {
groups = [
@@ -2346,10 +2369,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0ljxb9kqssp70waz0an1ppm33821r0dbvs4b75qbqbv05p0ziqs3";
sha256 = "0h7crcdqddlds3kx0q3vsx3cm6s62psvfx98crasqnhrz2nwb1g4";
type = "gem";
};
version = "2.24.0";
version = "2.25.0";
};
ffi = {
groups = [
@@ -2762,10 +2785,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0677zbflbjvmxbf6riczscjl6g3pqdh5xb1f783d4lfhdi43rbg4";
sha256 = "1qg3kc103v767hjw77wcx5mwx5dg2b6vlhxk3bb4hpbsjqgm4mf3";
type = "gem";
};
version = "18.4.0.pre.rc1";
version = "18.4.1";
};
gitlab = {
dependencies = [
@@ -2859,10 +2882,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0h9kfc8ni6lc0jy5r8hvs1768130adq75pnn4vy7jfl7fk7683yp";
sha256 = "0bvjvc2yvc2sjn4f6lgww46gw39pb1ripsl5a6rq6wldfahvp7mw";
type = "gem";
};
version = "1.32.0";
version = "1.33.0";
};
gitlab-crystalball = {
dependencies = [
@@ -2908,7 +2931,7 @@ src: {
path = "${src}/vendor/gems/gitlab-duo-workflow-service-client";
type = "path";
};
version = "0.3";
version = "0.5";
};
gitlab-experiment = {
dependencies = [
@@ -2919,10 +2942,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0j0zs29izmhqc1jvgfsvikqdyg6r8kf3j9azbmsmm02l45sfwc7j";
sha256 = "1fgar7p0rpi0ycqdccrzxz8lvxzm78zi95xy642jy09hbpjnzxwz";
type = "gem";
};
version = "0.9.1";
version = "1.0.0";
};
gitlab-fog-azure-rm = {
dependencies = [
@@ -2950,15 +2973,28 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0pr1lqa5s4xrl5lxqw2sq5c3kdqlrlpxl9x9ybvf1lmpygkbcnmc";
sha256 = "12r3g7fb7wbhykmjn1n6b0jiyb26bma0x89wcm8ac4phz8aqhm6j";
type = "gem";
};
version = "0.0.33";
version = "0.0.36";
};
gitlab-grape-openapi = {
dependencies = [
"grape"
"grape-entity"
];
groups = [ "default" ];
platforms = [ ];
source = {
path = "${src}/gems/gitlab-grape-openapi";
type = "path";
};
version = "0.1.0";
};
gitlab-housekeeper = {
dependencies = [
"activesupport"
"awesome_print"
"amazing_print"
"httparty"
"rubocop"
];
@@ -2996,10 +3032,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1k0jbpfycg23pm8gddwzxj8b1wpvqisxc6dd33xxr2f7canr8bx8";
sha256 = "1imwvsfzd040pjkwid8xb5s5bdjy51mq68hcx4pasaspaz4qpzlf";
type = "gem";
};
version = "18.3.2";
version = "18.5.0.pre.rc4";
};
gitlab-labkit = {
dependencies = [
@@ -3018,10 +3054,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0awcb5bb9y1y61yzzvj5gkm03w232njym7cdw0s2gpgwh37q6pyg";
sha256 = "07xbjd5vap486vspzz164hf2j5x0v9g4q6j0whzlh3ak1svqb22j";
type = "gem";
};
version = "0.40.0";
version = "0.42.0";
};
gitlab-license = {
groups = [ "default" ];
@@ -3161,10 +3197,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0h7wf8p369zqw51ikychqsii2kh9f920jwhr4b352p1sd1a59qf8";
sha256 = "0s9akkxm69i9mlcl5n3ikv9dy678cqqa3jl3cq785653gcx8p8ww";
type = "gem";
};
version = "0.33.3";
version = "0.35.1";
};
gitlab-security_report_schemas = {
dependencies = [
@@ -3291,10 +3327,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1xxi1grl13663cwmpqvyq75carn05nd8ns26aq34xjqmk0gc8j9c";
sha256 = "0b3db3p68b8h2089rhi5z3m927xkv4vcxa998v17lmspj2496wra";
type = "gem";
};
version = "2.20.0";
version = "2.20.3";
};
globalid = {
dependencies = [ "activesupport" ];
@@ -3369,10 +3405,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1gzv5svbj62qcdw5ljva0sh8wifjx9wwx00kfj9bbff052i7597h";
sha256 = "1y05cy0h486lrdbl5vv3vpv2nh6pkizqa937v1yl0r46y8zp55my";
type = "gem";
};
version = "0.31.0";
version = "0.44.0";
};
google-apis-compute_v1 = {
dependencies = [ "google-apis-core" ];
@@ -3405,10 +3441,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0jbb5zqv7krxy60iylrnwb9qz0brbgj2m66w5kdhq040ww0760lx";
sha256 = "16f2ylvlyby4vzxn03ajqd4bnd6gcz5gxqs4gdi5jq47yi5ncfcn";
type = "gem";
};
version = "0.90.0";
version = "0.91.0";
};
google-apis-core = {
dependencies = [
@@ -3946,10 +3982,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "12qy6yga90hs2pdzkxwm80d38dbmjdxmf2szqwb40ky1jr4klfp7";
sha256 = "1na1h7nkc9s9s33g1pliml1nm3dq56ffwp9ajs95kpazbplbcd79";
type = "gem";
};
version = "1.74.1";
version = "1.75.0";
};
grpc-google-iam-v1 = {
dependencies = [
@@ -4072,10 +4108,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1gvkhb18inkwkf9ja1i774975l259dzlvcvjii3zfyzmzylki5qb";
sha256 = "1v64nbbckmfgi7b5c5j609mpcdyhbf7gav3n99xjy5fpyca7hpab";
type = "gem";
};
version = "0.64.0";
version = "0.66.0";
};
hamlit = {
dependencies = [
@@ -4110,10 +4146,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1da0w5v7ppxrgvh58bafjklzv73nknyq73if6d9rkz2v24zg3169";
sha256 = "1lbw8lqzjv17vnwb9vy5ki4jiyihybcc5h2rmcrqiz1xa6y9s1ww";
type = "gem";
};
version = "1.2.0";
version = "1.2.1";
};
hashie = {
groups = [ "default" ];
@@ -4293,10 +4329,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7";
sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
type = "gem";
};
version = "1.14.4";
version = "1.14.7";
};
i18n_data = {
groups = [ "default" ];
@@ -4746,10 +4782,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x";
sha256 = "1k0311vah76kg5m6zr7wmkwyk5p2f9d9hyckjpn3xgr83ajkj7px";
type = "gem";
};
version = "3.17.0.3";
version = "3.17.0.5";
};
launchy = {
dependencies = [ "addressable" ];
@@ -4771,10 +4807,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0pqam7p5f72ic1x16jmgvydjxgqd0lddq4pnkxjmwn174yk2k778";
sha256 = "0wl9bskb500gw0l2f1bm8rnv3xa2564lw6294pw6qnldz5zm2mx2";
type = "gem";
};
version = "1.12.3";
version = "1.13.0";
};
letter_opener = {
dependencies = [ "launchy" ];
@@ -5209,10 +5245,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
sha256 = "12f2830x7pq3kj0v8nz0zjvaw02sv01bqs1zwdrc04704kwcgmqc";
type = "gem";
};
version = "2.8.8";
version = "2.8.9";
};
minitest = {
groups = [
@@ -5352,10 +5388,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd";
sha256 = "08ma2fmxlm6i7lih4mc3har2fzsbj1pl4hhva65kljf6nfvdryl5";
type = "gem";
};
version = "3.0.0";
version = "3.0.4";
};
mustermann-grape = {
dependencies = [ "mustermann" ];
@@ -5603,10 +5639,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0czsh9d738kj0bmpkjnczq9j924hg103gc00i0wfyg0fzn9psnmc";
sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m";
type = "gem";
};
version = "1.18.9";
version = "1.18.10";
};
notiffany = {
dependencies = [
@@ -5748,6 +5784,7 @@ src: {
omniauth = {
dependencies = [
"hashie"
"logger"
"rack"
"rack-protection"
];
@@ -5755,10 +5792,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1hjnb5b5m549irs0h1455ipzsv82pikdagx9wjb6r4j1bkjy494d";
sha256 = "0g3n12k5npmmgai2cs3snimy6r7h0bvalhjxv0fjxlphjq25p822";
type = "gem";
};
version = "2.1.3";
version = "2.1.4";
};
omniauth-alicloud = {
dependencies = [ "omniauth-oauth2" ];
@@ -6003,10 +6040,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0ygfbbs3c61d32ymja2k6sznj5pr540cip9z91lhzcvsr4zmffpz";
sha256 = "0dzq3k5hmqlav2mwf7bc10mr1mlmlnpin498g7jhbhpdpa324s6n";
type = "gem";
};
version = "3.3.0";
version = "3.3.1";
};
openssl-signature_algorithm = {
dependencies = [ "openssl" ];
@@ -6846,10 +6883,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0bvdq2jsn1jj8vgp9xrmi6ljw0hqlv4i97v5aa0fcii34g9rrzr4";
sha256 = "0gkhpdjib9zi9i27vd9djrxiwjia03cijmd6q8yj2q1ix403w3nw";
type = "gem";
};
version = "1.2.0";
version = "1.4.0";
};
proc_to_ast = {
dependencies = [
@@ -7043,10 +7080,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1pcr8sn02lwzv3z6vx5n41b6ybcnw9g9h05s3lkv4vqdm0f2mq2z";
sha256 = "0kvz20sxih8f976ry45b6c8srkh4km0cw4ilc5ynlmyk2nkywkya";
type = "gem";
};
version = "2.2.17";
version = "2.2.18";
};
rack-accept = {
dependencies = [ "rack" ];
@@ -7382,10 +7419,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1h1jal1sv47saxyk33nnjk2ywrsf35aar18p7mc48s2m33876wpd";
sha256 = "1c0r26dhdr4jiklc0g7wjmr5q56dp7hwcfa8z75khkp8mrhazfpa";
type = "gem";
};
version = "3.6.1";
version = "3.9.5";
};
rbtrace = {
dependencies = [
@@ -7436,10 +7473,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1rvf0yyff2anyfnmx6csx7fai8dk727b843hzz1bm2nqcmm9asv7";
sha256 = "1hpkh647ffsqhnj4ps85n2v4d116fg3250m9y7pcnc55lxl6nda5";
type = "gem";
};
version = "2.19.0";
version = "2.20.0";
};
recaptcha = {
dependencies = [ "json" ];
@@ -7517,10 +7554,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0l2fsgfzzrspgrg6x3s38hws5clgbn1aaxcmiyz5jz6xd3dpkxdz";
sha256 = "0wx0v68lh924x544mkpydcrkkbr7i386xvkpyxgsf5j55j3d4f8y";
type = "gem";
};
version = "0.25.3";
version = "0.26.1";
};
redis-cluster-client = {
dependencies = [ "redis-client" ];
@@ -7714,10 +7751,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "05y4lwzci16c2xgckmpxkzq4czgkyaiiqhvrabdgaym3aj2jd10k";
sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r";
type = "gem";
};
version = "3.4.2";
version = "3.4.4";
};
rinku = {
groups = [ "default" ];
@@ -7748,10 +7785,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0ynxxmvzczn9a6wd87jyh209590nq6f6ls55dmwiky8fvwi8c68h";
sha256 = "1pkp5icgm7s10b2n6b2pzbdsfiv0l5sxqyizx55qdmlpaxnk8xah";
type = "gem";
};
version = "4.6.0";
version = "4.6.1";
};
rqrcode = {
dependencies = [
@@ -8151,16 +8188,15 @@ src: {
"language_server-protocol"
"prism"
"rbs"
"sorbet-runtime"
];
groups = [ "development" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0s97zck9v2c1awk4lbj5ccsnn6p0jp018mrq12fvh5hp00sn3586";
sha256 = "050qg73g4qs3xza441nafy7610daa3k4ra0pbi3sdlawy9fwfh6i";
type = "gem";
};
version = "0.23.20";
version = "0.26.1";
};
ruby-lsp-rails = {
dependencies = [ "ruby-lsp" ];
@@ -8168,10 +8204,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0xlcpxsz2sk57l0kwla2gj8l9cfqj7dxxf0794p67daldr3fs2k7";
sha256 = "1bj4bj35l9jas2yf6w93j5ngw3f24lck2j9h5zmxwqs0dn91z7gh";
type = "gem";
};
version = "0.3.31";
version = "0.4.8";
};
ruby-lsp-rspec = {
dependencies = [ "ruby-lsp" ];
@@ -8179,10 +8215,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "08m2fw4f784lkbyz5rbzdhj57p0x2pfygk66ls0qsn5avnv7izs1";
sha256 = "09wqhrrkfhbjy8yxkp1bn9rmrdcjp85j3lisvwp1qp7jz18yk0bm";
type = "gem";
};
version = "0.1.24";
version = "0.1.27";
};
ruby-magic = {
dependencies = [ "mini_portile2" ];
@@ -8776,23 +8812,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1wxzz7580h6k2sghj9p1ss33i6nlmpmwqawi6ilr87si233rwgxc";
sha256 = "073ymwmn028lgzs62yfghdlgarndr3a972j8733dqkk9k2pcapr9";
type = "gem";
};
version = "0.5.2";
};
sorbet-runtime = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1dpxyhph8rp0bwiacqjsvsm67gm6v7bw16na20rk59g6y8953dk4";
type = "gem";
};
version = "0.5.11647";
version = "0.5.4";
};
spamcheck = {
dependencies = [ "grpc" ];
@@ -8873,14 +8896,15 @@ src: {
version = "3.5.2";
};
ssh_data = {
dependencies = [ "base64" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1h5aiqqlk51z12kgvanhdvd0ajvv2i68z6a7450yxgmflfaiwz7c";
sha256 = "1nsv1411dp5c13sbfzncf9kn3shf302gqqg8g7vmvvpzj5x35s1a";
type = "gem";
};
version = "1.3.0";
version = "2.0.0";
};
ssrf_filter = {
groups = [ "default" ];
@@ -10073,9 +10097,9 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1";
sha256 = "119ypabas886gd0n9kiid3q41w76gz60s8qmiak6pljpkd56ps5j";
type = "gem";
};
version = "2.6.7";
version = "2.7.3";
};
}
+3 -2
View File
@@ -62,10 +62,10 @@ class GitLabRepo:
.strip()
)
def get_yarn_hash(self, rev: str):
def get_yarn_hash(self, rev: str, yarn_lock_path="yarn.lock"):
with tempfile.TemporaryDirectory() as tmp_dir:
with open(tmp_dir + "/yarn.lock", "w") as f:
f.write(self.get_file("yarn.lock", rev))
f.write(self.get_file(yarn_lock_path, rev))
return (
subprocess.check_output(["prefetch-yarn-deps", tmp_dir + "/yarn.lock"])
.decode("utf-8")
@@ -112,6 +112,7 @@ class GitLabRepo:
version=self.rev2version(rev),
repo_hash=self.get_git_hash(rev),
yarn_hash=self.get_yarn_hash(rev),
frontend_islands_yarn_hash=self.get_yarn_hash(rev, "/ee/frontend_islands/apps/duo_next/yarn.lock"),
owner=self.owner,
repo=self.repo,
rev=rev,
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "grafanactl";
version = "0.1.5";
version = "0.1.6";
src = fetchFromGitHub {
owner = "grafana";
repo = "grafanactl";
tag = "v${finalAttrs.version}";
hash = "sha256-XHcNyPSN01CGkuj9p54yAAWFlwoWLF6cm5Q2f8iZtVM=";
hash = "sha256-elCTtsBkPthlDnUDWSOmM+JMBh/ms2+30b4hVsiJU6Q=";
};
vendorHash = "sha256-fHlktADqw3p377g3vXr2LZdBfWfNZOHxnp9H8/C31Gg=";
vendorHash = "sha256-WmMkLMxkfGWq8dGjVfME86hEI76Rlp5aWqbNKatUZ80=";
ldflags = [
"-X main.version=v${finalAttrs.version}"
+6 -6
View File
@@ -1,8 +1,8 @@
major = "10.0"
patch = "10.2"
mapsBundle = "0.0.0-4718098d1db1798841a4d12f1727e8e8f7eab202"
major = "11.0"
patch = "11.0"
mapsBundle = "0.0.0-f171bcf55e447bf494348dd274cd377b73c951f6"
[hash]
src = "sha256-E6G9JR1lrXhNJ4YgMM0n0RsQcMZQM2QldGc74f5FALo="
mapsBundle = "sha256-jZTNJfmMWJQHpJ8um3yTBx/KtIfdr0EwKJ9kSFalWJQ="
mvnDeps = "sha256-KidbIBnW//IiKPFy3plFWOED8gP/ZCg4buwMgzttaY8="
src = "sha256-tK8zEX2szcU77ydHW+ak/GTjKKC6C5xlG0Uum7a/76I="
mapsBundle = "sha256-ehwWBIuYBwXu7W7uHYYuGl0lS4s6Tm5c4BfKPkY+w0A="
mvnDeps = "sha256-0B38C37QbkOhxd5e4SHfMg9SqcUZkuIf1g1S9SnCu7U="
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "istioctl";
version = "1.27.2";
version = "1.27.3";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
hash = "sha256-o+rKTm1Yc2J+/uDp1DCkCpmOrODpfQ7bQ/FB62UyKfk=";
hash = "sha256-MgicdVRYHdp38lHY7VjAH+4xKD9sgEroEIwNkSmbfjU=";
};
vendorHash = "sha256-AJzEAFZZe4QtuYRcIJ8GwosbBi5gWn+DAOpVS8JnAdQ=";
+2 -2
View File
@@ -33,13 +33,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "kew";
version = "3.5.3";
version = "3.6.4";
src = fetchFromGitHub {
owner = "ravachol";
repo = "kew";
tag = "v${finalAttrs.version}";
hash = "sha256-7bO9IvSTJJKiNYQzcTSI2Ugjhw1ibbyE5/fe6EDYqvI=";
hash = "sha256-PhNBAy+XS1wpU91GNoRc4jume9razD03xmmUER0p8I0=";
};
postPatch = ''
+7 -2
View File
@@ -20,8 +20,13 @@ stdenv.mkDerivation (finalAttrs: {
sourceRoot = "${finalAttrs.src.name}/lib60870-C";
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace src/CMakeLists.txt --replace-warn "-lrt" ""
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace src/CMakeLists.txt \
--replace-warn "-lrt" "" \
'';
separateDebugInfo = true;
+6 -3
View File
@@ -15,9 +15,12 @@ stdenv.mkDerivation rec {
hash = "sha256-2n1tuKti8Zn5UzQHmRdvW5Q+x4CXS9QuPHFQ+DFriiE=";
};
nativeBuildInputs = [
cmake
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required (VERSION 3.1)" "cmake_minimum_required (VERSION 3.10)"
'';
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib"
+5 -1
View File
@@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-iaOXdDIJOBXHyjE07CvU4ApTh71lmtMCyU46AV+MGXQ=";
};
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 3.4 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10 FATAL_ERROR)"
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl ];
@@ -24,7 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
patches = [ ./libamqpcpp-darwin.patch ];
enableParallelBuilding = true;
doCheck = true;
meta = {
description = "Library for communicating with a RabbitMQ server";
+5 -1
View File
@@ -18,8 +18,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
# https://github.com/greatscottgadgets/libbtbb/issues/63
postPatch = ''
# https://github.com/NixOS/nixpkgs/issues/445447
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
# https://github.com/greatscottgadgets/libbtbb/issues/63
substituteInPlace lib/libbtbb.pc.in \
--replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
--replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
+8 -3
View File
@@ -8,16 +8,21 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libcaption";
version = "0.7";
version = "0.8";
src = fetchFromGitHub {
owner = "szatmary";
repo = "libcaption";
tag = finalAttrs.version;
hash = "sha256-OBtxoFJF0cxC+kfSK8TIKIdLkmCh5WOJlI0fejnisJo=";
tag = "v${finalAttrs.version}";
hash = "sha256-9tszEKR30GHoGQ3DE9ejU3yOdtDiZwSZHiIJUPLgOdU=";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ re2c ];
+4 -4
View File
@@ -5,15 +5,15 @@
cmake,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "libfann";
version = "2.2.0";
version = "2.2.0-unstable-2025-10-13";
src = fetchFromGitHub {
owner = "libfann";
repo = "fann";
rev = version;
sha256 = "0awbs0vjsrdglqiaybb0ln13ciizmyrw9ahllahvgbq4nr0nvf6y";
rev = "3907e1b37f94ed606b627c55dd2238956046a19b";
sha256 = "sha256-UdEpUD7ASrqygwFgW4CdCDGIJtUTKeJbHZDnnQI5jSI=";
};
nativeBuildInputs = [ cmake ];
+4 -4
View File
@@ -7,10 +7,10 @@
let
pname = "lmstudio";
version_aarch64-darwin = "0.3.28-2";
hash_aarch64-darwin = "sha256-7sxhKZwZKzA2VUPHsChgysxXMB7SKEd9zK4kIPbWYjo=";
version_x86_64-linux = "0.3.28-2";
hash_x86_64-linux = "sha256-ewVjJ0Sy5Zwf9tvlfngQKnAfAv3BvPIAO+p1tJ3mO8M=";
version_aarch64-darwin = "0.3.30-2";
hash_aarch64-darwin = "sha256-49wubBIteg+gs9RQEozRiiFgWnVlHm1aOf7EqK1uvt4=";
version_x86_64-linux = "0.3.30-2";
hash_x86_64-linux = "sha256-v2m5/BoyGXRi09To9rHp79+t2QnT5U0XuL5WNpfWWRU=";
meta = {
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
+3 -2
View File
@@ -3,13 +3,14 @@
set -euo pipefail
packages="$(curl -s -L "https://lmstudio.ai/" | grep -oE 'https://installers.lmstudio.ai[^"\]*' | sort -u | grep -v \\.exe)"
for system in "aarch64-darwin darwin/arm64" "x86_64-linux linux/x64"; do
# shellcheck disable=SC2086
set -- ${system} # split string into variables $1 and $2
arch="${1}"
url=$(echo "${packages}" | grep "${2}")
platform="${2}"
url=$(curl -ILs -o /dev/null -w %{url_effective} "https://lmstudio.ai/download/latest/${platform}")
version="$(echo "${url}" | cut -d/ -f6)"
hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 "$(nix-prefetch-url "${url}")")
+2 -2
View File
@@ -11,13 +11,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "m1n1";
version = "1.5.0";
version = "1.5.2";
src = fetchFromGitHub {
owner = "AsahiLinux";
repo = "m1n1";
tag = "v${finalAttrs.version}";
hash = "sha256-J1PZVaEdI6gx/qzsoVW1ehRQ/ZDKzdC1NgIGgBqxQ+0=";
hash = "sha256-/TQpR/3OUM4OIrfv6cBgZigyLR0VKw6Rd1v9465wy3o=";
};
postPatch = lib.optionalString (customLogo != null) ''
+2 -2
View File
@@ -162,11 +162,11 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "microsoft-edge";
version = "141.0.3537.85";
version = "141.0.3537.92";
src = fetchurl {
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-BNLA4FeKxWZ8t5YMPbWK4z2UerjcVpbcBgotSfczVsA=";
hash = "sha256-nN/TgbaxOrALzMB56TO9ZbxIjJPTCxxWyr2WOMvY6Kg=";
};
# With strictDeps on, some shebangs were not being patched correctly
+8
View File
@@ -7,6 +7,7 @@
libX11,
makeWrapper,
sox,
fetchpatch,
}:
stdenv.mkDerivation rec {
@@ -20,6 +21,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-/2NHUlAojDamNq/EVs8hoBYVikPLAFFFu/2syG4Xo4U=";
};
patches = [
(fetchpatch {
url = "https://github.com/EliasOenal/multimon-ng/commit/1c111e83053e9e78ba568463cc015edadf77ed5f.diff";
hash = "sha256-gW9ihUn3rZcyurbu7+IhkWSotqWlJsHdeFHu12oVld4=";
})
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
libpulseaudio
libX11
+2 -2
View File
@@ -9,13 +9,13 @@
}:
buildGoModule (finalAttrs: {
pname = "nelm";
version = "1.13.2";
version = "1.14.1";
src = fetchFromGitHub {
owner = "werf";
repo = "nelm";
tag = "v${finalAttrs.version}";
hash = "sha256-g/JnFD1TPVKllY1yrODJ9P0bJe2357B11XAn9tQPLE8=";
hash = "sha256-yAd+4Up5SDVlrwa/46lQmCS257T16Wf6PSo7an07H8I=";
};
vendorHash = "sha256-yd9qSQi7ktbI9b5eaTc98TjhxDsBVvh9qrf3+F2Twu4=";
+2 -2
View File
@@ -6,13 +6,13 @@
}:
buildGoModule rec {
pname = "nom";
version = "2.18.0";
version = "2.20.0";
src = fetchFromGitHub {
owner = "guyfedwards";
repo = "nom";
tag = "v${version}";
hash = "sha256-xIe7CgGzNNYzhkazjrejvZGfuLL4RqFCfXOUtFEgLCA=";
hash = "sha256-3jkHwHEuwq+KmPyDqdRsHtU4HJiBSogifufUiFpsYkI=";
};
vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";
@@ -0,0 +1,20 @@
--- vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go
+++ vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go
@@ -696,7 +696,7 @@ func init() {
// Load protocols
data, err := ioutil.ReadFile("/etc/protocols")
if err != nil {
- if !os.IsNotExist(err) {
+ if !os.IsNotExist(err) && !os.IsPermission(err) {
panic(err)
}
@@ -732,7 +732,7 @@ func init() {
// Load services
data, err = ioutil.ReadFile("/etc/services")
if err != nil {
- if !os.IsNotExist(err) {
+ if !os.IsNotExist(err) && !os.IsPermission(err) {
panic(err)
}
+10 -3
View File
@@ -5,16 +5,23 @@
}:
buildGoModule rec {
pname = "pmtiles";
version = "1.28.1";
version = "1.28.2";
src = fetchFromGitHub {
owner = "protomaps";
repo = "go-pmtiles";
tag = "v${version}";
hash = "sha256-Ti6ljJeC6hqA5edzyUqOShBIbdmrsz4TDnQ44TMJQ8Q=";
hash = "sha256-JGsbgBB2T+4SWKQmiSmuMqQ8gw0qhM5c5eFDF/+sndA=";
};
vendorHash = "sha256-kfEzpaFMf0W8Ygtl40LBy3AZQSL+9Uo+n2x9OTOavqk=";
vendorHash = "sha256-6zsX7rU+D+RUHwXfFZzLQftQ6nSYJhvKIDdsO2vow4A=";
overrideModAttrs = old: {
# https://gitlab.com/cznic/libc/-/merge_requests/10
postBuild = ''
patch -p0 < ${./darwin-sandbox-fix.patch}
'';
};
ldflags = [
"-s"
+2 -2
View File
@@ -8,7 +8,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "retool";
version = "2.4.2";
version = "2.4.3";
pyproject = true;
disabled = python3.pkgs.pythonOlder "3.10";
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "unexpectedpanda";
repo = "retool";
tag = "v${version}";
hash = "sha256-jb2HJjXBxfdOY9TI37D5xwtySlYoSJwckrLC+h7YqoM=";
hash = "sha256-uYzsHraA5LX+5wZWSAO7lOFhssd7LojftLP5pufgUcc=";
};
nativeBuildInputs = with python3.pkgs; [
+13 -4
View File
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
cmake,
qt6,
kdePackages,
wrapGAppsHook4,
}:
@@ -19,20 +20,28 @@ stdenv.mkDerivation rec {
};
buildInputs = [
kdePackages.qtwebengine
kdePackages.qttools
qt6.qtbase
qt6.qtmultimedia
qt6.qtwebengine
qt6.qttools
qt6.qt5compat
kdePackages.mpvqt
kdePackages.full
];
nativeBuildInputs = [
cmake
wrapGAppsHook4
kdePackages.wrapQtAppsHook
qt6.wrapQtAppsHook
];
cmakeFlags = with lib; [
(cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"")
];
dontWrapGApps = true;
preFixup = ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = {
description = "Simple RSS/Atom feed reader with online synchronization";
mainProgram = "rssguard";
+12 -12
View File
@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 4
version = 3
[[package]]
name = "aho-corasick"
@@ -13,21 +13,21 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.175"
version = "0.2.177"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
[[package]]
name = "memchr"
version = "2.7.5"
version = "2.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
[[package]]
name = "regex"
version = "1.11.2"
version = "1.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
dependencies = [
"aho-corasick",
"memchr",
@@ -37,9 +37,9 @@ dependencies = [
[[package]]
name = "regex-automata"
version = "0.4.10"
version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
dependencies = [
"aho-corasick",
"memchr",
@@ -48,13 +48,13 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.8.6"
version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
[[package]]
name = "rure"
version = "0.2.3"
version = "0.2.4"
dependencies = [
"libc",
"regex",
+2 -2
View File
@@ -1,5 +1,5 @@
{
"pname": "rure",
"version": "0.2.3",
"hash": "sha256:0d8r0fv93ganqi9iyrgljbkvrvys33n0zrkaf11zsb23b2hwcsxa"
"version": "0.2.4",
"hash": "sha256:02wgpjllvlqhcpj8w59qwfjhxch3qy5i2qg3a1v1555dhhzqnnwl"
}
+3 -3
View File
@@ -26,14 +26,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "s7";
version = "11.7-unstable-2025-10-14";
version = "11.7-unstable-2025-10-20";
src = fetchFromGitLab {
domain = "cm-gitlab.stanford.edu";
owner = "bil";
repo = "s7";
rev = "e338a5d36920e006d45880d9a89a2fb85068b0aa";
hash = "sha256-UpjJf45xuyn7zIMK/vj8UMmRYUuDcYe7GpLaOuxctNM=";
rev = "479045bf9445789c6a0a0252dd6fc092f2b0b507";
hash = "sha256-F7IPAjIlfZcuj9Of0wDYQWPTAWWZO9z6/FbjHwZlJAo=";
};
buildInputs =
+3 -3
View File
@@ -8,17 +8,17 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
version = "0.11.0";
version = "0.12.0";
pname = "sccache";
src = fetchFromGitHub {
owner = "mozilla";
repo = "sccache";
rev = "v${finalAttrs.version}";
sha256 = "sha256-x+TeFJa15eLmdUAAL4GH+bz6LWJZ/8Z0C1NcJ04MWc8=";
sha256 = "sha256-QNLcA31SJf7XmxYvzDC5LCKVu5ZWiw7U249KjUAGIZw=";
};
cargoHash = "sha256-FyzeSiewKZhw1iIT6831W/FAx9IrG+Kswi5QWkQ0zQk=";
cargoHash = "sha256-tJGGS6Zpsz9nye2VKdZRuFeeqJ71MsXn3C9ytqeEW5I=";
buildFeatures = lib.optionals distributed [
"dist-client"
+8
View File
@@ -37,6 +37,14 @@ stdenv.mkDerivation {
libX11
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 3.24)" "cmake_minimum_required(VERSION 3.10)"
substituteInPlace third_party/glm-0.9.9.8/CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 3.2 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" \
--replace-fail "cmake_policy(VERSION 3.2)" "cmake_policy(VERSION 3.10)"
'';
meta = with lib; {
description = "System for creating 3D models procedurally from a set of Signed Distance Function (SDF) primitive shapes and combining operators";
homepage = "https://github.com/Aeva/tangerine";
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule rec {
pname = "tbls";
version = "1.89.1";
version = "1.90.0";
src = fetchFromGitHub {
owner = "k1LoW";
repo = "tbls";
tag = "v${version}";
hash = "sha256-fGaH9766OjPNz0eVG4M1hKdqRaEkAzwz1lL2o4TxyAo=";
hash = "sha256-1CiiRmooy1KG6WsdRyLkttiEGX0ObPyJ/s97DcQXwUU=";
};
vendorHash = "sha256-hupOff2cJ+UrJFgMyDu3XYvEjyE/XvvyqiQq408wJsw=";
+2 -2
View File
@@ -7,14 +7,14 @@
buildGoModule (finalAttrs: {
pname = "vacuum-go";
version = "0.18.6";
version = "0.18.9";
src = fetchFromGitHub {
owner = "daveshanley";
repo = "vacuum";
# using refs/tags because simple version gives: 'the given path has multiple possibilities' error
tag = "v${finalAttrs.version}";
hash = "sha256-9qRdikwZcTEZEQON2/n3dy9FA34Bu8YTfNfssOcUwgg=";
hash = "sha256-uXNSwp+Qqw8drSt+SN20AjoJG9Pmaz0WCozFq8jEv2o=";
};
vendorHash = "sha256-+GkxN20mZD/ZBTCjmjiDcEAJix2Ssn9HsNrUtQkrI18=";
@@ -32,7 +32,7 @@ in
++ [
qtwayland
qtwebview
(qt6.qtwebengine or qt6.full)
qt6.qtwebengine
rdma-core
]
++ lib.optionals (cudaOlder "12.7") [
@@ -87,14 +87,14 @@ in
buildInputs =
prevAttrs.buildInputs or [ ]
++ [
(qt6.qtdeclarative or qt6.full)
(qt6.qtsvg or qt6.full)
(qt6.qtimageformats or qt6.full)
(qt6.qtpositioning or qt6.full)
(qt6.qtscxml or qt6.full)
(qt6.qttools or qt6.full)
(qt6.qtwebengine or qt6.full)
(qt6.qtwayland or qt6.full)
qt6.qtdeclarative
qt6.qtsvg
qt6.qtimageformats
qt6.qtpositioning
qt6.qtscxml
qt6.qttools
qt6.qtwebengine
qt6.qtwayland
boost178
cuda_cudart.stubs
e2fsprogs
@@ -580,7 +580,7 @@ builtins.intersectAttrs super {
gi-gtk-declarative = dontCheck super.gi-gtk-declarative;
gi-gtk-declarative-app-simple = dontCheck super.gi-gtk-declarative-app-simple;
hsqml = dontCheck (
addExtraLibraries [ pkgs.libGLU pkgs.libGL ] (super.hsqml.override { qt5 = pkgs.qt5Full; })
addExtraLibraries [ pkgs.libGLU pkgs.libGL ] (super.hsqml.override { qt5 = pkgs.qt5.qtbase; })
);
monomer = dontCheck super.monomer;
@@ -17,6 +17,11 @@ stdenv.mkDerivation {
sha256 = "+oTjU/DgOEIwJebSVkSEt22mJSdeONozB8FfzEiESHU=";
};
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
'';
nativeBuildInputs = [ cmake ];
outputs = [
+3 -52
View File
@@ -67,58 +67,6 @@ let
inherit (srcs.qtbase) src version;
};
env = callPackage ./qt-env.nix { };
full = callPackage (
{ env, qtbase }:
env "qt-full-${qtbase.version}"
# `with self` is ok to use here because having these spliced is unnecessary
(
with self;
[
qt3d
qt5compat
qtcharts
qtconnectivity
qtdatavis3d
qtdeclarative
qtdoc
qtgraphs
qtgrpc
qthttpserver
qtimageformats
qtlanguageserver
qtlocation
qtlottie
qtmultimedia
qtmqtt
qtnetworkauth
qtpositioning
qtsensors
qtserialbus
qtserialport
qtshadertools
qtspeech
qtquick3d
qtquick3dphysics
qtquickeffectmaker
qtquicktimeline
qtremoteobjects
qtsvg
qtscxml
qttools
qttranslations
qtvirtualkeyboard
qtwebchannel
qtwebengine
qtwebsockets
qtwebview
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
qtwayland
libglvnd
]
)
) { };
qt3d = callPackage ./modules/qt3d.nix { };
qt5compat = callPackage ./modules/qt5compat.nix { };
qtcharts = callPackage ./modules/qtcharts.nix { };
@@ -213,6 +161,9 @@ let
};
} ./hooks/qmake-hook.sh
) { };
}
// lib.optionalAttrs config.allowAliases {
full = throw "qt6.full has been removed. Please use individual packages instead."; # Added 2025-10-21
};
baseScope = makeScopeWithSplicing' {
+2
View File
@@ -2,6 +2,7 @@
mkKdeDerivation,
qt5compat,
qttools,
kauth,
acl,
attr,
}:
@@ -16,6 +17,7 @@ mkKdeDerivation {
extraBuildInputs = [
qt5compat
qttools
kauth
acl
attr
];
+2
View File
@@ -1,6 +1,7 @@
{
mkKdeDerivation,
pkg-config,
gpgme,
libgcrypt,
libsecret,
kdoctools,
@@ -13,6 +14,7 @@ mkKdeDerivation {
];
extraBuildInputs = [
gpgme
libgcrypt
libsecret
kdoctools
@@ -2,9 +2,10 @@
lib,
mkKdeDerivation,
replaceVars,
qtdeclarative,
kauth,
samba,
shadow,
qtdeclarative,
}:
mkKdeDerivation {
pname = "kdenetwork-filesharing";
@@ -19,7 +20,10 @@ mkKdeDerivation {
./samba-hint.patch
];
extraBuildInputs = [ qtdeclarative ];
extraBuildInputs = [
qtdeclarative
kauth
];
# We can't actually install samba via PackageKit, so let's not confuse users any more than we have to
extraCmakeFlags = [ "-DSAMBA_INSTALL=OFF" ];
-2
View File
@@ -1,14 +1,12 @@
{
mkKdeDerivation,
qtsvg,
qcoro,
}:
mkKdeDerivation {
pname = "kontrast";
extraBuildInputs = [
qtsvg
qcoro
];
meta.mainProgram = "kontrast";
}
+3
View File
@@ -3,6 +3,7 @@
pkg-config,
qtspeech,
qtsvg,
plasma-activities,
poppler,
libtiff,
libspectre,
@@ -19,6 +20,8 @@ mkKdeDerivation {
qtspeech
qtsvg
plasma-activities
poppler
libtiff
libspectre
+81 -28
View File
@@ -18,6 +18,8 @@
"kcrash",
"ki18n",
"kiconthemes",
"kirigami",
"kirigami-addons",
"kitemmodels",
"kwidgetsaddons",
"kwindowsystem",
@@ -366,6 +368,7 @@
"extra-cmake-modules",
"karchive",
"kcmutils",
"kcolorscheme",
"kcompletion",
"kconfig",
"kconfigwidgets",
@@ -379,14 +382,14 @@
"ki18n",
"kiconthemes",
"kio",
"kjobwidgets",
"knotifications",
"kparts",
"kservice",
"ktextwidgets",
"kwidgetsaddons",
"kwindowsystem",
"kxmlgui",
"phonon"
"kxmlgui"
],
"blinken": [
"extra-cmake-modules",
@@ -570,6 +573,9 @@
],
"cervisia": [
"extra-cmake-modules",
"kcompletion",
"kcoreaddons",
"kdbusaddons",
"kdesu",
"kdoctools",
"ki18n",
@@ -949,6 +955,13 @@
"wayland",
"wayland-protocols"
],
"hana": [
"extra-cmake-modules",
"kconfig",
"ki18n",
"kio",
"kirigami"
],
"haruna": [
"extra-cmake-modules",
"kconfig",
@@ -971,6 +984,7 @@
"kdbusaddons",
"ki18n",
"kirigami",
"kirigami-addons",
"kwindowsystem",
"libkleo",
"qqc2-desktop-style"
@@ -1077,6 +1091,7 @@
"k3b": [
"extra-cmake-modules",
"karchive",
"kauth",
"kcmutils",
"kconfig",
"kcoreaddons",
@@ -1128,7 +1143,6 @@
"kio",
"kservice",
"kwidgetsaddons",
"kwindowsystem",
"kxmlgui"
],
"kaddressbook": [
@@ -1158,7 +1172,6 @@
],
"kaichat": [
"extra-cmake-modules",
"kcompletion",
"kconfig",
"kcoreaddons",
"kcrash",
@@ -1167,12 +1180,14 @@
"ki18n",
"kiconthemes",
"kio",
"kitemviews",
"knotifications",
"knotifyconfig",
"kstatusnotifieritem",
"ktextaddons",
"kwidgetsaddons",
"kxmlgui",
"purpose"
"purpose",
"sonnet"
],
"kaidan": [
"extra-cmake-modules",
@@ -1738,6 +1753,7 @@
"kiconthemes",
"kitemviews",
"kwidgetsaddons",
"kwindowsystem",
"kxmlgui"
],
"kdeclarative": [
@@ -1953,9 +1969,7 @@
],
"kdesdk-thumbnailers": [
"extra-cmake-modules",
"kconfig",
"kcoreaddons",
"ki18n",
"kio"
],
"kdesu": [
@@ -2180,6 +2194,20 @@
"kwidgetsaddons",
"kwindowsystem"
],
"keepsecret": [
"extra-cmake-modules",
"kcolorscheme",
"kconfig",
"kcoreaddons",
"kcrash",
"kdbusaddons",
"ki18n",
"kiconthemes",
"kirigami",
"kirigami-addons",
"kitemmodels",
"qqc2-desktop-style"
],
"keurocalc": [
"extra-cmake-modules",
"kconfig",
@@ -2591,7 +2619,6 @@
"kio": [
"extra-cmake-modules",
"karchive",
"kauth",
"kbookmarks",
"kcolorscheme",
"kcompletion",
@@ -2688,11 +2715,14 @@
],
"kirigami-addons": [
"extra-cmake-modules",
"kcolorscheme",
"kconfig",
"kcoreaddons",
"kcrash",
"kglobalaccel",
"kguiaddons",
"ki18n",
"kiconthemes",
"kirigami"
],
"kirigami-gallery": [
@@ -2731,7 +2761,8 @@
"ki18n",
"kpackage",
"libkscreen",
"plasma-desktop"
"plasma-desktop",
"plasma-workspace"
],
"kitemmodels": [
"extra-cmake-modules"
@@ -3040,8 +3071,7 @@
"kstatusnotifieritem",
"kwidgetsaddons",
"kwindowsystem",
"kxmlgui",
"phonon"
"kxmlgui"
],
"kmouth": [
"extra-cmake-modules",
@@ -3084,6 +3114,7 @@
"kxmlgui"
],
"kmymoney": [
"akonadi",
"alkimia",
"extra-cmake-modules",
"kcmutils",
@@ -3097,6 +3128,7 @@
"kholidays",
"ki18n",
"kiconthemes",
"kidentitymanagement",
"kio",
"kitemmodels",
"kitemviews",
@@ -3277,6 +3309,7 @@
"kconfig",
"kcoreaddons",
"kdbusaddons",
"kdoctools",
"kguiaddons",
"ki18n",
"kiconthemes",
@@ -3398,7 +3431,8 @@
"kdoctools",
"ki18n",
"kirigami",
"kirigami-addons"
"kirigami-addons",
"qcoro"
],
"konversation": [
"extra-cmake-modules",
@@ -3490,6 +3524,7 @@
],
"kosmindoormap": [
"extra-cmake-modules",
"kcontacts",
"ki18n",
"kirigami",
"kirigami-addons",
@@ -3596,6 +3631,8 @@
"kguiaddons",
"ki18n",
"kirigami",
"kirigami-addons",
"kitemmodels",
"knotifications",
"kunifiedpush",
"kweathercore"
@@ -3614,7 +3651,8 @@
"extra-cmake-modules"
],
"kquickimageeditor": [
"extra-cmake-modules"
"extra-cmake-modules",
"kconfig"
],
"krdc": [
"extra-cmake-modules",
@@ -3801,6 +3839,8 @@
"kcoreaddons",
"kdbusaddons",
"ki18n",
"kimageformats",
"kirigami",
"kpackage",
"kservice",
"ksvg",
@@ -3939,7 +3979,6 @@
"extra-cmake-modules",
"kconfig",
"kcrash",
"kdoctools",
"kguiaddons",
"ki18n",
"knewstuff",
@@ -4027,6 +4066,7 @@
"kcoreaddons",
"ki18n",
"kio",
"kitemviews",
"ktextwidgets",
"qtkeychain",
"sonnet",
@@ -4231,7 +4271,6 @@
],
"kwallet": [
"extra-cmake-modules",
"gpgme",
"kcolorscheme",
"kconfig",
"kcoreaddons",
@@ -4312,12 +4351,13 @@
"extra-cmake-modules"
],
"kwin": [
"aurorae",
"breeze",
"breeze-icons",
"extra-cmake-modules",
"kcmutils",
"kcolorscheme",
"kconfig",
"kconfigwidgets",
"kcoreaddons",
"kcrash",
"kdeclarative",
@@ -4329,6 +4369,7 @@
"kidletime",
"kirigami",
"knewstuff",
"knighttime",
"knotifications",
"kpackage",
"kpipewire",
@@ -4347,6 +4388,7 @@
"wayland-protocols"
],
"kwin-x11": [
"aurorae",
"breeze",
"breeze-icons",
"extra-cmake-modules",
@@ -4364,9 +4406,9 @@
"kidletime",
"kirigami",
"knewstuff",
"knighttime",
"knotifications",
"kpackage",
"kpipewire",
"kscreenlocker",
"kservice",
"ksvg",
@@ -4616,7 +4658,6 @@
"libplasma": [
"extra-cmake-modules",
"karchive",
"kcmutils",
"kcolorscheme",
"kconfig",
"kcoreaddons",
@@ -4872,6 +4913,7 @@
"mimetreeparser": [
"extra-cmake-modules",
"kcalendarcore",
"kirigami",
"kmbox",
"kmime",
"kwidgetsaddons",
@@ -4970,7 +5012,6 @@
"kxmlgui",
"libkexiv2",
"phonon",
"plasma-activities",
"purpose",
"threadweaver"
],
@@ -5244,7 +5285,6 @@
"baloo",
"breeze",
"extra-cmake-modules",
"kaccounts-integration",
"kactivitymanagerd",
"kauth",
"kcmutils",
@@ -5379,6 +5419,7 @@
"bluedevil",
"bluez-qt",
"extra-cmake-modules",
"kauth",
"kconfig",
"kcoreaddons",
"ki18n",
@@ -5424,11 +5465,13 @@
"kconfigwidgets",
"kcoreaddons",
"kdbusaddons",
"kdeclarative",
"ki18n",
"kio",
"kjobwidgets",
"knotifications",
"kpackage",
"kquickcharts",
"kservice",
"ksvg",
"kwallet",
@@ -5437,6 +5480,7 @@
"libplasma",
"modemmanager-qt",
"networkmanager-qt",
"prison",
"qcoro",
"solid"
],
@@ -5449,6 +5493,7 @@
"kglobalaccel",
"ki18n",
"kirigami-addons",
"kitemmodels",
"kpackage",
"kstatusnotifieritem",
"ksvg",
@@ -5503,6 +5548,7 @@
"kcompletion",
"kconfig",
"kcoreaddons",
"kcrash",
"kdbusaddons",
"ki18n",
"kiconthemes",
@@ -5591,6 +5637,7 @@
],
"plasma-welcome": [
"extra-cmake-modules",
"kcmutils",
"kcoreaddons",
"kdbusaddons",
"ki18n",
@@ -5616,6 +5663,7 @@
"kbookmarks",
"kcmutils",
"kcodecs",
"kcolorscheme",
"kcompletion",
"kconfig",
"kconfigwidgets",
@@ -5624,7 +5672,6 @@
"kdbusaddons",
"kdeclarative",
"kded",
"kdesu",
"kfilemetadata",
"kglobalaccel",
"kglobalacceld",
@@ -5639,6 +5686,7 @@
"kitemviews",
"kjobwidgets",
"knewstuff",
"knighttime",
"knotifications",
"knotifyconfig",
"kpackage",
@@ -5686,10 +5734,12 @@
"kconfig",
"kcoreaddons",
"kguiaddons",
"kholidays",
"ki18n",
"kidletime",
"kio",
"knotifications",
"kunitconversion",
"libksysguard",
"networkmanager-qt",
"plasma-activities",
@@ -5730,6 +5780,7 @@
"kcrash",
"kdbusaddons",
"ki18n",
"knotifications",
"kwindowsystem",
"polkit-qt-1"
],
@@ -5784,7 +5835,6 @@
"kcoreaddons",
"kdbusaddons",
"ki18n",
"kiconthemes",
"kio",
"kirigami",
"knotifications",
@@ -5806,6 +5856,7 @@
"ki18n",
"kio",
"kirigami",
"kitemmodels",
"kservice"
],
"pvfviewer": [
@@ -5831,7 +5882,6 @@
"kcodecs",
"kcolorscheme",
"kconfig",
"kcoreaddons",
"kguiaddons",
"kiconthemes",
"kirigami"
@@ -5910,6 +5960,7 @@
"ki18n",
"kitemviews",
"ktexteditor",
"ktexttemplate",
"kxmlgui"
],
"rolisteam": [
@@ -6219,6 +6270,7 @@
"systemsettings": [
"extra-cmake-modules",
"kcmutils",
"kcolorscheme",
"kconfig",
"kcrash",
"kdbusaddons",
@@ -6241,6 +6293,7 @@
],
"tellico": [
"extra-cmake-modules",
"kcolorscheme",
"kconfig",
"kconfigwidgets",
"kcrash",
@@ -6249,6 +6302,7 @@
"ki18n",
"kiconthemes",
"kio",
"kio-extras",
"kitemmodels",
"knewstuff",
"kwidgetsaddons",
@@ -6317,9 +6371,6 @@
"kconfig",
"kcoreaddons",
"kcrash",
"kdev-php",
"kdevelop",
"kdevelop-pg-qt",
"kdoctools",
"ki18n",
"kiconthemes",
@@ -6405,6 +6456,7 @@
"kconfigwidgets",
"kcoreaddons",
"kcrash",
"kdeclarative",
"ki18n",
"kiconthemes",
"kio",
@@ -6418,6 +6470,7 @@
"kwidgetsaddons",
"kwindowsystem",
"kxmlgui",
"plasma-workspace",
"solid",
"wayland",
"wayland-protocols"
@@ -6462,5 +6515,5 @@
"kwindowsystem"
]
},
"version": "723afe12"
"version": "4fa0d47e"
}
+28 -7
View File
@@ -350,7 +350,6 @@
"BSD-3-Clause",
"CC0-1.0",
"GPL-2.0-only",
"GPL-2.0-or-later",
"GPL-3.0-only",
"LGPL-2.0-or-later",
"LGPL-2.1-only",
@@ -452,6 +451,7 @@
"flatpak-kcm": [
"BSD-2-Clause",
"BSD-3-Clause",
"CC-BY-SA-4.0",
"CC0-1.0",
"GPL-2.0-only",
"GPL-2.0-or-later",
@@ -638,7 +638,9 @@
"LicenseRef-KDE-Accepted-GPL"
],
"karchive": [
"Apache-2.0",
"BSD-2-Clause",
"CC-BY-SA-4.0",
"CC0-1.0",
"LGPL-2.0-or-later"
],
@@ -761,6 +763,9 @@
"LicenseRef-KDE-Accepted-LGPL"
],
"kcodecs": [
"Apache-2.0",
"BSD-2-Clause",
"CC-BY-SA-4.0",
"CC0-1.0",
"GPL-2.0-or-later",
"LGPL-2.0-only",
@@ -1004,6 +1009,7 @@
"LicenseRef-KDE-Accepted-LGPL"
],
"kdeplasma-addons": [
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"GPL-2.0-only",
@@ -1170,10 +1176,7 @@
],
"kglobalacceld": [
"CC0-1.0",
"LGPL-2.0-or-later",
"LGPL-2.1-only",
"LGPL-3.0-only",
"LicenseRef-KDE-Accepted-LGPL"
"LGPL-2.0-or-later"
],
"kgoldrunner": [
"BSD-3-Clause",
@@ -1296,6 +1299,7 @@
"GPL-2.0-or-later"
],
"kimageformats": [
"Apache-2.0",
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
@@ -1437,6 +1441,7 @@
"LGPL-2.0-only",
"LGPL-2.0-or-later",
"LGPL-2.1-only",
"LGPL-2.1-or-later",
"LGPL-3.0-only",
"LicenseRef-KDE-Accepted-LGPL"
],
@@ -1597,6 +1602,17 @@
"GPL-3.0-only",
"LicenseRef-KDE-Accepted-GPL"
],
"knighttime": [
"BSD-3-Clause",
"CC0-1.0",
"GPL-2.0-only",
"GPL-3.0-only",
"LGPL-2.1-only",
"LGPL-3.0-only",
"LicenseRef-KDE-Accepted-GPL",
"LicenseRef-KDE-Accepted-LGPL",
"MIT"
],
"knotifications": [
"BSD-2-Clause",
"BSD-3-Clause",
@@ -1850,6 +1866,7 @@
],
"krdp": [
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"GPL-2.0-or-later",
"LGPL-2.0-or-later",
@@ -2342,6 +2359,7 @@
"MIT"
],
"libplasma": [
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"GPL-2.0-only",
@@ -2457,7 +2475,6 @@
"Qt-Commercial-exception-1.0"
],
"milou": [
"BSD-2-Clause",
"CC0-1.0",
"GPL-2.0-only",
"GPL-3.0-only",
@@ -2701,6 +2718,8 @@
],
"plasma-mobile": [
"Apache-2.0",
"BSD-2-Clause",
"CC-BY-SA-4.0",
"CC0-1.0",
"GPL-2.0-only",
"GPL-2.0-or-later",
@@ -2720,7 +2739,7 @@
"LGPL-2.0-or-later"
],
"plasma-nm": [
"BSD-2-Clauses",
"BSD-2-Clause",
"CC0-1.0",
"GPL-2.0-only",
"GPL-2.0-or-later",
@@ -2868,9 +2887,11 @@
"BSD-3-Clause",
"CC0-1.0",
"GPL-2.0-or-later",
"GPL-3.0-only",
"LGPL-2.0-or-later",
"LGPL-2.1-only",
"LGPL-3.0-only",
"LicenseRef-KDE-Accepted-GPL",
"LicenseRef-KDE-Accepted-LGPL"
],
"prison": [
+20 -2
View File
@@ -1265,6 +1265,12 @@
"project_path": "unmaintained/jovie",
"repo_path": "unmaintained/jovie"
},
"jp-archives": {
"description": "Patches for KDE and Qt created by the members of Japan KDE Users Group (JKUG)",
"name": "jp-archives",
"project_path": "unmaintained/jp-archives",
"repo_path": "unmaintained/jp-archives"
},
"jsmoke": {
"description": "Smoke bindings for QtScript.",
"name": "jsmoke",
@@ -2477,6 +2483,12 @@
"project_path": "applications/keditbookmarks",
"repo_path": "utilities/keditbookmarks"
},
"keepsecret": {
"description": "Password manager",
"name": "keepsecret",
"project_path": "utilities/keepsecret",
"repo_path": "utilities/keepsecret"
},
"kemoticons": {
"description": "KEmoticons",
"name": "kemoticons",
@@ -2864,8 +2876,8 @@
"kiss": {
"description": "KDE Initial System Setup",
"name": "kiss",
"project_path": "system/kiss",
"repo_path": "system/kiss"
"project_path": "plasma/kiss",
"repo_path": "plasma/kiss"
},
"kitemmodels": {
"description": "KItemModels",
@@ -6875,6 +6887,12 @@
"project_path": "sysadmin/sentry-bugzilla-bridge",
"repo_path": "sysadmin/sentry-bugzilla-bridge"
},
"sysadmin-token-service": {
"description": "Service for issuing short lived access tokens for those presenting valid credentials",
"name": "sysadmin-token-service",
"project_path": "sysadmin/token-service",
"repo_path": "sysadmin/token-service"
},
"sysadmin-webstats": {
"description": "Scripts and templates used to manage web statistics on KDE servers",
"name": "sysadmin-webstats",
+212 -207
View File
@@ -1,347 +1,352 @@
{
"aurorae": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/aurorae-6.4.5.tar.xz",
"hash": "sha256-MYPuvEdtZ2N0FUnGvQB8ZQZJkT1kjMr6MDZpCC2L83g="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/aurorae-6.5.0.tar.xz",
"hash": "sha256-jlHm8t9NPAclO06UtVo+FY3B72OARKaNrKaB7oKw+1s="
},
"bluedevil": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/bluedevil-6.4.5.tar.xz",
"hash": "sha256-+zoHx56pgM1V+SrQO4zrJZX9ehjXD2/SxNnjU4qE1x4="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/bluedevil-6.5.0.tar.xz",
"hash": "sha256-N2W9EvEPVChFR750P8mcECLLvzjg7lbYYxY7iWm7jZg="
},
"breeze": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/breeze-6.4.5.tar.xz",
"hash": "sha256-3LhDPTmVEVRpWPTIwaj65e0i8qaY8FOWjUEO51vW2LQ="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/breeze-6.5.0.tar.xz",
"hash": "sha256-Sa9bwnEicCjfcLIhSf5vz7FbbUuObz6zKd7N465N82k="
},
"breeze-grub": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/breeze-grub-6.4.5.tar.xz",
"hash": "sha256-ToJe6Vg3k/11W0E6R8QTpfnNFBKBL3tGrO7t5TgwZGs="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/breeze-grub-6.5.0.tar.xz",
"hash": "sha256-UumPPwodqDVRAfGeTzxz7tzst0imxyKVkk5sp2+cAJg="
},
"breeze-gtk": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/breeze-gtk-6.4.5.tar.xz",
"hash": "sha256-dx6IyhlCGkcvX0I1+ye6JYi36iZ+jyZH5eIxw1HwOpg="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/breeze-gtk-6.5.0.tar.xz",
"hash": "sha256-ul8FewjjgtngeQq1HXqhzFAXyVLrxGdlQAgVUn3IFHA="
},
"breeze-plymouth": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/breeze-plymouth-6.4.5.tar.xz",
"hash": "sha256-DhuDkj8JOCHd72/VsRtW2wVxtBCfTyYCFIAfscbfcAQ="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/breeze-plymouth-6.5.0.tar.xz",
"hash": "sha256-nK75hcMHirIp3u7DBFmw+Ms2mY8c63OuKpeMPipGGd8="
},
"discover": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/discover-6.4.5.tar.xz",
"hash": "sha256-kgjU43rSrkzR2nzTsB7eYQcaE4mOxMFO3/6YO5cvhXY="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/discover-6.5.0.tar.xz",
"hash": "sha256-k+Q7823cRxPLTsxtDwCkT9rmQmp9pScPcmRX5joPKD0="
},
"drkonqi": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/drkonqi-6.4.5.tar.xz",
"hash": "sha256-63ydNHXvQpiiotmKivIysvtw7kqnHE9R3RYVMXC7E7I="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/drkonqi-6.5.0.tar.xz",
"hash": "sha256-MQaismj2cY82kH02+sol8RlFg5oW/2uLdKE81wjvjLE="
},
"flatpak-kcm": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/flatpak-kcm-6.4.5.tar.xz",
"hash": "sha256-PxhYcHEkMFvCMYbzNLuvY8WivC2Jder/EnTUAuYRuLE="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/flatpak-kcm-6.5.0.tar.xz",
"hash": "sha256-0zqrUc9bpv37EvY4vH6LhSW55nMNFO7hRISN4XalGEU="
},
"kactivitymanagerd": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kactivitymanagerd-6.4.5.tar.xz",
"hash": "sha256-3lJRi5Ab7rWKYycxb82jRbNVIwVVbIWhxLETP5q3pCQ="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kactivitymanagerd-6.5.0.tar.xz",
"hash": "sha256-owsjDL3o7SGwtJQjVRXrv+7JFvf+TxW7uSdUaEZ4Ppg="
},
"kde-cli-tools": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kde-cli-tools-6.4.5.tar.xz",
"hash": "sha256-PMMnRw79Y85nmPMQACNGdNaUmHLIVxwHLcsjlWoneyY="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kde-cli-tools-6.5.0.tar.xz",
"hash": "sha256-3qIPn6Ni5ZBog7X4yZnuplGQYPEka9LyFJLYX17+QS0="
},
"kde-gtk-config": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kde-gtk-config-6.4.5.tar.xz",
"hash": "sha256-96gcHv1Tm2CMxkCpmf2xhLu4PPyWANQH0aTzMsOIDsI="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kde-gtk-config-6.5.0.tar.xz",
"hash": "sha256-7fdYusB3N9/l394LeXuGRqhmnINp8PnUoroaAv5GLg4="
},
"kdecoration": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kdecoration-6.4.5.tar.xz",
"hash": "sha256-+dPsQlbPcSWjsLwIx3N69xUjXVwitpuil5e7BsXvSkw="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kdecoration-6.5.0.tar.xz",
"hash": "sha256-+a4ZT+UfpkbSyGU++tU2KgrZJT48KLcOjkKpwDKLnBs="
},
"kdeplasma-addons": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kdeplasma-addons-6.4.5.tar.xz",
"hash": "sha256-S9vcKJK79iEcO+bAIXf3/9zhCrFUbYEaS1kCQZK3e84="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kdeplasma-addons-6.5.0.tar.xz",
"hash": "sha256-zApdSDB9URDAE8CLLsOCqrqfZsNwyOSrRuxxq2aTuQs="
},
"kgamma": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kgamma-6.4.5.tar.xz",
"hash": "sha256-mW69YL9QgkjtwpPZ7J2kybg4s/sbzNgqTbMFnvJ6uxY="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kgamma-6.5.0.tar.xz",
"hash": "sha256-woA1Ln611Ot95e3uNtv6I1plpbtetNk9rxblD1TaC/M="
},
"kglobalacceld": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kglobalacceld-6.4.5.tar.xz",
"hash": "sha256-pxLR96hpYCkv62l5/iyS8ufVz7zRB/Tv45eeGkwyzXM="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kglobalacceld-6.5.0.tar.xz",
"hash": "sha256-XcstQngVKSCOy/TS6yMfmuwp79EsLSTsn4ppBKxvddU="
},
"kinfocenter": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kinfocenter-6.4.5.tar.xz",
"hash": "sha256-bCeofeJPbF6dvYDNemGLVMHSiRRmWBz8CZoCP9BxZgs="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kinfocenter-6.5.0.tar.xz",
"hash": "sha256-3Dy9o60aZax+vbAvaTer1UZ9M9STjWDDO1tIeP442Ds="
},
"kmenuedit": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kmenuedit-6.4.5.tar.xz",
"hash": "sha256-YQ8HzTomwWGOKnwxzpARsos68N9dpl6wEAp+jwjIlC8="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kmenuedit-6.5.0.tar.xz",
"hash": "sha256-WmGVESlpgfw3f/ASnIZYtMS5BDc+/XpjUahqPUxgXjg="
},
"knighttime": {
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/knighttime-6.5.0.tar.xz",
"hash": "sha256-rHrxaKAcoZv8cchJ11hyPdgcHxz+THs8ijYCGtXRuq8="
},
"kpipewire": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kpipewire-6.4.5.tar.xz",
"hash": "sha256-0KcEpqAw7bW09da5nDK8TkbhpqtSff3pCJ4RCUtrGpI="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kpipewire-6.5.0.tar.xz",
"hash": "sha256-BlG46jhi/+PqTwiiRDGrRnJXQCIfBSxDKAMzYr4iC6c="
},
"krdp": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/krdp-6.4.5.tar.xz",
"hash": "sha256-OBwsAl22ti0tcWVVgsTJJyrgTUIlrqX4oDB2Gb+ZCkU="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/krdp-6.5.0.tar.xz",
"hash": "sha256-cQZct0KurdNq4k4pxb8eiDzQhNMPsjlCFcWJJ0AStYs="
},
"kscreen": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kscreen-6.4.5.tar.xz",
"hash": "sha256-uSvegjix5/PWUhzEsbqLumAEemT/8SmyAR3/X/NDEDc="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kscreen-6.5.0.tar.xz",
"hash": "sha256-kesy8PcBFlWqOXK2wjXQaOI6/GugivBKMerJkt5zHZ4="
},
"kscreenlocker": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kscreenlocker-6.4.5.tar.xz",
"hash": "sha256-+sT51T1jy5sG6Q/rgsKPRxlx0V3v1KBoux59KIa3CQ0="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kscreenlocker-6.5.0.tar.xz",
"hash": "sha256-DsR9SjPkfIbgnpsIrnaRXfZa+oDSjIm1Tiv7l60uwys="
},
"ksshaskpass": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/ksshaskpass-6.4.5.tar.xz",
"hash": "sha256-Wy2hGTcHnGGRl1XD1V/5v8W/l+0dvwgLQ8DCr1DjVNo="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/ksshaskpass-6.5.0.tar.xz",
"hash": "sha256-MWm4rL+HHSvGYWVAWNjjzhLRJRP9Id3Y8IrD9gT+2kk="
},
"ksystemstats": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/ksystemstats-6.4.5.tar.xz",
"hash": "sha256-cVsojzmr/ZDKgltPo8OHRenuHLvH9JW6FH1+++BKSdI="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/ksystemstats-6.5.0.tar.xz",
"hash": "sha256-wNbYkC8aRQfclV0owhvQhHJQwb+kofAwre5gskljYOo="
},
"kwallet-pam": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kwallet-pam-6.4.5.tar.xz",
"hash": "sha256-j/vxzELemqMq/JncxdwEgvGWcUVBbwVEmx5ye1WxNz4="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kwallet-pam-6.5.0.tar.xz",
"hash": "sha256-M2OXxp7XwhtK0plDQyTHGrBP+J5kagdeeTmal62/3sw="
},
"kwayland": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kwayland-6.4.5.tar.xz",
"hash": "sha256-C4ddnnzFusTZfTRD/0MRUz4Nja1AGvEkTUdYpfpUKPM="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kwayland-6.5.0.tar.xz",
"hash": "sha256-YLfslWNtnsTRbYC8IWEcLD1SVRStCiPwM6IGpTxLJ8E="
},
"kwayland-integration": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kwayland-integration-6.4.5.tar.xz",
"hash": "sha256-/SvWMFN2O703DJ5XggWDMK1zoUJBt6bj4bjSQwPe1QM="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kwayland-integration-6.5.0.tar.xz",
"hash": "sha256-wq2mdIbNFNW2Mr8g/j9vC5q/aRk+bQIOlZXdtvQwNbo="
},
"kwin": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kwin-6.4.5.tar.xz",
"hash": "sha256-3s8ct5EnwoXH7ado5/9Pl8cvMUc1yCaFdY8LlWrBUfc="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kwin-6.5.0.tar.xz",
"hash": "sha256-4OqmeYAmb+J/4y0VyfGPggZ3aRn4HU4aiJ00xfZc+YI="
},
"kwin-x11": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kwin-x11-6.4.5.tar.xz",
"hash": "sha256-zqkYeUZ6/fosrw7G3XJW6ueN76lwzcmpR/79hdQXrLE="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kwin-x11-6.5.0.tar.xz",
"hash": "sha256-p52Pe0YQtI8dj1EylCKyiC7U2q3zjlyQQtJbFZQXZRM="
},
"kwrited": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/kwrited-6.4.5.tar.xz",
"hash": "sha256-Q0uDsRWkgPVCyX1RnCfy613U0zPPvdoo7ZlIE4kqANE="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/kwrited-6.5.0.tar.xz",
"hash": "sha256-IPMgzjtDD2RSppFqQpKQs8xFHZoroGrgh8PP0ZPWMes="
},
"layer-shell-qt": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/layer-shell-qt-6.4.5.tar.xz",
"hash": "sha256-72uq4iEU8DiviQKfPwB17inDuR/UkQCCjEw6MuFJbpU="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/layer-shell-qt-6.5.0.tar.xz",
"hash": "sha256-cg8ZPxGaR+44mktSs23cr+yk6SV/O33LVq4GI52xovc="
},
"libkscreen": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/libkscreen-6.4.5.tar.xz",
"hash": "sha256-aNJuJ2VrRQ8Vp49EeExQoiA05XwU+WpAIBnVK8Wz4rQ="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/libkscreen-6.5.0.tar.xz",
"hash": "sha256-nEJXf6qbuqSBl4KEcJr93DEPUqzJe2YTujxs7pFhzCw="
},
"libksysguard": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/libksysguard-6.4.5.tar.xz",
"hash": "sha256-x8+M0vCh5RkgHcYoifETWWeoUPkywlL9Juo9iMZWSg8="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/libksysguard-6.5.0.tar.xz",
"hash": "sha256-LxyTJGzbBXhlG3CNAP4rbAxkEfSh8shGTlrqyBaXHIU="
},
"libplasma": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/libplasma-6.4.5.tar.xz",
"hash": "sha256-lFtsVM/sVggPa1WGToKncCCW1oK+zx/Ul513pACcQSQ="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/libplasma-6.5.0.tar.xz",
"hash": "sha256-vJ+BSURzEpfhfZPQjxOQUGxdmtVfWoR+CuUHloN7bOg="
},
"milou": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/milou-6.4.5.tar.xz",
"hash": "sha256-Dq7sigWvw6lvag7vyaBF9JrOi+IBvI9X4e2BM82qEA0="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/milou-6.5.0.tar.xz",
"hash": "sha256-zuWqoW96kV0YdrL5GvDNchGmGNJwjle2frTfrs6ngR8="
},
"ocean-sound-theme": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/ocean-sound-theme-6.4.5.tar.xz",
"hash": "sha256-X140kY7Gn0TBAh2lJg4aXWVkNkYMn+AaXUiEkTAW+iU="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/ocean-sound-theme-6.5.0.tar.xz",
"hash": "sha256-yRLlOTCCZELphComNnnxkguaPcO2PZsCIJ/Pt2nXWg4="
},
"oxygen": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/oxygen-6.4.5.tar.xz",
"hash": "sha256-nBijOiJWC9xQS9HN1t054JGDjGC1R6zsAMUb2KEz62M="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/oxygen-6.5.0.tar.xz",
"hash": "sha256-rQGEkahM32n7uiCXUiYRBql+G6oCqp21HXaysSC2GKM="
},
"oxygen-sounds": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/oxygen-sounds-6.4.5.tar.xz",
"hash": "sha256-HQ+p+HIgXsjSvv5bwCnIsaDQ5UyLOhkHZTItiXeFIis="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/oxygen-sounds-6.5.0.tar.xz",
"hash": "sha256-XBJk1xNXsu0OJthXDnly9ZZcEjkROTqn5LTnDvgowm8="
},
"plasma-activities": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-activities-6.4.5.tar.xz",
"hash": "sha256-MK0jhG6Xvzwu1tOvJd4K4dmB6ocWCEkvzBYVXv0MgWk="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-activities-6.5.0.tar.xz",
"hash": "sha256-DbhyvFaqhNIv5lsZxbNkzBT0SkBAHqqvv42iegS4iD8="
},
"plasma-activities-stats": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-activities-stats-6.4.5.tar.xz",
"hash": "sha256-NcZPckwFUPmWd/YTSEnez3a+R5cSEMqUGFguo4tIDDA="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-activities-stats-6.5.0.tar.xz",
"hash": "sha256-YdcjGKwdTN7WFS8Jfuj0SzsyYXkaaELcrYZo59Bj9RU="
},
"plasma-browser-integration": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-browser-integration-6.4.5.tar.xz",
"hash": "sha256-rZL07B4x2f3Fe1F73C5awQfGLAIJCtN1Ke7N7myvnYs="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-browser-integration-6.5.0.tar.xz",
"hash": "sha256-HwFDyglLrMMPtphYVOnI+9ktFJU7O7MSGTIrozFwnf8="
},
"plasma-desktop": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-desktop-6.4.5.tar.xz",
"hash": "sha256-dVLkx8fMv1t3VnJruaqr00RjCXeq8T9fMFtEd8qhe7c="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-desktop-6.5.0.tar.xz",
"hash": "sha256-wn3CwSeVSDp3ohvMcAKbmDRHTtQj3NuT3A6IV9Te3kI="
},
"plasma-dialer": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-dialer-6.4.5.tar.xz",
"hash": "sha256-o5sUqDi+BNZeVOuD31hAPhj8EVBjeTXTdGZX4nyY/qg="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-dialer-6.5.0.tar.xz",
"hash": "sha256-dTUxwFguIe6cJURMOn1gahNZ7MKKn2Ds/jCPS26d6Mg="
},
"plasma-disks": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-disks-6.4.5.tar.xz",
"hash": "sha256-gBfHSfvIUKE9EdWzU0P4UZStQnagHMBTEd1pgo9R/vM="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-disks-6.5.0.tar.xz",
"hash": "sha256-6KThaCHyXGzC74JYcVQHfdfZi3Upiqh/6KxpXmo8+Po="
},
"plasma-firewall": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-firewall-6.4.5.tar.xz",
"hash": "sha256-hcjyic4DkNVgyZ/Z9KXFC8n6tvfQQ/WqMQuFIpsdg0w="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-firewall-6.5.0.tar.xz",
"hash": "sha256-7fZeXA4jfFkyiZMxYx3XK6LZtp6cl/906P/AUEuQ9cs="
},
"plasma-integration": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-integration-6.4.5.tar.xz",
"hash": "sha256-w+Jx3h+ibIgzRAtpzKxejAlKheR0K/Jvl7y3yqjBeyw="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-integration-6.5.0.tar.xz",
"hash": "sha256-AqfgvOVrqpPG9xNrljC5ulEJ19Kcb2wRDMcWEL3SDg4="
},
"plasma-mobile": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-mobile-6.4.5.tar.xz",
"hash": "sha256-pzz42tiaKEPfQS85X6HcaU4AHM4tZxrsJufoIXT7i+U="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-mobile-6.5.0.tar.xz",
"hash": "sha256-Ib9k7bv5RGJuBX3CLpIugWxbVVIuh57rnLYQ/UhYNQU="
},
"plasma-nano": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-nano-6.4.5.tar.xz",
"hash": "sha256-xPMVP0/ao++XwXX+qW6RRyjqNr8ron5ojZkMCA+2wmE="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-nano-6.5.0.tar.xz",
"hash": "sha256-GhFhF6XAaAwycZU6UMmKsN4y9qfwM9i1Zov+WtMr0RY="
},
"plasma-nm": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-nm-6.4.5.tar.xz",
"hash": "sha256-Sn0ilmiOlZfu3kRN5v5lSBMe1pE2puHEqt76D0oBXRY="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-nm-6.5.0.tar.xz",
"hash": "sha256-ZIpHqoghXPIbtsbHnwwgvcqsn5/8VAKiPDQbpAApQZU="
},
"plasma-pa": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-pa-6.4.5.tar.xz",
"hash": "sha256-FMK6z/DwHAtSjXtxtQYsaLKXK7QVtcJzh901zuREGxo="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-pa-6.5.0.tar.xz",
"hash": "sha256-JNdY8tVUhoSluNT+igowS7z23gLkijfLGji6eaQoJYw="
},
"plasma-sdk": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-sdk-6.4.5.tar.xz",
"hash": "sha256-VjLavtw/dRBtFdPW+lBmpb6drPh6IkxH+v6CrBHP278="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-sdk-6.5.0.tar.xz",
"hash": "sha256-vCRMPWMXNepo7uQlrcfWCwnxcSi6ZT986jAxNGBr24E="
},
"plasma-systemmonitor": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-systemmonitor-6.4.5.tar.xz",
"hash": "sha256-MXtlI0eq6PmNSWF4GSv93FEn3mariLUa1yyK8flqTD0="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-systemmonitor-6.5.0.tar.xz",
"hash": "sha256-AFXX6Cs+4VcYf7DHl/KGfD2mLVZJDJ02/VdvAmuTRbQ="
},
"plasma-thunderbolt": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-thunderbolt-6.4.5.tar.xz",
"hash": "sha256-fB0EOVuEo2h8Q9lASlfaidZNahNmcQe7wkOmHZ8GXzU="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-thunderbolt-6.5.0.tar.xz",
"hash": "sha256-1kXh2Tri9kHO1u5fds/6vgTHqj6i3xjbiFyoyTTHIyI="
},
"plasma-vault": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-vault-6.4.5.tar.xz",
"hash": "sha256-OlEFvplfCSMUUDiGfqb8/kWoLpU37vWoVkPbJP/vcPU="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-vault-6.5.0.tar.xz",
"hash": "sha256-umka8KaosOmZYH2UJOu6TVDKQwSgcTA3ypwhf9OrSJQ="
},
"plasma-welcome": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-welcome-6.4.5.tar.xz",
"hash": "sha256-V867V7XVKCY6nZBtsljjaNzNhCUa6SRKwHviC1n+1gk="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-welcome-6.5.0.tar.xz",
"hash": "sha256-TcElW4McRGt+izc1RR/M+j34DCsoJdhQa7NWkM/LhbY="
},
"plasma-workspace": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-workspace-6.4.5.tar.xz",
"hash": "sha256-GZmevzV09TkUW6cHQBm4jVHyypUtEhOU2vavLmMpEPs="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-workspace-6.5.0.tar.xz",
"hash": "sha256-ZJHq+/q8UzXFx6e21ohKEfkQdVh7SRJAHP/oMJZvLyA="
},
"plasma-workspace-wallpapers": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma-workspace-wallpapers-6.4.5.tar.xz",
"hash": "sha256-tDs9MXcS0MTruegAFiRON4LlsHlXV21qAwSQegfAj78="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma-workspace-wallpapers-6.5.0.tar.xz",
"hash": "sha256-MsHBoBVYlfTbU0M/pJKBH0VFth0jfHez0FzYP7b0yX0="
},
"plasma5support": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plasma5support-6.4.5.tar.xz",
"hash": "sha256-rP37yC+OOve9NdUUsePLtdq6jae6eQzsto+SWg9N+UI="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plasma5support-6.5.0.tar.xz",
"hash": "sha256-lyp3VujiH0mkJHnU4PW+tkT4/64V2lI3dk0k28UJ49o="
},
"plymouth-kcm": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/plymouth-kcm-6.4.5.tar.xz",
"hash": "sha256-K1fR9OJddp7ycA4427pV/np4xuyhP+6SWHWxoo4R5Hs="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/plymouth-kcm-6.5.0.tar.xz",
"hash": "sha256-Q2bI4WelqoBhc1wNK+VoNgLxJTMQEBvtc0bLPdMTyUk="
},
"polkit-kde-agent-1": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/polkit-kde-agent-1-6.4.5.tar.xz",
"hash": "sha256-W113FmD1IJKVplr9yz4RfBzJzXwYk9DJtorQxTEwgwE="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/polkit-kde-agent-1-6.5.0.tar.xz",
"hash": "sha256-pLJ7seqVF1jRG3jAhTyB73EigBqkGkSIQk2qWiCM5rE="
},
"powerdevil": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/powerdevil-6.4.5.tar.xz",
"hash": "sha256-qo6cbzO4rtTtrpycQ4MJZu1O7C+0N88hAjFQvfvYLkg="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/powerdevil-6.5.0.tar.xz",
"hash": "sha256-9+fb6mSvwVxd4YEA4zkr3eXM3HNfb1FpcyCBWZMfwYc="
},
"print-manager": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/print-manager-6.4.5.tar.xz",
"hash": "sha256-4jj9ApLRCsi1xRS9LOC5GNXVsZZsZpUyhb62bhOiQso="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/print-manager-6.5.0.tar.xz",
"hash": "sha256-D3R2h6DRWewhVkXY96g0RlDxojwmbEuysN7zH9G8O88="
},
"qqc2-breeze-style": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/qqc2-breeze-style-6.4.5.tar.xz",
"hash": "sha256-3zV16UPdGEbAeOSnDkV7CHeCDlqpn/XyeEMw8MlwN/8="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/qqc2-breeze-style-6.5.0.tar.xz",
"hash": "sha256-Zx3ipLD8F8qCIvkRuK3mxM7X/nb9n2BcIUyx5X72Jtk="
},
"sddm-kcm": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/sddm-kcm-6.4.5.tar.xz",
"hash": "sha256-BFI/OCv86SWcRzxX2kRyvk+vkvmLbtQKskq2Y6M3ya0="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/sddm-kcm-6.5.0.tar.xz",
"hash": "sha256-cfMwxsiQp7LAcYiqnHd8arZvTLHbq4lP0hKkiR6fRSg="
},
"spacebar": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/spacebar-6.4.5.tar.xz",
"hash": "sha256-y9Kj7g9wXxP4tC3HcA+5K++4jQT37jZ57qJNwWxPieA="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/spacebar-6.5.0.tar.xz",
"hash": "sha256-nUU0uHx+lrDB/VSmg21fnKsexoGbmwriysrutBQpdNg="
},
"spectacle": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/spectacle-6.4.5.tar.xz",
"hash": "sha256-QqVvBZPAxce2YQiO9ubjKg6iSDVPu/20og86IbpVQOc="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/spectacle-6.5.0.tar.xz",
"hash": "sha256-4UZXxvHyU4o3lvkVv9K4IV9GfLNqQrwtrYhsqevw3PE="
},
"systemsettings": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/systemsettings-6.4.5.tar.xz",
"hash": "sha256-kNfwl/GnekAAdiJM26RblMcdD+xD79Ltc3BH8v8quo8="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/systemsettings-6.5.0.tar.xz",
"hash": "sha256-u2XQzDPoqguIupyTAKHnGwDi4LoCiMQcFAG0q+g9JZw="
},
"wacomtablet": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/wacomtablet-6.4.5.tar.xz",
"hash": "sha256-4MdcwKW9KTQfcFzFA/eP3Ul2yxWolBvrt3RIs2iCZyg="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/wacomtablet-6.5.0.tar.xz",
"hash": "sha256-jqzMQN1kSaWJCOkJsq7cuJ1vuiVC7F+kbttrJpGYJBc="
},
"xdg-desktop-portal-kde": {
"version": "6.4.5",
"url": "mirror://kde/stable/plasma/6.4.5/xdg-desktop-portal-kde-6.4.5.tar.xz",
"hash": "sha256-n+BPBIK78yYIg2nANde29APbDAaupZNEQqd4h5ntzuI="
"version": "6.5.0",
"url": "mirror://kde/stable/plasma/6.5.0/xdg-desktop-portal-kde-6.5.0.tar.xz",
"hash": "sha256-9aRIU7Lm0IWKhigDiu6L/22EsewlsE7nqWHXPpYmGbc="
}
}
+1
View File
@@ -18,6 +18,7 @@
kglobalacceld = callPackage ./kglobalacceld { };
kinfocenter = callPackage ./kinfocenter { };
kmenuedit = callPackage ./kmenuedit { };
knighttime = callPackage ./knighttime { };
kpipewire = callPackage ./kpipewire { };
krdp = callPackage ./krdp { };
kscreen = callPackage ./kscreen { };
+9
View File
@@ -0,0 +1,9 @@
{
mkKdeDerivation,
qtpositioning,
}:
mkKdeDerivation {
pname = "knighttime";
extraBuildInputs = [ qtpositioning ];
}
+3
View File
@@ -3,6 +3,7 @@
mkKdeDerivation,
replaceVars,
openssl,
pam,
pkg-config,
qtwayland,
freerdp,
@@ -19,6 +20,8 @@ mkKdeDerivation {
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [
qtwayland
freerdp
pam
];
}
@@ -1,13 +1,13 @@
diff --git a/src/kcm/kcmkrdpserver.cpp b/src/kcm/kcmkrdpserver.cpp
index 3af527c..3433a84 100644
index 2d2c5e8..289c6f1 100644
--- a/src/kcm/kcmkrdpserver.cpp
+++ b/src/kcm/kcmkrdpserver.cpp
@@ -218,7 +218,7 @@ void KRDPServerConfig::generateCertificate()
QString certificateKeyPath(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/krdpserver/krdp.key"));
@@ -293,7 +293,7 @@ void KRDPServerConfig::generateCertificate()
QString certificateKeyPath(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + u"/krdpserver/krdp.key"_s);
qDebug(KRDPKCM) << "Generating certificate files to: " << certificatePath << " and " << certificateKeyPath;
QProcess sslProcess;
- sslProcess.start(u"openssl"_qs,
+ sslProcess.start(u"@openssl@"_qs,
- sslProcess.start(u"openssl"_s,
+ sslProcess.start(u"@openssl@"_s,
{
u"req"_qs,
u"-nodes"_qs,
u"req"_s,
u"-nodes"_s,
@@ -1,25 +1,13 @@
From 63571e28c65935f32567c0b179a096d62726b778 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 2 Nov 2021 06:00:32 -0500
Subject: [PATCH 3/3] fusermount path
---
kded/engine/fusebackend_p.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
index 91f3523..1c19d88 100644
index 714b660..cb384fc 100644
--- a/kded/engine/fusebackend_p.cpp
+++ b/kded/engine/fusebackend_p.cpp
@@ -86,7 +86,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg
@@ -90,7 +90,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg
QProcess *FuseBackend::fusermount(const QStringList &arguments) const
{
- return process("fusermount", arguments, {});
- return process(fusermountExecutable, arguments, {});
+ return process(NIXPKGS_FUSERMOUNT, arguments, {});
}
FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload)
--
2.33.1
+1 -1
View File
@@ -21,7 +21,7 @@ mkKdeDerivation {
''-DNIXPKGS_ENCFS=\"${lib.getBin encfs}/bin/encfs\"''
''-DNIXPKGS_ENCFSCTL=\"${lib.getBin encfs}/bin/encfsctl\"''
''-DNIXPKGS_CRYFS=\"${lib.getBin cryfs}/bin/cryfs\"''
''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount\"''
''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount3\"''
''-DNIXPKGS_GOCRYPTFS=\"${lib.getBin gocryptfs}/bin/gocryptfs\"''
];
@@ -2,7 +2,6 @@
lib,
mkKdeDerivation,
replaceVars,
dbus,
fontconfig,
xorg,
lsof,
@@ -24,7 +23,6 @@ mkKdeDerivation {
patches = [
(replaceVars ./dependency-paths.patch {
dbusSend = lib.getExe' dbus "dbus-send";
fcMatch = lib.getExe' fontconfig "fc-match";
lsof = lib.getExe lsof;
qdbus = lib.getExe' qttools "qdbus";
@@ -1,8 +1,8 @@
diff --git a/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp
index ba214a555d..421d940738 100644
--- a/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp
+++ b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp
@@ -155,7 +155,7 @@ void DeviceErrorMonitor::queryBlockingApps(const QString &devicePath)
diff --git a/applets/devicenotifier/devicemessagemonitor_p.cpp b/applets/devicenotifier/devicemessagemonitor_p.cpp
index 173fec78c1..0519424f71 100644
--- a/applets/devicenotifier/devicemessagemonitor_p.cpp
+++ b/applets/devicenotifier/devicemessagemonitor_p.cpp
@@ -118,7 +118,7 @@ void DeviceMessageMonitor::queryBlockingApps(const QString &devicePath)
Q_EMIT blockingAppsReady(blockApps);
p->deleteLater();
});
@@ -25,7 +25,7 @@ index e27e21a7bd..abbf7f32e1 100644
p.write(input);
p.closeWriteChannel();
diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
index 96417c440a..8c9bc2e9ab 100644
index da28f13837..4af78b7850 100644
--- a/kcms/fonts/fonts.cpp
+++ b/kcms/fonts/fonts.cpp
@@ -137,7 +137,7 @@ void KFonts::save()
@@ -51,7 +51,7 @@ index e4d1ad4311..d45bdfad98 100644
void CFcQuery::procExited()
diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
index f3c9956921..09c818739d 100644
index 53f77d0a18..680e81b6e4 100644
--- a/kcms/krdb/krdb.cpp
+++ b/kcms/krdb/krdb.cpp
@@ -425,7 +425,7 @@ void runRdb(unsigned int flags)
@@ -107,7 +107,7 @@ index 7218628ce9..9126475ea4 100644
+ExecStart=@qdbus@ org.kde.kcminit /kcminit org.kde.KCMInit.runPhase1
Slice=session.slice
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
index 4d31c6f408..17418b1ff7 100644
index b8474dd34f..7d0616e116 100644
--- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp
@@ -57,7 +57,7 @@ void sigtermHandler(int signalNumber)
@@ -119,7 +119,7 @@ index 4d31c6f408..17418b1ff7 100644
}
QStringList allServices(const QLatin1String &prefix)
@@ -512,7 +512,7 @@ QProcess *setupKSplash()
@@ -508,7 +508,7 @@ QProcess *setupKSplash()
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
p = new QProcess;
p->setProcessChannelMode(QProcess::ForwardedChannels);
@@ -128,14 +128,3 @@ index 4d31c6f408..17418b1ff7 100644
}
}
return p;
diff --git a/startkde/systemd/plasma-ksplash-ready.service.in b/startkde/systemd/plasma-ksplash-ready.service.in
index 1e903130a9..0861c3d136 100644
--- a/startkde/systemd/plasma-ksplash-ready.service.in
+++ b/startkde/systemd/plasma-ksplash-ready.service.in
@@ -6,5 +6,5 @@ PartOf=graphical-session.target
[Service]
Type=oneshot
-ExecStart=dbus-send --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready
+ExecStart=@dbusSend@ --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready
Slice=session.slice
@@ -2,7 +2,6 @@
mkKdeDerivation,
qtdeclarative,
kirigami,
knotifications,
}:
mkKdeDerivation {
pname = "polkit-kde-agent-1";
@@ -10,6 +9,5 @@ mkKdeDerivation {
extraBuildInputs = [
qtdeclarative
kirigami
knotifications
];
}
+7 -1
View File
@@ -1,5 +1,11 @@
{ mkKdeDerivation }:
{
mkKdeDerivation,
kauth,
}:
mkKdeDerivation {
pname = "systemsettings";
extraBuildInputs = [ kauth ];
meta.mainProgram = "systemsettings";
}
@@ -4,6 +4,7 @@
fetchFromGitHub,
cmake,
extra-cmake-modules,
kcmutils,
kcoreaddons,
kdeclarative,
kdecoration,
@@ -23,12 +24,16 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true;
# kdecoration headers include C++20 spaceship operator
env.NIX_CFLAGS_COMPILE = "-std=c++20";
nativeBuildInputs = [
cmake
extra-cmake-modules
];
buildInputs = [
kcmutils
kcoreaddons
kdeclarative
kdecoration
+4 -35
View File
@@ -1,41 +1,10 @@
{
lib,
callPackage,
fetchFromGitHub,
}:
let
scx-common = rec {
versionInfo = lib.importJSON ./version.json;
inherit (versionInfo.scx) version;
src = fetchFromGitHub {
owner = "sched-ext";
repo = "scx";
tag = "v${versionInfo.scx.version}";
inherit (versionInfo.scx) hash;
};
meta = {
homepage = "https://github.com/sched-ext/scx";
changelog = "https://github.com/sched-ext/scx/releases/tag/v${versionInfo.scx.version}";
license = lib.licenses.gpl2Only;
platforms = lib.platforms.linux;
badPlatforms = [ "aarch64-linux" ];
maintainers = with lib.maintainers; [
johnrtitor
Gliczy
];
};
};
schedulers = lib.mergeAttrsList [
{ cscheds = import ./scx_cscheds.nix; }
{ rustscheds = import ./scx_rustscheds.nix; }
{ full = import ./scx_full.nix; }
];
in
(lib.mapAttrs (name: scheduler: callPackage scheduler { inherit scx-common; }) schedulers)
// {
inherit scx-common;
lib.mapAttrs (name: scheduler: callPackage scheduler { }) {
cscheds = import ./scx_cscheds.nix;
rustscheds = import ./scx_rustscheds.nix;
full = import ./scx_full.nix;
}
+18 -79
View File
@@ -1,76 +1,30 @@
{
lib,
llvmPackages,
fetchFromGitHub,
writeShellScript,
bash,
meson,
ninja,
jq,
libbpf,
pkg-config,
bpftools,
elfutils,
zlib,
zstd,
scx-common,
protobuf,
scx,
libseccomp,
}:
llvmPackages.stdenv.mkDerivation (finalAttrs: {
llvmPackages.stdenv.mkDerivation {
pname = "scx_cscheds";
inherit (scx-common) version src;
# scx needs specific commits of bpftool and libbpf
# can be found in meson.build of scx src
# grep 'bpftool_commit =' ./meson.build
bpftools_src = fetchFromGitHub {
owner = "libbpf";
repo = "bpftool";
inherit (scx-common.versionInfo.bpftool) rev hash;
fetchSubmodules = true;
};
# grep 'libbpf_commit = ' ./meson.build
libbpf_src = fetchFromGitHub {
owner = "libbpf";
repo = "libbpf";
inherit (scx-common.versionInfo.libbpf) rev hash;
fetchSubmodules = true;
};
# this imitates the fetch_bpftool and fetch_libbpf script in src/meson-scripts
fetchBpftool = writeShellScript "fetch_bpftool" ''
[ "$2" == '${finalAttrs.bpftools_src.rev}' ] || exit 1
cd "$1"
cp --no-preserve=mode,owner -r "${finalAttrs.bpftools_src}/" ./bpftool
'';
fetchLibbpf = writeShellScript "fetch_libbpf" ''
[ "$2" == '${finalAttrs.libbpf_src.rev}' ] || exit 1
cd "$1"
cp --no-preserve=mode,owner -r "${finalAttrs.libbpf_src}/" ./libbpf
mkdir -p ./libbpf/src/usr/include
'';
inherit (scx.rustscheds) version src;
postPatch = ''
rm meson-scripts/fetch_bpftool meson-scripts/fetch_libbpf
patchShebangs ./meson-scripts
cp ${finalAttrs.fetchBpftool} meson-scripts/fetch_bpftool
cp ${finalAttrs.fetchLibbpf} meson-scripts/fetch_libbpf
substituteInPlace ./meson-scripts/build_bpftool \
--replace-fail '/bin/bash' '${lib.getExe bash}'
substituteInPlace ./scheds/c/Makefile \
--replace-fail '/usr/local' '${placeholder "out"}'
'';
nativeBuildInputs = [
meson
ninja
jq
pkg-config
zstd
protobuf
llvmPackages.libllvm
]
++ bpftools.buildInputs
++ bpftools.nativeBuildInputs;
bpftools
libbpf
];
buildInputs = [
elfutils
@@ -78,37 +32,21 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
libseccomp
];
mesonFlags = [
(lib.mapAttrsToList lib.mesonEnable {
# systemd unit is implemented in the nixos module
# upstream systemd files are a hassle to patch
"systemd" = false;
# not for nix
"openrc" = false;
})
(lib.mapAttrsToList lib.mesonBool {
# needed libs are already fetched as FOD
"offline" = true;
# rust based schedulers are built separately
"enable_rust" = false;
})
# Clang to use when compiling .bpf.c
(lib.mesonOption "bpf_clang" (lib.getExe llvmPackages.clang))
makeFlags = [
"PREFIX=${placeholder "out"}"
];
hardeningDisable = [
"stackprotector"
"zerocallusedregs"
];
outputs = [
"bin"
"out"
];
doCheck = true;
meta = scx-common.meta // {
passthru = {
inherit (scx.rustscheds.passthru) tests;
};
meta = scx.rustscheds.meta // {
description = "Sched-ext C userspace schedulers";
longDescription = ''
This includes C based schedulers such as scx_central, scx_flatcg,
@@ -119,5 +57,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
It is recommended to use the latest kernel for the best compatibility.
:::
'';
homepage = "https://github.com/sched-ext/scx/tree/main/scheds/c";
};
})
}
+2 -8
View File
@@ -1,20 +1,13 @@
{
lib,
stdenv,
scx-common,
scx,
nixosTests,
}:
scx.cscheds.overrideAttrs (oldAttrs: {
pname = "scx_full";
postInstall = (oldAttrs.postInstall or "") + ''
cp ${scx.rustscheds}/bin/* ${placeholder "bin"}/bin/
cp ${lib.getBin scx.rustscheds}/bin/* ${placeholder "out"}/bin/
'';
passthru.tests.basic = nixosTests.scx;
passthru.updateScript.command = ./update.sh;
meta = oldAttrs.meta // {
description = "Sched-ext C and Rust userspace schedulers";
longDescription = ''
@@ -27,5 +20,6 @@ scx.cscheds.overrideAttrs (oldAttrs: {
It is recommended to use the latest kernel for the best compatibility.
:::
'';
homepage = "https://github.com/sched-ext/scx";
};
})
+28 -7
View File
@@ -6,15 +6,24 @@
elfutils,
zlib,
zstd,
scx-common,
fetchFromGitHub,
protobuf,
libseccomp,
nix-update-script,
nixosTests,
}:
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "scx_rustscheds";
inherit (scx-common) version src;
version = "1.0.17";
inherit (scx-common.versionInfo.scx) cargoHash;
src = fetchFromGitHub {
owner = "sched-ext";
repo = "scx";
tag = "v${finalAttrs.version}";
hash = "sha256-UhFHT8cSrdjhSqjj4qFzn5UvfPOLPwrBh1ytL2gFhzU=";
};
cargoHash = "sha256-yQM2zx1IzGjegwLK4epsluWl8m5RSP3jB00Lpd8+TLE=";
nativeBuildInputs = [
pkg-config
@@ -39,7 +48,6 @@ rustPlatform.buildRustPackage {
};
hardeningDisable = [
"stackprotector"
"zerocallusedregs"
];
@@ -53,7 +61,10 @@ rustPlatform.buildRustPackage {
"--skip=proc_data::tests::test_thread_operations"
];
meta = scx-common.meta // {
passthru.tests.basic = nixosTests.scx;
passthru.updateScript = nix-update-script { };
meta = {
description = "Sched-ext Rust userspace schedulers";
longDescription = ''
This includes Rust based schedulers such as
@@ -64,5 +75,15 @@ rustPlatform.buildRustPackage {
It is recommended to use the latest kernel for the best compatibility.
:::
'';
homepage = "https://github.com/sched-ext/scx/tree/main/scheds/rust";
changelog = "https://github.com/sched-ext/scx/releases/tag/v${finalAttrs.version}";
license = lib.licenses.gpl2Only;
platforms = lib.platforms.linux;
badPlatforms = [ "aarch64-linux" ];
maintainers = with lib.maintainers; [
johnrtitor
Gliczy
];
};
}
})
-57
View File
@@ -1,57 +0,0 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p coreutils moreutils curl jq nix-prefetch-git cargo gnugrep gawk nix
# shellcheck shell=bash
# You must run it from the root directory of a nixpkgs repo checkout
set -euo pipefail
versionJson="$(realpath "./pkgs/os-specific/linux/scx/version.json")"
nixFolder="$(dirname "$versionJson")"
localVer=$(jq -r .scx.version <$versionJson)
latestVer=$(curl -s https://api.github.com/repos/sched-ext/scx/releases/latest | jq -r .tag_name | sed 's/v//g')
if [ "$localVer" == "$latestVer" ]; then
exit 0
fi
latestHash=$(nix-prefetch-git https://github.com/sched-ext/scx.git --rev refs/tags/v$latestVer --quiet | jq -r .hash)
tmp=$(mktemp -d)
trap 'rm -rf -- "${tmp}"' EXIT
git clone --depth 1 --branch "v$latestVer" https://github.com/sched-ext/scx.git "$tmp/scx"
pushd "$tmp/scx"
bpftoolRev=$(grep 'bpftool_commit =' ./meson.build | awk -F"'" '{print $2}')
bpftoolHash=$(nix-prefetch-git https://github.com/libbpf/bpftool.git --rev $bpftoolRev --fetch-submodules --quiet | jq -r .hash)
libbpfRev=$(grep 'libbpf_commit =' ./meson.build | awk -F"'" '{print $2}')
libbpfHash=$(nix-prefetch-git https://github.com/libbpf/libbpf.git --rev $libbpfRev --fetch-submodules --quiet | jq -r .hash)
jq \
--arg latestVer "$latestVer" --arg latestHash "$latestHash" \
--arg bpftoolRev "$bpftoolRev" --arg bpftoolHash "$bpftoolHash" \
--arg libbpfRev "$libbpfRev" --arg libbpfHash "$libbpfHash" \
".scx.version = \$latestVer | .scx.hash = \$latestHash |\
.bpftool.rev = \$bpftoolRev | .bpftool.hash = \$bpftoolHash |\
.libbpf.rev = \$libbpfRev | .libbpf.hash = \$libbpfHash" \
"$versionJson" | sponge $versionJson
echo "scx: $localVer -> $latestVer"
echo "Updating cargoHash. This may take a while..."
popd
cargoHash=$((nix-build --attr scx.rustscheds 2>&1 || true) | awk '/got/{print $2}')
if [ -z "$cargoHash" ]; then
echo "Failed to get cargoHash, please update it manually"
exit 0
fi
jq \
--arg cargoHash "$cargoHash" \
".scx.cargoHash = \$cargoHash" \
"$versionJson" | sponge $versionJson
-15
View File
@@ -1,15 +0,0 @@
{
"scx": {
"version": "1.0.17",
"hash": "sha256-UhFHT8cSrdjhSqjj4qFzn5UvfPOLPwrBh1ytL2gFhzU=",
"cargoHash": "sha256-yQM2zx1IzGjegwLK4epsluWl8m5RSP3jB00Lpd8+TLE="
},
"bpftool": {
"rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",
"hash": "sha256-ZZly6csVWOmtLmld1fhSDUqyRgZx2gSMGXTaSASGv7c="
},
"libbpf": {
"rev": "b4fa3e39a77fd65574fb5f899486795fc3d89bd9",
"hash": "sha256-wlymVgcLlGCUOC92CkYU6QZZnqx8nidSfhr1pTiS8aM="
}
}
@@ -15,6 +15,7 @@
kitemviews,
kwidgetsaddons,
qtquickcontrols2 ? null,
kcmutils,
kcoreaddons,
kdeclarative,
kirigami ? null,
@@ -78,6 +79,7 @@ stdenv.mkDerivation rec {
kirigami2
]
++ lib.optionals (lib.versions.major qtbase.version == "6") [
kcmutils
libplasma
kirigami
]
+1 -1
View File
@@ -238,7 +238,7 @@ mapAliases {
doctest-ignore-unicode = throw "doctest-ignore-unicode has been removed since it has been unmaintained for 11 years"; # added 2024-05-20
dogpile_cache = dogpile-cache; # added 2021-10-28
dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20
duckduckgo-search = ddgs; # added 2025-10-20
duckduckgo-search = throw "duckduckgo-search was renamed to ddgs, use ddgs instead"; # added 2025-10-20
dugong = throw "dugong is unmaintained since 2022 and has therefore been removed"; # added 2024-12-12
editdistance-s = throw "editdistance-s has been removed since it was added solely for the identity package, which has moved on to ukkonen"; # added 2025-08-04
easyeda2ato = throw "easyeda2ato as been removed in favor of atopile-easyda2kicad"; # added 2025-06-08