gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-nixos

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-04-10 18:19:13 +00:00
committed by GitHub
parent 23c0b3ecee 8d603553a3
commit 895e8ce67f
134 changed files with 2326 additions and 1573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/backport.yml
+1 -1
View File
@@ -72,7 +72,7 @@ jobs:
- name: "Add 'has: port to stable' label"
if: steps.backport.outputs.created_pull_numbers != ''
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
# Not using the app on purpose to avoid triggering another workflow run after adding this label.
script: |
.github/workflows/bot.yml
+1 -1
View File
@@ -74,7 +74,7 @@ jobs:
run: gh api /rate_limit | jq
- name: Run bot
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
github-token: ${{ steps.app-token.outputs.token || github.token }}
retries: 3
.github/workflows/build.yml
+1 -1
View File
@@ -62,7 +62,7 @@ jobs:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
target-as-trusted-at: ${{ inputs.targetSha }}
- uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
- uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
with:
# Sandbox is disabled on MacOS by default.
extra_nix_config: sandbox = true
.github/workflows/check.yml
+2 -2
View File
@@ -52,7 +52,7 @@ jobs:
- name: Check commits
id: check
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
env:
TARGETS_STABLE: ${{ fromJSON(inputs.baseBranch).stable && !contains(fromJSON(inputs.headBranch).type, 'development') }}
with:
@@ -85,7 +85,7 @@ jobs:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
target-as-trusted-at: ${{ inputs.targetSha }}
- uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
- uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
- uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
continue-on-error: true
.github/workflows/comment.yml
+1 -1
View File
@@ -38,7 +38,7 @@ jobs:
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
permission-pull-requests: write
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
github-token: ${{ steps.app-token.outputs.token || github.token }}
retries: 3
.github/workflows/edited.yml
+1 -1
View File
@@ -43,7 +43,7 @@ jobs:
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
permission-pull-requests: write
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
github-token: ${{ steps.app-token.outputs.token }}
script: |
.github/workflows/eval.yml
+8 -8
View File
@@ -61,7 +61,7 @@ jobs:
- name: Find commit that touched ci/pinned.json
id: find-pinned-commit
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
env:
TARGET_SHA: ${{ inputs.targetSha }}
HEAD_SHA: ${{ inputs.headSha }}
@@ -132,7 +132,7 @@ jobs:
core.info(`Found pinned.json commit: ${ciPinBumpCommit}`)
- name: Install Nix
uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
- name: Load supported versions
id: versions
@@ -180,7 +180,7 @@ jobs:
target-as-trusted-at: ${{ inputs.targetSha }}
- name: Install Nix
uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
- uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
continue-on-error: true
@@ -270,7 +270,7 @@ jobs:
merge-multiple: true
- name: Install Nix
uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
- name: Combine all output paths and eval stats
run: |
@@ -307,7 +307,7 @@ jobs:
- name: Add eval summary to commit statuses
if: ${{ github.event_name == 'pull_request_target' }}
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
script: |
const { readFile } = require('node:fs/promises')
@@ -337,7 +337,7 @@ jobs:
})
- name: Request changes if PR is against an inappropriate branch
if: ${{ github.event_name == 'pull_request_target' }}
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
script: |
require('./nixpkgs/trusted/ci/github-script/check-target-branch.js')({
@@ -359,7 +359,7 @@ jobs:
path: versions
- name: Add version comparison table to job summary
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
env:
ARTIFACT_PREFIX: ${{ inputs.artifact-prefix }}
SYSTEMS: ${{ inputs.systems }}
@@ -451,7 +451,7 @@ jobs:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
- name: Install Nix
uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
- name: Ensure flake outputs on all systems still evaluate
run: nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1'
.github/workflows/lint.yml
+4 -4
View File
@@ -35,7 +35,7 @@ jobs:
with:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
- uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
- uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
# TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,
# because the cache would be invalidated on every commit - treefmt checks every file.
@@ -70,7 +70,7 @@ jobs:
with:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
- uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
- uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
- uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
continue-on-error: true
@@ -100,7 +100,7 @@ jobs:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
target-as-trusted-at: ${{ inputs.targetSha }}
- uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
- uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
- uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
continue-on-error: true
@@ -139,7 +139,7 @@ jobs:
persist-credentials: true # Needed to run git fetch for large PRs.
path: trusted
- name: Check commit messages
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
script: |
const checkCommitMessages = require('./trusted/ci/github-script/lint-commits.js')
.github/workflows/merge-group.yml
+2 -2
View File
@@ -32,7 +32,7 @@ jobs:
ci/github-script/supportedSystems.js
- id: prepare
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
env:
MERGED_SHA: ${{ inputs.mergedSha }}
TARGET_SHA: ${{ inputs.targetSha }}
@@ -125,7 +125,7 @@ jobs:
permissions:
statuses: write # creating 'no PR failures' commit status
steps:
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
env:
RESULTS: ${{ toJSON(needs.*.result) }}
with:
.github/workflows/pull-request-target.yml
+2 -2
View File
@@ -37,7 +37,7 @@ jobs:
sparse-checkout: |
ci/github-script
- id: prepare
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
retries: 10
# The default for this includes code 422, which happens regularly for us when comparing commits:
@@ -126,7 +126,7 @@ jobs:
permissions:
statuses: write
steps:
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
env:
RESULTS: ${{ toJSON(needs.*.result) }}
with:
.github/workflows/review.yml
+1 -1
View File
@@ -35,7 +35,7 @@ jobs:
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
permission-pull-requests: write
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
github-token: ${{ steps.app-token.outputs.token || github.token }}
retries: 3
.github/workflows/teams.yml
+1 -1
View File
@@ -41,7 +41,7 @@ jobs:
run: npm install bottleneck@2.19.5
- name: Synchronise teams
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
github-token: ${{ steps.app-token.outputs.token }}
script: |
.github/workflows/test.yml
+2 -2
View File
@@ -26,7 +26,7 @@ jobs:
sparse-checkout: |
ci/github-script
- id: prepare
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
retries: 10
# The default for this includes code 422, which happens regularly for us when comparing commits:
@@ -45,7 +45,7 @@ jobs:
- name: Determine changed files
id: files
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
script: |
const files = (await github.paginate(github.rest.pulls.listFiles, {
doc/release-notes/rl-2605.section.md
+1 -1
View File
@@ -330,4 +330,4 @@ gnuradioMinimal.override {
- The builder `php.buildComposerProject2` for PHP applications has been improved for better reliability and stability.
- The `services.drupal` module has a few improvements aimed at making it better for installing custom Drupal instances, namely a `webRoot` option and a some new settings for managing variable content and filepaths.
- The `services.drupal` module has a few improvements aimed at making it better for installing custom Drupal instances, namely a new `webRoot` option for identifying custom webroots in source code, a new `configRoot` option for identifying and synchronizing config yamls onto NixOS, and a some new settings for managing variable content and filepaths.
maintainers/maintainer-list.nix
+6
View File
@@ -15173,6 +15173,12 @@
name = "leo60228";
keys = [ { fingerprint = "5BE4 98D5 1C24 2CCD C21A 4604 AC6F 4BA0 78E6 7833"; } ];
};
leoflo = {
email = "noreply@leoflo.me";
github = "le0flo";
githubId = 128467278;
name = "Leonardo";
};
leona = {
email = "nix@leona.is";
github = "leona-ya";
nixos/modules/module-list.nix
+1
View File
@@ -1942,6 +1942,7 @@
./system/boot/unl0kr.nix
./system/boot/uvesafb.nix
./system/boot/zram-as-tmp.nix
./system/boot/zswap.nix
./system/etc/etc-activation.nix
./system/service/systemd/system.nix
./system/service/systemd/user.nix
nixos/modules/programs/fish.nix
+1 -1
View File
@@ -48,7 +48,7 @@ let
path: name:
pkgs.runCommandLocal "${name}.fish" {
nativeBuildInputs = [ pkgs.babelfish ];
} "babelfish < ${path} > $out;";
} "exec -a ${lib.getExe pkgs.babelfish} babelfish < ${path} > $out;";
in
{
options = {
nixos/modules/services/networking/netbird.nix
+10 -20
View File
@@ -759,35 +759,25 @@ in
};
environment.NB_SETUP_KEY_FILE = "%d/setup-key";
/*
might want to do something similar to the docker entrypoint (watching log messages) instead
see https://github.com/netbirdio/netbird/blob/dc30dcacce4c322502975f1f491e6774efd7e1e9/client/netbird-entrypoint.sh
*/
script = ''
set -x
# uses a file on a `tmpfs`, because variable updates get lost in the loop
status_file="/tmp/status.txt"
refresh_status() {
'${lib.getExe client.wrapper}' status &>"$status_file" || :
}
print_short_setup_key() {
cut -b1-8 <"$NB_SETUP_KEY_FILE"
get_status() {
'${lib.getExe client.wrapper}' status 2>&1 || :
}
main() {
refresh_status
<"$status_file" sed 's/^/STATUS:PRE-CONNECT : /g'
until refresh_status && <"$status_file" grep --quiet 'Connected\|NeedsLogin' ; do
# grep for `: Connected` as well, as `Connected` appears other
# places even when not connected, and before NeedsLogin
until get_status | grep --quiet ': Connected\|NeedsLogin' ; do
sleep 1
done
<"$status_file" sed 's/^/STATUS:POST-CONNECT: /g'
if <"$status_file" grep --quiet 'NeedsLogin' ; then
echo "Using Setup Key File with key: $(print_short_setup_key)" >&2
'${lib.getExe client.wrapper}' up --setup-key-file="$NB_SETUP_KEY_FILE"
if get_status | grep --quiet 'NeedsLogin' ; then
# setup key is in $NB_SETUP_KEY_FILE, and is
# automatically picked up by the cli
'${lib.getExe client.wrapper}' up
fi
}
nixos/modules/services/web-apps/drupal.nix
+65 -4
View File
@@ -23,10 +23,12 @@ let
mkPackageOption
nameValuePair
optionalAttrs
optionalString
types
;
inherit (lib.strings)
removePrefix
removeSuffix
;
inherit (pkgs)
mariadb
@@ -51,7 +53,13 @@ let
runHook preInstall
mkdir -p $out
rsync -aq * $out/ --exclude=${removePrefix "/" cfg.webRoot}/sites --exclude=sites
EXCLUDES="--exclude=${removePrefix "/" cfg.webRoot}/sites --exclude=sites"
if [ ! -z "${cfg.configRoot}" ]; then
EXCLUDES="$EXCLUDES --exclude=${removePrefix "/" cfg.configRoot}"
fi
rsync -aq * $out/ $EXCLUDES
runHook postInstall
'';
@@ -81,6 +89,26 @@ let
'';
});
configSync =
hostName: cfg:
optionalString (cfg.configRoot != "") (
stdenv.mkDerivation (finalAttrs: {
pname = "drupal-config-${hostName}";
name = "drupal-config-${hostName}";
src = cfg.package;
buildInputs = with pkgs; [ rsync ];
installPhase = ''
runHook preInstall
mkdir -p $out/config
rsync -a ./share/php/${cfg.package.pname}${cfg.configRoot}/* $out/config/
runHook postInstall
'';
})
);
drupalSettings =
hostName: cfg:
pkgs.writeTextFile {
@@ -136,7 +164,10 @@ let
hostName: cfg:
pkgs.writeShellApplication {
name = "drupal-state-init-${hostName}";
excludeShellChecks = [ "SC2194" ];
excludeShellChecks = [
"SC2194"
"SC2157"
];
runtimeInputs = with pkgs; [ rsync ];
text = ''
echo "Updating the sites directory for ${hostName}..."
@@ -144,6 +175,12 @@ let
--exclude "*/files" \
--delete-before
if [ ! -z "${cfg.configRoot}" ]; then
echo "Updating config sync directory for ${hostName}..."
rsync -auq "${configSync hostName cfg}/config/" "${removeSuffix "/sync" cfg.configSyncDir}" \
--delete-before
fi
if [ ! -d "${cfg.filesDir}" ]; then
echo "Preparing files directory..."
mkdir -p "${cfg.filesDir}"
@@ -221,6 +258,10 @@ let
The location of the user-managed Drupal config sync directory.
Drupal will both read from and write to this directory when executing
configuration management operations.
This option differs from the `configRoot` option,
which this service uses to discover
the location of the config sync directory in the package's source code.
'';
};
@@ -229,12 +270,32 @@ let
default = "";
description = ''
An optional path string with a leading slash
indicating the location of the Drupal webroot relative to the
project root directory, if one exists.
indicating the location of the Drupal webroot
in your package's source code.
The path relative to the project root directory.
'';
example = "/web";
};
configRoot = mkOption {
type = types.str;
default = "";
description = ''
An optional path string with a leading slash
indicating the location of the config sync directory on
the Drupal package. Your package will probably have a config sync
directory if it has been significantly customized.
The path must be relative to the project root directory.
This option differs from the `configSyncDir` option, which
tells this service where to create a user-writeable config directory
on NixOS.
'';
example = "/config";
};
extraConfig = mkOption {
type = types.lines;
default = "";
nixos/modules/system/boot/zswap.nix
+182
View File
@@ -0,0 +1,182 @@
# Zswap - Compressed Cache for Swap Pages
#
# Reference documentation:
# - https://docs.kernel.org/admin-guide/mm/zswap.html
# - https://www.kernel.org/doc/html/v6.1/admin-guide/mm/zswap.html
#
# IMPORTANT: When modifying this file, ensure that boot.kernel.sysfs configuration
# remains consistent with kernel parameters configuration. The sysfs settings provide
# runtime management while kernel parameters ensure early-boot availability.
{ config, lib, ... }:
with lib;
let
cfg = config.boot.zswap;
# Get the current configured kernel version string
kernelVersion = config.boot.kernelPackages.kernel.version;
# Check if kernel supports zsmalloc as zswap backend (>= 6.3)
zsmallocSupported = versionAtLeast kernelVersion "6.3";
in
{
options.boot.zswap = {
enable = mkEnableOption "Zswap (Compressed Cache for Swap Pages)";
compressor = mkOption {
type = types.enum [
"zstd"
"lz4"
"lzo"
"lz4hc"
"deflate"
"842"
];
default = "zstd";
description = ''
Compression algorithm to use for zswap.
Available options:
- 'zstd': Best compression ratio, excellent for Nix builds (default)
- 'lz4': Fastest compression, lowest latency
- 'lz4hc': High-compression variant of lz4, slower but better ratio
- 'lzo': Good balance of speed and compression (kernel default)
- 'deflate': Higher compression, slower processing
- '842': Hardware-accelerated compression on supported systems
Note: The chosen algorithm must be supported by your kernel configuration.
'';
};
zpool = mkOption {
type = types.enum [
"zsmalloc"
"zbud"
];
default = if zsmallocSupported then "zsmalloc" else "zbud";
defaultText = literalExpression "if kernel >= 6.3 then \"zsmalloc\" else \"zbud\"";
description = ''
Kernel zpool allocator.
'zsmalloc' is strongly recommended for kernels >= 6.3 as it offers the best density.
For older kernels, 'zbud' is the fallback.
Note: 'z3fold' was removed from Linux kernel 6.8 and later.
'';
};
maxPoolPercent = mkOption {
type = types.ints.between 1 100;
default = 25;
description = ''
The maximum percentage of system memory that Zswap can occupy (1-100).
Higher values provide more compression cache but increase memory pressure.
Default is 25% (higher than kernel default of 20%) for better Nix build performance.
Recommended ranges:
- Desktop systems: 15-25%
- Low-memory systems: 30-50%
- Server systems: 10-20%
'';
};
acceptThresholdPercent = mkOption {
type = types.ints.between 1 100;
default = 90;
description = ''
Threshold percentage at which zswap starts accepting pages again after the pool becomes full (1-100).
This parameter provides hysteresis to prevent pool oscillation.
When the pool usage drops below this threshold, zswap starts accepting new pages.
Default is 90% as recommended by kernel documentation.
'';
};
shrinkerEnabled = mkOption {
type = types.bool;
default = true;
description = ''
Enable the zswap shrinker to reclaim memory when under pressure.
When enabled, the shrinker will automatically reclaim compressed pages
from the zswap pool when the system is under memory pressure, helping
to prevent out-of-memory situations.
It is recommended to keep this enabled for most workloads, especially
on systems with limited memory.
'';
};
};
config = mkIf cfg.enable {
# 1. Core configuration: kernel parameters for early boot
boot.kernelParams = [
"zswap.enabled=1"
"zswap.compressor=${cfg.compressor}"
"zswap.zpool=${cfg.zpool}"
"zswap.max_pool_percent=${toString cfg.maxPoolPercent}"
"zswap.accept_threshold_percent=${toString cfg.acceptThresholdPercent}"
"zswap.shrinker_enabled=${if cfg.shrinkerEnabled then "1" else "0"}"
];
# 2. Dependency management: ensure required modules are included in initrd or kernel
# This ensures Zswap is ready early in the boot process (before swap is mounted)
boot.initrd.kernelModules = [
cfg.compressor
cfg.zpool
];
# 3. Runtime configuration using boot.kernel.sysfs
# This ensures zswap parameters are properly set and maintained during system rebuilds
boot.kernel.sysfs.module.zswap.parameters = {
enabled = true;
compressor = cfg.compressor;
zpool = cfg.zpool;
max_pool_percent = cfg.maxPoolPercent;
accept_threshold_percent = cfg.acceptThresholdPercent;
shrinker_enabled = true;
};
assertions = [
{
assertion = !config.zramSwap.enable;
message = ''
Conflicting options enabled: 'boot.zswap.enable' and 'zramSwap.enable'.
You cannot enable Zswap and Zram simultaneously as it leads to double compression
and inefficient memory management.
Please disable one of them:
- To use Zswap (requires a physical swap device): Set 'zramSwap.enable = false'.
- To use Zram (swap in RAM): Set 'boot.zswap.enable = false'.
'';
}
{
assertion = config.swapDevices != [ ];
message = ''
Zswap requires at least one physical swap device to function as a backing store.
Try adding the following to your configuration (example):
swapDevices = [ {
device = "/var/lib/swapfile";
size = 16 * 1024; # 16GB
} ];
'';
}
{
assertion = (cfg.zpool == "zsmalloc") -> zsmallocSupported;
message = ''
Zswap allocator 'zsmalloc' is not supported on kernel version ${kernelVersion}.
Support for zsmalloc in Zswap was added in Linux 6.3.
Please use 'zbud' instead: boot.zswap.zpool = "zbud";
'';
}
];
};
meta.maintainers = with lib.maintainers; [ luochen1990 ];
}
pkgs/applications/editors/vim/plugins/generated.nix
+13
View File
@@ -15003,6 +15003,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
spring-boot-nvim = buildVimPlugin {
pname = "spring-boot.nvim";
version = "0-unstable-2026-03-29";
src = fetchFromGitHub {
owner = "JavaHello";
repo = "spring-boot.nvim";
rev = "98c6ff1dcdda943d341bba3c00ae9d190a2e5f7d";
hash = "sha256-JkOWlqyVLcwW7hxOGj5jb8BpUge3bUHbSV0o5qOYW1c=";
};
meta.homepage = "https://github.com/JavaHello/spring-boot.nvim/";
meta.hydraPlatforms = [ ];
};
sqlite-lua = buildVimPlugin {
pname = "sqlite.lua";
version = "1.2.2-unstable-2025-03-14";
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1
View File
@@ -1153,6 +1153,7 @@ https://github.com/stsewd/sphinx.nvim/,,
https://github.com/sjl/splice.vim/,,
https://github.com/vimlab/split-term.vim/,,
https://github.com/AndrewRadev/splitjoin.vim/,,
https://github.com/JavaHello/spring-boot.nvim/,HEAD,
https://github.com/kkharji/sqlite.lua/,,
https://github.com/srcery-colors/srcery-vim/,,
https://github.com/chr4/sslsecure.vim/,,
pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+2 -2
View File
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "claude-code";
publisher = "anthropic";
version = "2.1.92";
hash = "sha256-L3W9LoFA6JzsPa20Md9rOJBG/siauIJeuDcE7euZxMg=";
version = "2.1.96";
hash = "sha256-9WVCySGmohmyzTzcskzGCHk6ZFX+/HwkpmX2yudVar8=";
};
postInstall = ''
pkgs/applications/editors/vscode/extensions/default.nix
+4 -2
View File
@@ -5333,8 +5333,8 @@ let
mktplcRef = {
name = "php-debug";
publisher = "xdebug";
version = "1.40.0";
hash = "sha256-B8x954/nltRZcuX9y1NYu5JrDGiYxuPINSs1bgtCnWA=";
version = "1.40.1";
hash = "sha256-WI4d6Kk+lEmFTYYfwSH7q32YaOeokdEquFtZQJcyyDA=";
};
meta = {
description = "PHP Debug Adapter";
@@ -5374,6 +5374,8 @@ let
};
};
yoshi47.selection-path-copier = callPackage ./yoshi47.selection-path-copier { };
yy0931.vscode-sqlite3-editor = callPackage ./yy0931.vscode-sqlite3-editor { };
yzane.markdown-pdf = callPackage ./yzane.markdown-pdf { };
pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix
+22
View File
@@ -0,0 +1,22 @@
{
lib,
vscode-utils,
nix-update-script,
}:
vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
mktplcRef = {
publisher = "yoshi47";
name = "selection-path-copier";
version = "1.5.0";
hash = "sha256-ip8dsU8B2vghINPSftvfC5OtM0bjIP0V3JAMt5skmdg=";
};
meta = {
description = "Copy file paths with line numbers, code snippets, and GitHub permalinks in multiple formats";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=yoshi47.selection-path-copier";
homepage = "https://github.com/yoshi47/selection-path-copier";
changelog = "https://github.com/yoshi47/selection-path-copier/releases/tag/release/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ aduh95 ];
};
})
pkgs/applications/editors/vscode/generic.nix
+18 -2
View File
@@ -2,7 +2,11 @@
stdenv,
lib,
coreutils,
gawk,
gnugrep,
gnused,
glibc,
jq,
copyDesktopItems,
makeDesktopItem,
unzip,
@@ -33,6 +37,7 @@
openssl,
webkitgtk_4_1,
ripgrep,
which,
# needed to fix "Save as Root"
asar,
@@ -269,6 +274,7 @@ stdenv.mkDerivation (
autoPatchelfHook
asar
copyDesktopItems
jq
# override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
# Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.
(buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
@@ -352,9 +358,13 @@ stdenv.mkDerivation (
# for moving files to trash
glib
# for launcher script
# for launcher and bundled helper scripts
gawk
glibc.bin
gnugrep
gnused
coreutils
which
]
}
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}"
@@ -365,9 +375,15 @@ stdenv.mkDerivation (
# See https://github.com/NixOS/nixpkgs/issues/49643#issuecomment-873853897
# linux only because of https://github.com/NixOS/nixpkgs/issues/138729
postPatch =
# this is a fix for "save as root" functionality
lib.optionalString stdenv.hostPlatform.isLinux (
# disable update checks
''
tmpProductJson="$(mktemp)"
jq 'del(.updateUrl, .backupUpdateUrl)' resources/app/product.json > "$tmpProductJson"
mv "$tmpProductJson" resources/app/product.json
''
# this is a fix for "save as root" functionality
+ ''
packed="resources/app/node_modules.asar"
unpacked="resources/app/node_modules"
asar extract "$packed" "$unpacked"
pkgs/applications/networking/cluster/nomad/default.nix
+3 -3
View File
@@ -84,9 +84,9 @@ rec {
nomad_1_11 = generic {
buildGoModule = buildGo125Module;
version = "1.11.1";
hash = "sha256-xP3wSxDo59hme9G4+ATfGD0LTdf11+c/cSfPoKfeBLc=";
vendorHash = "sha256-CXWaEwJCKzggyCrHsa+PrLnQNQKI8G14uWno2NAvOwU=";
version = "1.11.3";
hash = "sha256-J+w53HlMlrXX5yKjDYhf3rSGt1pmOyNcPlOqyUrkLWE=";
vendorHash = "sha256-67etQUjcPXz4VVpNXLVusQlEybxEqKfYQcNTNL4X8bA=";
license = lib.licenses.bsl11;
passthru.tests.nomad = nixosTests.nomad;
preCheck = ''
pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
+397 -397
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/science/chemistry/avogadro2/default.nix
+14 -14
View File
@@ -12,29 +12,29 @@
mesa,
}:
let
avogadroI18N = fetchFromGitHub {
owner = "OpenChemistry";
repo = "avogadro-i18n";
tag = "1.103.0";
hash = "sha256-gdr0Ed0UWjQB0LQq+6RvlAb8ZNFQAjV9mrgFLePG+CM=";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "avogadro2";
version = "1.103.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "OpenChemistry";
repo = "avogadroapp";
rev = finalAttrs.version;
hash = "sha256-nmvK3R966Xv2Xs5wXDh/8itIZLIRqbXHFe8dffFiI+s=";
hash = "sha256-+/NZwLRrbrfrQqxLqgiqZk6324BGoN+qRfOq7G+UIBE=";
};
postUnpack = ''
cp -r ${avogadroI18N} avogadro-i18n
'';
postUnpack =
let
avogadroI18N = fetchFromGitHub {
owner = "OpenChemistry";
repo = "avogadro-i18n";
tag = finalAttrs.version;
hash = "sha256-5eiOFJ5tbS+HFbnLbc6sjk62BvXDMQYpPsB4xFpVWXM=";
};
in
''
cp -r ${avogadroI18N} avogadro-i18n
'';
nativeBuildInputs = [
cmake
pkgs/by-name/ac/action-validator/package.nix
+28 -3
View File
@@ -3,24 +3,49 @@
rustPlatform,
fetchFromGitHub,
nix-update-script,
gitMinimal,
makeWrapper,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "action-validator";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "mpalmer";
repo = "action-validator";
tag = "v${finalAttrs.version}";
hash = "sha256-irBK27De9W5BSNIQynguOY8oPgA7K03dleE/0YvY75o=";
hash = "sha256-E0kqEzqw902Wg7QQNzOrtHQO9riSmAvDNcWIP3XmLSY=";
fetchSubmodules = true;
};
cargoHash = "sha256-w6qC4gJ06TfoQl2WD8lgOxSxUWyG6Z8ma9mUvvYlkTU=";
cargoHash = "sha256-F8bJclpDpOdVET/dSIUYyP4DFcnhJDR2CV8poZtykko=";
passthru.updateScript = nix-update-script { };
postPatch = ''
substituteInPlace Cargo.toml --replace-fail 'version = "0.0.0-git"' 'version = "${finalAttrs.version}"'
'';
nativeBuildInputs = [ makeWrapper ];
nativeCheckInputs = [ gitMinimal ];
# The tests require a functional git installation and leaveDotGit appears broken https://github.com/NixOS/nixpkgs/issues/8567
preCheck = ''
git init -b main
git add --all # action-validator tests ignore unstaged files
'';
postCheck = ''
rm -rf .git
'';
postInstall = ''
wrapProgram "$out/bin/action-validator" \
--prefix PATH : ${lib.makeBinPath [ gitMinimal ]}
'';
meta = {
description = "Tool to validate GitHub Action and Workflow YAML files";
homepage = "https://github.com/mpalmer/action-validator";
pkgs/by-name/am/amberol/package.nix
+5 -3
View File
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitLab,
rustPlatform,
blueprint-compiler,
cargo,
desktop-file-utils,
appstream-glib,
@@ -23,20 +24,20 @@
stdenv.mkDerivation (finalAttrs: {
pname = "amberol";
version = "2025.1";
version = "2026.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "amberol";
tag = finalAttrs.version;
hash = "sha256-vF6O7+cQFoYpO4MHHHuacwjP7AUqFQCVUivCSZO7v3o=";
hash = "sha256-d4lhfWqg6EZeXGL1kHGS7oWrqI3c9bpDCKUdGp31OpI=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
name = "amberol-${finalAttrs.version}";
hash = "sha256-j/xkdLcmu02e+b8skx5U3uG2R2rIxwSJsYzyJ5tn5uU=";
hash = "sha256-OFZd9nKRqXJMHSIIP8tlSNtFAQzk/f/6SBeEvbdPVK0=";
};
postPatch = ''
@@ -45,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
appstream-glib
blueprint-compiler
cargo
desktop-file-utils
m4
pkgs/by-name/an/antigravity/package.nix
+2 -14
View File
@@ -3,7 +3,6 @@
stdenv,
buildVscode,
fetchurl,
jq,
writeShellScript,
coreutils,
commandLineArgs ? "",
@@ -17,7 +16,7 @@ let
information.sources."${hostPlatform.system}"
or (throw "antigravity: unsupported system ${hostPlatform.system}");
in
(buildVscode {
buildVscode {
inherit commandLineArgs useVSCodeRipgrep;
inherit (information) version vscodeVersion;
pname = "antigravity";
@@ -75,15 +74,4 @@ in
Zaczero
];
};
}).overrideAttrs
(oldAttrs: {
# Disable update checks
nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ jq ];
postPatch = (oldAttrs.postPatch or "") + ''
productJson="${
if stdenv.hostPlatform.isDarwin then "Contents/Resources" else "resources"
}/app/product.json"
data=$(jq 'del(.updateUrl)' "$productJson")
echo "$data" > "$productJson"
'';
})
}
pkgs/by-name/as/asak/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "asak";
version = "0.3.5";
version = "0.3.7";
src = fetchFromGitHub {
owner = "chaosprint";
repo = "asak";
tag = "v${finalAttrs.version}";
hash = "sha256-7r05sVIHqBBOKwye2fr0pspo/uDqaYGjt5CpxqgqKzI=";
hash = "sha256-/c7E8q7Kx6BewzJoB+nvktX1yzybH+HGSOMgdOk8GVA=";
};
cargoHash = "sha256-XoTfymCXrvoToSY7jw+Pn8Wm6fskFzl4f55uiKnSsJ8=";
cargoHash = "sha256-vj88bErQ3STrY4nN8XoC2QMISW1Qt5963QqIYhwCIKM=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/bl/blueprint-compiler/package.nix
+2 -2
View File
@@ -15,14 +15,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "blueprint-compiler";
version = "0.18.0";
version = "0.20.4";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "blueprint-compiler";
rev = "v${finalAttrs.version}";
hash = "sha256-3vAFkP/psM/IsFtzVOIVSU77Z+RV4d3N70U7ggrDqfo=";
hash = "sha256-dA+FQTRmTz6rl5ToZJ8CXY1Zd7Em7VwvF3U3Qoyvu80=";
};
postPatch = ''
pkgs/by-name/ca/cargo-deny/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-deny";
version = "0.19.0";
version = "0.19.1";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = "cargo-deny";
tag = finalAttrs.version;
hash = "sha256-kDjRP+UXYzsXTrcsPbomtATzDVTSZqXoRXf6qqCGOZw=";
hash = "sha256-iS0MDeQhUCP/JBT9Lyos3s+zCeL5qe83lvsMGz7Hndg=";
};
cargoHash = "sha256-Lu1KhQmsQGvzgozFTcv9/hY3ZXOuaxkv0I+QPmAdZBU=";
cargoHash = "sha256-LuUlPBLcThaN36ZAUbjAZ4+M/526WJBGUlUAfmNVKvs=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/ca/cartero/package.nix
+3 -3
View File
@@ -24,18 +24,18 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cartero";
version = "25.0";
version = "26.0";
src = fetchFromGitHub {
owner = "danirod";
repo = "cartero";
tag = "v${finalAttrs.version}";
hash = "sha256-XUf5Gfg+ZyyzcbZYSxFTM4ot84FF2bgGJoQg2ZAIZ3g=";
hash = "sha256-EBQqJuIcgpLtRu5DcAaWnCiFyiuuG+DCkdAWsoWwn3E=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-T1OR8okOm5hFYsRLqqNYhP39Av/veHnoomkC29/JyAY=";
hash = "sha256-Te6foGMcy8q0u6wn/D4RkhoOEjke5HTv3xxaS2EbiIE=";
};
nativeBuildInputs = [
pkgs/by-name/cl/claude-code/package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "@anthropic-ai/claude-code",
"version": "2.1.92",
"version": "2.1.97",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@anthropic-ai/claude-code",
"version": "2.1.92",
"version": "2.1.97",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"
pkgs/by-name/cl/claude-code/package.nix
+3 -3
View File
@@ -15,14 +15,14 @@
}:
buildNpmPackage (finalAttrs: {
pname = "claude-code";
version = "2.1.92";
version = "2.1.97";
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
hash = "sha256-CLLCtVK3TeXFZ8wBnRRHNc2MoUt7lTdMJwz8sZHpkFM=";
hash = "sha256-J92ILqBJmXyAueUPZ+HYZY0ls3OfN2EAhFyQHTOQF5A=";
};
npmDepsHash = "sha256-5LvH7fG5pti2SiXHQqgRxfFpxaXxzrmGxIoPR4dGE+8=";
npmDepsHash = "sha256-0fZu5r/zQjUSbm49FhZSqiIyMKdmH050NSxoVWd3XoU=";
strictDeps = true;
pkgs/by-name/co/code-cursor/package.nix
+1 -3
View File
@@ -11,7 +11,6 @@
let
inherit (stdenv) hostPlatform;
finalCommandLineArgs = "--update=false " + commandLineArgs;
sourcesJson = lib.importJSON ./sources.json;
sources = lib.mapAttrs (
@@ -24,9 +23,8 @@ let
source = sources.${hostPlatform.system};
in
buildVscode rec {
inherit useVSCodeRipgrep;
inherit commandLineArgs useVSCodeRipgrep;
inherit (sourcesJson) version vscodeVersion;
commandLineArgs = finalCommandLineArgs;
pname = "cursor";
pkgs/by-name/co/convertall/package.nix
+27 -2
View File
@@ -2,21 +2,46 @@
lib,
flutter341,
fetchFromGitHub,
runCommand,
nix-update-script,
yq-go,
_experimental-update-script-combinators,
}:
flutter341.buildFlutterApplication rec {
pname = "convertall";
version = "1.0.2";
version = "1.0.3";
src = fetchFromGitHub {
owner = "doug-101";
repo = "ConvertAll";
tag = "v${version}";
hash = "sha256-esc2xhL0Jx5SaqM0GnnVzdtnSN9bX8zln66We/2RqoA=";
hash = "sha256-f9HfLfxY2G/3rZoWJ1xLeGmkdFiIyUFkr65Jf8QMqjY=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
passthru = {
pubspecSource =
runCommand "pubspec.lock.json"
{
inherit src;
nativeBuildInputs = [ yq-go ];
}
''
yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out"
'';
updateScript = _experimental-update-script-combinators.sequence [
(nix-update-script { })
(
(_experimental-update-script-combinators.copyAttrOutputToFile "convertall.pubspecSource" ./pubspec.lock.json)
// {
supportedFeatures = [ ];
}
)
];
};
meta = {
homepage = "https://convertall.bellz.org";
description = "Graphical unit converter";
pkgs/by-name/co/convertall/pubspec.lock.json
+158 -98
View File
@@ -4,11 +4,11 @@
"dependency": "transitive",
"description": {
"name": "archive",
"sha256": "a7f37ff061d7abc2fcf213554b9dcaca713c5853afa5c065c44888bc9ccaf813",
"sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.6"
"version": "4.0.9"
},
"args": {
"dependency": "transitive",
@@ -24,11 +24,11 @@
"dependency": "direct main",
"description": {
"name": "async",
"sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
"sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.12.0"
"version": "2.13.0"
},
"boolean_selector": {
"dependency": "transitive",
@@ -44,21 +44,21 @@
"dependency": "transitive",
"description": {
"name": "characters",
"sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
"sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.4.0"
"version": "1.4.1"
},
"checked_yaml": {
"dependency": "transitive",
"description": {
"name": "checked_yaml",
"sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
"sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.3"
"version": "2.0.4"
},
"cli_util": {
"dependency": "transitive",
@@ -90,16 +90,6 @@
"source": "hosted",
"version": "1.19.1"
},
"crypto": {
"dependency": "transitive",
"description": {
"name": "crypto",
"sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.6"
},
"cupertino_icons": {
"dependency": "transitive",
"description": {
@@ -110,45 +100,55 @@
"source": "hosted",
"version": "1.0.8"
},
"dart_numerics": {
"dependency": "transitive",
"description": {
"name": "dart_numerics",
"sha256": "47408d4890551636204851325e5649bf1a1616ebc325184c36722a1716cbaba4",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.0.6"
},
"decimal": {
"dependency": "direct main",
"description": {
"name": "decimal",
"sha256": "24a261d5d5c87e86c7651c417a5dbdf8bcd7080dd592533910e8d0505a279f21",
"sha256": "fc706a5618b81e5b367b01dd62621def37abc096f2b46a9bd9068b64c1fa36d0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.3"
"version": "3.2.4"
},
"eval_ex": {
"dependency": "direct main",
"description": {
"name": "eval_ex",
"sha256": "3f8853d996ee41955f2232ad3730e95698fb1040d03f6ebc6ab01f1c2bc3be53",
"sha256": "a99e20fb004275b38f27f186718a157d4d8687e69f75b5780e6c02b9cc9e6c0d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.8"
"version": "1.2.0"
},
"fake_async": {
"dependency": "transitive",
"description": {
"name": "fake_async",
"sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
"sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.2"
"version": "1.3.3"
},
"ffi": {
"dependency": "transitive",
"description": {
"name": "ffi",
"sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
"sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.4"
"version": "2.2.0"
},
"file": {
"dependency": "transitive",
@@ -170,21 +170,21 @@
"dependency": "direct dev",
"description": {
"name": "flutter_launcher_icons",
"sha256": "bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c",
"sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.14.3"
"version": "0.14.4"
},
"flutter_lints": {
"dependency": "direct dev",
"description": {
"name": "flutter_lints",
"sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1",
"sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.2"
"version": "6.0.0"
},
"flutter_markdown_selectionarea": {
"dependency": "direct main",
@@ -222,11 +222,11 @@
"dependency": "transitive",
"description": {
"name": "http",
"sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f",
"sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.0"
"version": "1.6.0"
},
"http_parser": {
"dependency": "transitive",
@@ -242,61 +242,71 @@
"dependency": "transitive",
"description": {
"name": "image",
"sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
"sha256": "f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.5.4"
"version": "4.8.0"
},
"intl": {
"dependency": "transitive",
"description": {
"name": "intl",
"sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.20.2"
},
"json_annotation": {
"dependency": "transitive",
"description": {
"name": "json_annotation",
"sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
"sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.9.0"
"version": "4.11.0"
},
"leak_tracker": {
"dependency": "transitive",
"description": {
"name": "leak_tracker",
"sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
"sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.0.8"
"version": "11.0.2"
},
"leak_tracker_flutter_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_flutter_testing",
"sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
"sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.9"
"version": "3.0.10"
},
"leak_tracker_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_testing",
"sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
"sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.1"
"version": "3.0.2"
},
"lints": {
"dependency": "transitive",
"description": {
"name": "lints",
"sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290",
"sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.0"
"version": "6.1.0"
},
"markdown": {
"dependency": "transitive",
@@ -312,31 +322,31 @@
"dependency": "transitive",
"description": {
"name": "matcher",
"sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
"sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.12.17"
"version": "0.12.19"
},
"material_color_utilities": {
"dependency": "transitive",
"description": {
"name": "material_color_utilities",
"sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
"sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.11.1"
"version": "0.13.0"
},
"meta": {
"dependency": "transitive",
"description": {
"name": "meta",
"sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
"sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.16.0"
"version": "1.17.0"
},
"nested": {
"dependency": "transitive",
@@ -352,21 +362,21 @@
"dependency": "direct main",
"description": {
"name": "package_info_plus",
"sha256": "cb44f49b6e690fa766f023d5b22cac6b9affe741dd792b6ac7ad4fabe0d7b097",
"sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.0.0"
"version": "9.0.0"
},
"package_info_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "package_info_plus_platform_interface",
"sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6",
"sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.1"
"version": "3.2.1"
},
"path": {
"dependency": "transitive",
@@ -412,11 +422,11 @@
"dependency": "transitive",
"description": {
"name": "petitparser",
"sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
"sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.1.0"
"version": "7.0.2"
},
"platform": {
"dependency": "transitive",
@@ -442,21 +452,21 @@
"dependency": "transitive",
"description": {
"name": "posix",
"sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62",
"sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.0.2"
"version": "6.5.0"
},
"provider": {
"dependency": "direct main",
"description": {
"name": "provider",
"sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310",
"sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.1.4"
"version": "6.1.5+1"
},
"rational": {
"dependency": "transitive",
@@ -472,41 +482,81 @@
"dependency": "transitive",
"description": {
"name": "screen_retriever",
"sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90",
"sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.9"
"version": "0.2.0"
},
"screen_retriever_linux": {
"dependency": "transitive",
"description": {
"name": "screen_retriever_linux",
"sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.0"
},
"screen_retriever_macos": {
"dependency": "transitive",
"description": {
"name": "screen_retriever_macos",
"sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.0"
},
"screen_retriever_platform_interface": {
"dependency": "transitive",
"description": {
"name": "screen_retriever_platform_interface",
"sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.0"
},
"screen_retriever_windows": {
"dependency": "transitive",
"description": {
"name": "screen_retriever_windows",
"sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.0"
},
"shared_preferences": {
"dependency": "direct main",
"description": {
"name": "shared_preferences",
"sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
"sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.3"
"version": "2.5.4"
},
"shared_preferences_android": {
"dependency": "transitive",
"description": {
"name": "shared_preferences_android",
"sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
"sha256": "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.10"
"version": "2.4.21"
},
"shared_preferences_foundation": {
"dependency": "transitive",
"description": {
"name": "shared_preferences_foundation",
"sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
"sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.4"
"version": "2.5.6"
},
"shared_preferences_linux": {
"dependency": "transitive",
@@ -558,11 +608,11 @@
"dependency": "transitive",
"description": {
"name": "source_span",
"sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
"sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.10.1"
"version": "1.10.2"
},
"stack_trace": {
"dependency": "transitive",
@@ -608,11 +658,21 @@
"dependency": "transitive",
"description": {
"name": "test_api",
"sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
"sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.4"
"version": "0.7.10"
},
"tuple": {
"dependency": "transitive",
"description": {
"name": "tuple",
"sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.2"
},
"typed_data": {
"dependency": "transitive",
@@ -628,51 +688,51 @@
"dependency": "direct main",
"description": {
"name": "url_launcher",
"sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
"sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.1"
"version": "6.3.2"
},
"url_launcher_android": {
"dependency": "transitive",
"description": {
"name": "url_launcher_android",
"sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
"sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.16"
"version": "6.3.28"
},
"url_launcher_ios": {
"dependency": "transitive",
"description": {
"name": "url_launcher_ios",
"sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
"sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.3"
"version": "6.4.1"
},
"url_launcher_linux": {
"dependency": "transitive",
"description": {
"name": "url_launcher_linux",
"sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
"sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.1"
"version": "3.2.2"
},
"url_launcher_macos": {
"dependency": "transitive",
"description": {
"name": "url_launcher_macos",
"sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
"sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.2"
"version": "3.2.5"
},
"url_launcher_platform_interface": {
"dependency": "transitive",
@@ -688,21 +748,21 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_web",
"sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9",
"sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.0"
"version": "2.4.2"
},
"url_launcher_windows": {
"dependency": "transitive",
"description": {
"name": "url_launcher_windows",
"sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
"sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.4"
"version": "3.1.5"
},
"vector_math": {
"dependency": "transitive",
@@ -718,41 +778,41 @@
"dependency": "transitive",
"description": {
"name": "vm_service",
"sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
"sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "14.3.1"
"version": "15.0.2"
},
"web": {
"dependency": "transitive",
"description": {
"name": "web",
"sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
"sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.5.1"
"version": "1.1.1"
},
"win32": {
"dependency": "transitive",
"description": {
"name": "win32",
"sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f",
"sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.12.0"
"version": "5.15.0"
},
"window_manager": {
"dependency": "direct main",
"description": {
"name": "window_manager",
"sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf",
"sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.3.9"
"version": "0.5.1"
},
"xdg_directories": {
"dependency": "transitive",
@@ -768,11 +828,11 @@
"dependency": "transitive",
"description": {
"name": "xml",
"sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
"sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.5.0"
"version": "6.6.1"
},
"yaml": {
"dependency": "transitive",
@@ -786,7 +846,7 @@
}
},
"sdks": {
"dart": ">=3.7.0 <4.0.0",
"flutter": ">=3.27.0"
"dart": ">=3.10.0 <4.0.0",
"flutter": ">=3.38.0"
}
}
pkgs/by-name/cu/cucumber/Gemfile
+1 -1
View File
@@ -1,2 +1,2 @@
source 'https://rubygems.org'
gem 'cucumber'
gem 'cucumber', '10.2.0'
pkgs/by-name/cu/cucumber/Gemfile.lock
+29 -25
View File
@@ -1,45 +1,49 @@
GEM
remote: https://rubygems.org/
specs:
bigdecimal (3.1.9)
base64 (0.3.0)
bigdecimal (4.0.1)
builder (3.3.0)
cucumber (9.2.1)
cucumber (10.2.0)
base64 (~> 0.2)
builder (~> 3.2)
cucumber-ci-environment (> 9, < 11)
cucumber-core (> 13, < 14)
cucumber-cucumber-expressions (~> 17.0)
cucumber-gherkin (> 24, < 28)
cucumber-html-formatter (> 20.3, < 22)
cucumber-messages (> 19, < 25)
cucumber-ci-environment (> 9, < 12)
cucumber-core (> 15, < 17)
cucumber-cucumber-expressions (> 17, < 20)
cucumber-html-formatter (> 21, < 23)
diff-lcs (~> 1.5)
logger (~> 1.6)
mini_mime (~> 1.1)
multi_test (~> 1.1)
sys-uname (~> 1.2)
cucumber-ci-environment (10.0.1)
cucumber-core (13.0.3)
cucumber-gherkin (>= 27, < 28)
cucumber-messages (>= 20, < 23)
cucumber-tag-expressions (> 5, < 7)
cucumber-cucumber-expressions (17.1.0)
sys-uname (~> 1.3)
cucumber-ci-environment (11.0.0)
cucumber-core (16.2.0)
cucumber-gherkin (> 36, < 40)
cucumber-messages (> 31, < 33)
cucumber-tag-expressions (> 6, < 9)
cucumber-cucumber-expressions (19.0.0)
bigdecimal
cucumber-gherkin (27.0.0)
cucumber-messages (>= 19.1.4, < 23)
cucumber-html-formatter (21.9.0)
cucumber-messages (> 19, < 28)
cucumber-messages (22.0.0)
cucumber-tag-expressions (6.1.2)
cucumber-gherkin (39.0.0)
cucumber-messages (>= 31, < 33)
cucumber-html-formatter (22.3.0)
cucumber-messages (> 23, < 33)
cucumber-messages (32.2.0)
cucumber-tag-expressions (8.1.0)
diff-lcs (1.6.2)
ffi (1.17.2)
ffi (1.17.3)
logger (1.7.0)
memoist3 (1.0.0)
mini_mime (1.1.5)
multi_test (1.1.0)
sys-uname (1.3.1)
sys-uname (1.5.0)
ffi (~> 1.1)
memoist3 (~> 1.0.0)
PLATFORMS
ruby
DEPENDENCIES
cucumber
cucumber (= 10.2.0)
BUNDLED WITH
2.6.6
2.7.2
pkgs/by-name/cu/cucumber/gemset.nix
+58 -25
View File
@@ -1,13 +1,23 @@
{
base64 = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7";
type = "gem";
};
version = "0.3.0";
};
bigdecimal = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
sha256 = "19y406nx17arzsbc515mjmr6k5p59afprspa1k423yd9cp8d61wb";
type = "gem";
};
version = "3.1.9";
version = "4.0.1";
};
builder = {
groups = [ "default" ];
@@ -21,14 +31,14 @@
};
cucumber = {
dependencies = [
"base64"
"builder"
"cucumber-ci-environment"
"cucumber-core"
"cucumber-cucumber-expressions"
"cucumber-gherkin"
"cucumber-html-formatter"
"cucumber-messages"
"diff-lcs"
"logger"
"mini_mime"
"multi_test"
"sys-uname"
@@ -37,20 +47,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0cbi1g6qwdh38z2jxm8a1mc63iz887108747c99s3g452hwn2hgs";
sha256 = "0n41b80fg8bz49m9rhms1g1zai2wl4m3z1841yv5h27lxhqvvvgx";
type = "gem";
};
version = "9.2.1";
version = "10.2.0";
};
cucumber-ci-environment = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0cc6w7dqlmnp59ymi7pyspm3w4m7fn37x6b18pziv62wr373yvmv";
sha256 = "1qnif57qqcvaz361jkbg43pnzn80jac0ys7gklymn08b3ng9mxqd";
type = "gem";
};
version = "10.0.1";
version = "11.0.0";
};
cucumber-core = {
dependencies = [
@@ -62,10 +72,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0i2k5j3l8yy1367hzmg7x3xy984bnmihnzjh0ic8s2nwb3b2h770";
sha256 = "02wprwvf2f3ffzvbrzv8clxvm11p6s7gcjd3wpwfwbzlbjlmhasr";
type = "gem";
};
version = "13.0.3";
version = "16.2.0";
};
cucumber-cucumber-expressions = {
dependencies = [ "bigdecimal" ];
@@ -73,10 +83,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "14fkk7bfzm9cyacgcyzgkjc3nblflz4rcnlyz0pzd1ypwpqrvgm1";
sha256 = "0fnrr6hzcgg5ayfmf26f3vvm8c1418x9jiibsjzcjakk0kr8y81k";
type = "gem";
};
version = "17.1.0";
version = "19.0.0";
};
cucumber-gherkin = {
dependencies = [ "cucumber-messages" ];
@@ -84,10 +94,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "063p0slf6fvigdn3jynp5pjf9b05byyyi0jhsyapy46hq4984sif";
sha256 = "0m9yb7icwn4s1clah4x495qjwaya50050fzfbhy1rx0hx63ivxa6";
type = "gem";
};
version = "27.0.0";
version = "39.0.0";
};
cucumber-html-formatter = {
dependencies = [ "cucumber-messages" ];
@@ -95,30 +105,30 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "18bfg6gpijjbka0pp7604src1ajjkmsr79nyvr6zjgw4j0nvdsfn";
sha256 = "0a873ll5305g8gbp4sbf4006pn4bck6c491qbwxdgnw8ap88wxpr";
type = "gem";
};
version = "21.9.0";
version = "22.3.0";
};
cucumber-messages = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "06d7dnixz68ivngf6qflmi6xrjshjyi85gmyjrl07pbmhqi6r2nh";
sha256 = "06kk01xnpgkiw1jnpdw9azrxmyry4fqji2k7pw3rvpgprin0bi22";
type = "gem";
};
version = "22.0.0";
version = "32.2.0";
};
cucumber-tag-expressions = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0vcifp1fiha6yqi36m26n1vr8sz3dpnn5966hcz4a3dq43lf947p";
sha256 = "089fynlhyzcjng7x8ffda1gafdi1yfv2k4y9m7r5p3jgcnvc9n4v";
type = "gem";
};
version = "6.1.2";
version = "8.1.0";
};
diff-lcs = {
groups = [ "default" ];
@@ -135,10 +145,30 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9";
sha256 = "0k1xaqw2jk13q3ss7cnyvkp8fzp75dk4kazysrxgfd1rpgvkk7qf";
type = "gem";
};
version = "1.17.2";
version = "1.17.3";
};
logger = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
type = "gem";
};
version = "1.7.0";
};
memoist3 = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0vyma0mpjibqigzl6j9lij7zh3kvqlyi88qc0mia6l7i5i044vk8";
type = "gem";
};
version = "1.0.0";
};
mini_mime = {
groups = [ "default" ];
@@ -161,14 +191,17 @@
version = "1.1.0";
};
sys-uname = {
dependencies = [ "ffi" ];
dependencies = [
"ffi"
"memoist3"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "177l8rrqnb4rxf657mw28sgvgc8a2m7nlqcbdbra5m4xga0ypcxp";
sha256 = "0lrh3h15s3mpf0sa5cf7jwwr9wjlkjaf9qim8519cdsqpihnja0m";
type = "gem";
};
version = "1.3.1";
version = "1.5.0";
};
}
pkgs/by-name/de/denemo/package.nix
+30 -5
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchgit,
fetchDebianPatch,
pkg-config,
libjack2,
gettext,
@@ -26,14 +27,14 @@
wrapGAppsHook3,
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "denemo";
version = "2.6.43";
version = "2.6.49";
src = fetchgit {
url = "https://git.savannah.gnu.org/git/denemo.git";
rev = "b04ead1d3efeee036357cf36898b838a96ec5332";
hash = "sha256-XMFbPk70JqUHWBPEK8rjr70iMs49RNyaaCUGnYlLf2E=";
tag = "v${finalAttrs.version}";
hash = "sha256-TUdaGOChqwK3fAmdaP9Lg2FGrEWF0yjwqsRXK7h/83Y=";
};
buildInputs = [
@@ -58,6 +59,30 @@ stdenv.mkDerivation {
# error by default in GCC 14
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
patches = [
(fetchDebianPatch {
pname = "denemo";
version = "2.6.49";
debianRevision = "0.2";
patch = "0002-Prevent-incompatible-pointer-types.patch";
hash = "sha256-l1eXjQieH5ySqwaTJAE8lUq/FsB//cl02Wgt0TRQBMo=";
})
(fetchDebianPatch {
pname = "denemo";
version = "2.6.49";
debianRevision = "0.2";
patch = "0013-Fix-FTBFS-with-GCC-14.patch";
hash = "sha256-H3hRmAPazYRkwQI97vNR9kpV0lYpIiAXyMfrnJl+lNo=";
})
(fetchDebianPatch {
pname = "denemo";
version = "2.6.49";
debianRevision = "0.2";
patch = "0014-Fix-FTBFS-with-GCC-15.patch";
hash = "sha256-UG/YZWp+twJdvqiXR4NfB3knm04lAyICh5/LHN2pm54=";
})
];
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "${lilypond}/bin"
@@ -80,4 +105,4 @@ stdenv.mkDerivation {
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.olynch ];
};
}
})
pkgs/by-name/do/dorion/no-cargo-patch.patch
-31
View File
@@ -1,31 +0,0 @@
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 13a6b54..f6bd9d6 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -5049,6 +5049,8 @@ dependencies = [
[[package]]
name = "tauri-plugin-shell"
version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69d5eb3368b959937ad2aeaf6ef9a8f5d11e01ffe03629d3530707bbcb27ff5d"
dependencies = [
"encoding_rs",
"log",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 4dcaa86..daef086 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -12,13 +12,6 @@ rust-version = "1.84.1"
strip = "debuginfo"
lto = false
-# Patches
-[package.metadata.patch]
-crates = ["tauri-plugin-shell"]
-
-[patch.crates-io]
-tauri-plugin-shell = { path="./target/patch/tauri-plugin-shell-2.2.1" }
-
[build-dependencies]
tauri-build = { version = "2.0.0", features = [] }
pkgs/by-name/do/dorion/package.nix
+58 -46
View File
@@ -1,10 +1,12 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchurl,
rustPlatform,
cmake,
ninja,
makeBinaryWrapper,
wrapGAppsHook4,
glib-networking,
gst_all_1,
@@ -20,8 +22,9 @@
webkitgtk_4_1,
cargo-tauri,
desktop-file-utils,
fetchpatch,
pipewire,
apple-sdk_15,
darwin,
}:
let
@@ -39,52 +42,36 @@ let
};
};
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "dorion";
version = "6.12.0";
version = "6.12.2";
src = fetchFromGitHub {
owner = "SpikeHD";
repo = "Dorion";
tag = "v${finalAttrs.version}";
hash = "sha256-pykmoSiV3iSaD/V/Sd5GSV/BZWhk9XVg8io1j8wZv5k=";
hash = "sha256-aPYQOec4D0I4N/6nmSwodXsh3pvcHnlD37fUIw5kMjo=";
};
patches = [
# https://github.com/SpikeHD/Dorion/issues/419
(fetchpatch {
url = "https://github.com/SpikeHD/Dorion/commit/98d50dadd1a7fb018698a3fe61ac104cbe89b5d4.patch";
hash = "sha256-1VbB2CVMUWw18lWC4EL83VS4SdC03AxDUKRq/hQNAAg=";
})
];
cargoRoot = "src-tauri";
buildAndTestSubdir = finalAttrs.cargoRoot;
cargoHash = "sha256-FJ4gQKgZkYqvjcqcRapJ8IQWP52kIg4uOTxifKG8zyo=";
cargoHash = "sha256-3FS8w9K3Wx7KbT7iy+0pAMdmreZnL+ZFMSAnwesnS7Y=";
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs)
pname
version
src
patches
;
inherit (finalAttrs) pname version src;
pnpm = pnpm_9;
fetcherVersion = 3;
hash = "sha256-qSmIyLv8A+JDbTVG+Qcvq3gqBXBGtfbH4/tN+CvEmd8=";
hash = "sha256-E45X3JEns1TE+SVbtbBEl+RzwRgTiGN7/N4OgJ5o63o=";
};
# CMake (webkit extension)
# CMake (webkit extension, Linux only)
cmakeDir = ".";
cmakeBuildDir = "src-tauri/extension_webkit";
dontUseCmakeConfigure = true;
dontUseNinjaBuild = true;
dontUseNinjaCheck = true;
dontUseNinjaInstall = true;
# cmake's supposed to set this automatically
# ... but the detection is based on the presence of ninja build hook
cmakeFlags = [
"-GNinja"
];
@@ -95,15 +82,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargo-tauri.hook
nodejs
pkg-config
wrapGAppsHook4
yq-go
]
++ lib.optionals stdenv.hostPlatform.isLinux [
wrapGAppsHook4
desktop-file-utils
cmake
ninja
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
makeBinaryWrapper
darwin.autoSignDarwinBinariesHook
];
buildInputs = [
openssl
]
++ lib.optionals stdenv.hostPlatform.isLinux [
webkitgtk_4_1'
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
@@ -114,51 +109,65 @@ rustPlatform.buildRustPackage (finalAttrs: {
libsysprof-capture
libayatana-appindicator
pipewire
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_15
];
postPatch = ''
# remove updater
rm -rf updater
substituteInPlace $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs \
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
# disable pre-build script and disable auto-updater
yq -iPo=json '
.bundle.resources = (.bundle.resources | map(select(. != "updater*")))
' src-tauri/tauri.conf.json
# link shelter injection
ln -s ${shelter} src-tauri/injection/shelter.js
ln -s "${shelter}" src-tauri/injection/shelter.js
# link html/frontend data
ln -s $(pwd)/src src-tauri/html
ln -s "$(pwd)/src" src-tauri/html
''
# disable Tauri's built-in codesigning
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
yq -iPo=json '
.bundle.macOS.signingIdentity = null
' src-tauri/tauri.conf.json
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace "$cargoDepsCopy"/*/libappindicator-sys-*/src/lib.rs \
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
'';
configurePhase = ''
runHook preConfigure
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
cmakeConfigurePhase
''
+ ''
pnpmConfigHook
runHook postConfigure
'';
buildPhase = ''
ninjaBuildPhase
cd ../..
tauriBuildHook
'';
buildPhase =
lib.optionalString stdenv.hostPlatform.isLinux ''
ninjaBuildPhase
cd ../..
''
+ ''
tauriBuildHook
'';
postInstall = ''
# Set up the resource directories
mkdir -p $out/lib/Dorion
ln -s $out/lib/Dorion $out/lib/dorion
rm -rf $out/lib/Dorion/injection
cp -r src-tauri/injection $out/lib/Dorion
cp -r src $out/lib/Dorion
# Modify the desktop file
mkdir -p "$out/lib/Dorion"
ln -s "$out/lib/Dorion" "$out/lib/dorion"
rm -rf "$out/lib/Dorion/injection"
cp -r src-tauri/injection "$out/lib/Dorion"
cp -r src "$out/lib/Dorion"
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
desktop-file-edit \
--set-comment "Tiny alternative Discord client" \
--set-key="Exec" --set-value="Dorion %U" \
@@ -169,7 +178,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
--set-key="Keywords" --set-value="dorion;discord;vencord;chat;im;vc;ds;dc;dsc;tauri;" \
--set-key="Terminal" --set-value="false" \
--set-key="MimeType" --set-value="x-scheme-handler/discord" \
$out/share/applications/Dorion.desktop
"$out/share/applications/Dorion.desktop"
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
makeBinaryWrapper "$out/Applications/Dorion.app/Contents/MacOS/Dorion" "$out/bin/Dorion"
'';
# error: failed to run custom build command for `Dorion v6.5.3 (/build/source/src-tauri)`
@@ -200,7 +212,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
griffi-gh
getchoo
];
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
sourceProvenance = [
lib.sourceTypes.binaryBytecode # actually, minified JS
lib.sourceTypes.fromSource
pkgs/by-name/el/elogind/package.nix
+9
View File
@@ -35,6 +35,9 @@
enableSystemd ? false,
}:
let
system = "/run/current-system/sw";
in
stdenv.mkDerivation (finalAttrs: {
pname = "elogind";
version = "255.5";
@@ -83,6 +86,9 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace meson.build --replace-fail "install_emptydir(elogindstatedir)" ""
''
+ lib.optionalString (!enableSystemd) ''
substituteInPlace ./rules.d/71-seat.rules.in --replace-fail "{{BINDIR}}/udevadm" "${eudev}/bin/udevadm"
'';
patches = [
@@ -148,6 +154,9 @@ stdenv.mkDerivation (finalAttrs: {
(lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d")
(lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services")
(lib.mesonOption "sysconfdir" "${placeholder "out"}/etc")
(lib.mesonOption "halt-path" "${system}/bin/halt")
(lib.mesonOption "poweroff-path" "${system}/bin/poweroff")
(lib.mesonOption "reboot-path" "${system}/bin/reboot")
(lib.mesonBool "utmp" (!stdenv.hostPlatform.isMusl))
(lib.mesonEnable "xenctrl" false)
];
pkgs/by-name/fa/fastcap/fastcap-mulglobal-add-ualloc-declaration.patch
+12
View File
@@ -0,0 +1,12 @@
Fix implicit int truncating points in 64 bit systems.
--- a/src/mulGlobal.h
+++ b/src/mulGlobal.h
@@ -77,6 +77,8 @@
/* #define MALCORE malloc */
#define MALCORE ualloc
+extern char *ualloc(unsigned int);
+
/* counts of memory usage by multipole matrix type */
extern long memcount;
extern long memQ2M;
pkgs/by-name/fa/fastcap/package.nix
+10 -3
View File
@@ -19,6 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./fastcap-mulglobal-drop-conflicting-lib.patch
./fastcap-mulsetup-add-forward-declarations.patch
./fastcap-mulglobal-add-ualloc-declaration.patch
];
nativeBuildInputs = [
@@ -28,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace ./doc/Makefile \
--replace '/bin/rm' 'rm'
--replace-fail '/bin/rm' 'rm'
for f in "doc/*.tex" ; do
sed -i -E $f \
@@ -54,8 +55,14 @@ stdenv.mkDerivation (finalAttrs: {
"all"
];
# GCC 14 makes these errors by default
env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=implicit-int";
env.NIX_CFLAGS_COMPILE = toString [
# gcc14
"-Wno-error=implicit-function-declaration"
"-Wno-error=return-mismatch"
"-Wno-error=implicit-int"
# gcc15
"-std=gnu17"
];
outputs = [
"out"
pkgs/by-name/fl/flexget/package.nix
+2 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "flexget";
version = "3.19.8";
version = "3.19.10";
pyproject = true;
src = fetchFromGitHub {
owner = "Flexget";
repo = "Flexget";
tag = "v${finalAttrs.version}";
hash = "sha256-jscIOKqcG/ycb8WcFBheJm3XFBNgmY33iJsMmwL6M/U=";
hash = "sha256-G0Scv6XHjpxp5V0Ep+4itu+SmO/8jhR6LHvG/9scIPY=";
};
pythonRelaxDeps = true;
pkgs/by-name/fo/forgejo/lts.nix
+4 -4
View File
@@ -1,8 +1,8 @@
import ./generic.nix {
version = "11.0.11";
hash = "sha256-UZJW6C3Vn/e1KJEiyUI3o+/2xvKubjv+j1Lujmse//w=";
npmDepsHash = "sha256-kh7/xZPr5Y8CzGs8hop0a9JNPzmB3w2FPpCb+xOCz0c=";
vendorHash = "sha256-BL6wa+f+qFbDuHImMvAgwsqOTfV6Zt4oMBrOBI1sh1o=";
version = "11.0.12";
hash = "sha256-akPRq8quzdx8TU8NC/uxvngEl/fl/JjM1FcVhlHxcXo=";
npmDepsHash = "sha256-2COWPQM1iKpNG2TbPIv2zXXe28tsmuVc6IhkUeORBsU=";
vendorHash = "sha256-v1UZwhgZglJvIkEfO7662lKhdO3AxH+DGN70ziWfXG0=";
lts = true;
nixUpdateExtraArgs = [
"--override-filename"
pkgs/by-name/fo/forgejo/package.nix
+4 -4
View File
@@ -1,8 +1,8 @@
import ./generic.nix {
version = "14.0.3";
hash = "sha256-WE0CUwF5GBUr6+kUeHyPa0XPy5uigol/74eQhQQjBQA=";
npmDepsHash = "sha256-tJmX6VO7T6T4egy+Z2RZhe+/6ZfS6ZHFETfALmfAli4=";
vendorHash = "sha256-TpRVaXNlfnmFu8EdvKN8/mioLeQkghCy0nMWvRB6sYQ=";
version = "14.0.4";
hash = "sha256-kw3oN/Kr+SYF1vVbStaWWV59Pw75mEeF4eUYljI1f+0=";
npmDepsHash = "sha256-TjohWmdEZII0ti/T37kQ04Lkoy79VbY02hE1hxrWYx8=";
vendorHash = "sha256-Dm+aZMPjrqfHSLzkd9HHTuM8wVLtGpT2Nf5frWtYW10=";
lts = false;
nixUpdateExtraArgs = [
"--override-filename"
pkgs/by-name/fo/fosrl-pangolin/package.nix
+7 -4
View File
@@ -29,22 +29,25 @@ in
buildNpmPackage (finalAttrs: {
pname = "pangolin";
version = "1.16.2";
version = "1.17.0";
src = fetchFromGitHub {
owner = "fosrl";
repo = "pangolin";
tag = finalAttrs.version;
hash = "sha256-pWD2VinfkCiSSP6/einXgduKQ8lzWdHlrj2eqUU/x6Y=";
hash = "sha256-E0GfYznHj4CKsRWQm6zHTAJ8hJw9ieFoKIOT9tcumYQ=";
};
npmDepsHash = "sha256-CwS26eRAIuxJ2fekRRapDWYAOHXPV0mIX/by4uW2ZOM=";
npmDepsHash = "sha256-DyPfylne9Ku7sEUNN0LLlN0EOnCjcklsh+F6YP+rXv4=";
nativeBuildInputs = [
esbuild
makeWrapper
];
# dependency resolution is borked
npmFlags = [ "--legacy-peer-deps" ];
# Replace the googleapis.com Inter font with a local copy from Nixpkgs.
# Based on pkgs.nextjs-ollama-llm-ui.
postPatch = ''
@@ -57,7 +60,7 @@ buildNpmPackage (finalAttrs: {
"const inter = localFont({ src: './Inter.ttf' });"
substituteInPlace server/lib/consts.ts --replace-fail \
'export const APP_VERSION = "1.16.0";' \
'export const APP_VERSION = "1.17.0";' \
'export const APP_VERSION = "${finalAttrs.version}";'
cp "${inter}/share/fonts/truetype/InterVariable.ttf" src/app/Inter.ttf
pkgs/by-name/fr/frankenphp/package.nix
+3 -3
View File
@@ -30,13 +30,13 @@ let
in
buildGoModule (finalAttrs: {
pname = "frankenphp";
version = "1.12.1";
version = "1.12.2";
src = fetchFromGitHub {
owner = "php";
repo = "frankenphp";
tag = "v${finalAttrs.version}";
hash = "sha256-Bna8hp0wWlSbYR0GwGSl+ermFbmgSdgOqqYNqAr/XTc=";
hash = "sha256-wXBqUxGUvgfX2XmygBMZ6UEDxy8pyjcl+yob9egU8qw=";
};
sourceRoot = "${finalAttrs.src.name}/caddy";
@@ -44,7 +44,7 @@ buildGoModule (finalAttrs: {
# frankenphp requires C code that would be removed with `go mod tidy`
# https://github.com/golang/go/issues/26366
proxyVendor = true;
vendorHash = "sha256-aUILdXS6XNAnO3MIi+VBq3gqfSohhK3KHpMoSNKAtYs=";
vendorHash = "sha256-nfDKg1erdErCVankdoqr1u5c2+lkgXU2tEgF3PDyTmU=";
buildInputs = [
phpUnwrapped
pkgs/by-name/fs/fselect/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "fselect";
version = "0.9.3";
version = "0.10.0";
src = fetchFromGitHub {
owner = "jhspetersson";
repo = "fselect";
rev = finalAttrs.version;
sha256 = "sha256-NNDWKjO0A6ETIC+6Eg6LqyrwwErbP8362YzzNJYgtlE=";
sha256 = "sha256-2YLWFUDwmurQAkoYB0KNjCEhwDNAUIAkgw6+lpU7DDA=";
};
cargoHash = "sha256-lDN3b5skS5+e1Lz3StBqW+yTN2dVxy9bWZ5z69o5z7s=";
cargoHash = "sha256-7dyMzlrlhU4yuEd9sNce2QoIB8dWjpcNr0mnIZxjC3U=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
pkgs/by-name/ga/gaphor/fix-dulwich-api.patch
+29
View File
@@ -0,0 +1,29 @@
From 7f4f7fcd97acef841e046191d98c900b61b78c17 Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sat, 4 Apr 2026 15:46:25 -0400
Subject: [PATCH] Fix dulwich porcelain API
---
gaphor/storage/tests/fixtures.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gaphor/storage/tests/fixtures.py b/gaphor/storage/tests/fixtures.py
index d071e4556f..4dd0c60bf1 100644
--- a/gaphor/storage/tests/fixtures.py
+++ b/gaphor/storage/tests/fixtures.py
@@ -16,11 +16,13 @@ def commit_all(message):
main_ref = commit_all("Initial commit")
porcelain.branch_create(repo, "branch")
- porcelain.checkout_branch(repo, "branch")
+ porcelain.switch(repo, "branch")
filename.write_text(their_text, encoding="utf-8")
branch_oid = commit_all("Branch commit")
- porcelain.checkout_branch(repo, main_ref)
+ # OID + detach=True: works when default branch is not "main" (e.g. older
+ # Dulwich uses "master"); "git merge" still runs on HEAD.
+ porcelain.switch(repo, main_ref, detach=True)
filename.write_text(our_text, encoding="utf-8")
commit_all("Second commit")
pkgs/by-name/ga/gaphor/package.nix
+6
View File
@@ -23,6 +23,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
hash = "sha256-0Z0RFQrN2g0beV2konZBfMroeNtbT+sPRsWlRvQFYBk=";
};
patches = [
# from https://github.com/gaphor/gaphor/pull/4236
# please remove after next update
./fix-dulwich-api.patch
];
pythonRelaxDeps = [
"pydot"
"pygobject"
pkgs/by-name/ga/gargoyle/package.nix
+4 -10
View File
@@ -3,7 +3,6 @@
stdenv,
fetchFromGitHub,
fetchDebianPatch,
fetchpatch,
cmake,
pkg-config,
fluidsynth,
@@ -20,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gargoyle";
version = "2023.1";
version = "2026.1.1";
src = fetchFromGitHub {
owner = "garglk";
repo = "garglk";
tag = finalAttrs.version;
hash = "sha256-XsN5FXWJb3DSOjipxr/HW9R7QS+7iEaITERTrbGEMwA=";
hash = "sha256-cBFsxbXQa2xqCwW6Gd90vupAykkHvRjeM5yjA383doQ=";
};
patches = [
@@ -37,17 +36,12 @@ stdenv.mkDerivation (finalAttrs: {
patch = "ftbfs_gcc14.patch";
hash = "sha256-eMx/RlUpq5Ez+1L8VZo40Y3h2ZKkqiQEmKTlkZRMXnI=";
})
(fetchpatch {
name = "cmake4-fix";
url = "https://github.com/garglk/garglk/commit/8d976852e2db0215e9cf4f926e626f1aa766f751.patch?full_index=1";
hash = "sha256-lJAuiOErSp3oDmeoqrfCdnHH816VLYiVthIG4U8BJ5E=";
})
];
postPatch = ''
substituteInPlace garglk/garglk.pc.in \
--replace "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@" \
--replace "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
--replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@" \
--replace-fail "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
'';
nativeBuildInputs = [
pkgs/by-name/go/gotenberg/package.nix
+2 -2
View File
@@ -24,7 +24,7 @@ let
in
buildGo126Module (finalAttrs: {
pname = "gotenberg";
version = "8.29.1";
version = "8.30.1";
outputs = [
"out"
@@ -35,7 +35,7 @@ buildGo126Module (finalAttrs: {
owner = "gotenberg";
repo = "gotenberg";
tag = "v${finalAttrs.version}";
hash = "sha256-Sgpx4ewBe88RuXRWi7JEgCAHjtpt3+8uo1ZFcXfPYs4=";
hash = "sha256-kK+l1v+G8G7oBR8DVsROD3Z7lymiFZrJY3K0W9G9npI=";
};
vendorHash = "sha256-XhKf0Kucp6bGjw3UXXV86gsyaDyk5nS2acc4PgVs9yw=";
pkgs/by-name/gp/gpxsee/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gpxsee";
version = "16.0";
version = "16.2";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
tag = finalAttrs.version;
hash = "sha256-kZLIDgC1XGZlFyTeZYtbIe684Jnh5eJvlwTDlPbmei8=";
hash = "sha256-7zEk8cFYgDNlRpXkgGVBj9XMmvOWDS++C8vCSP4DL1Q=";
};
buildInputs = [
pkgs/by-name/ha/harper/package.nix
+3 -3
View File
@@ -8,18 +8,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "harper";
version = "1.12.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "Automattic";
repo = "harper";
rev = "v${finalAttrs.version}";
hash = "sha256-PIUrOwKiLZyeHceOUK7gSylhO815gyj7/XERGGGYAsA=";
hash = "sha256-3NwQOs0G0b13dnCN0oif863/BJ2zAUFXsF9TpFeMDLA=";
};
buildAndTestSubdir = "harper-ls";
cargoHash = "sha256-79wUwINGkhHSmb+0Mq+x+evZNLfhNtWoRgoJHhIlw90=";
cargoHash = "sha256-+WUmNmFBuk9lQsUXYBEpTo49Ygul0BPRY0kcHCCC0GU=";
passthru.updateScript = nix-update-script { };
pkgs/by-name/im/immich/package.nix
+3 -3
View File
@@ -115,20 +115,20 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "immich";
version = "2.7.2";
version = "2.7.3";
src = fetchFromGitHub {
owner = "immich-app";
repo = "immich";
tag = "v${finalAttrs.version}";
hash = "sha256-I3+pmG6tO01tT9H/WyEVB+FRT+78yllIJfVT+fEIo2c=";
hash = "sha256-z3Z2/X9LT0iZtFVHUuVbWPZIPJUMbJGn5NmHCDxNVj0=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
inherit pnpm;
fetcherVersion = 3;
hash = "sha256-Xyhsxyk7ZZD9KgqYAAiJPtgEC6SqqT4dIjthInFkO+Q=";
hash = "sha256-k8ZG1SKRKymG4fau46SrGjkIPM3JK+xIUPMFaE2CXVg=";
};
postPatch = ''
pkgs/by-name/ko/komikku/package.nix
+2 -2
View File
@@ -24,14 +24,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "komikku";
version = "50.0.1";
version = "50.1.0";
pyproject = false;
src = fetchFromCodeberg {
owner = "valos";
repo = "Komikku";
tag = "v${finalAttrs.version}";
hash = "sha256-9OxksblhdgGZYgr+lKEt0Kwpoa360ODgdbZrYpiOwkI=";
hash = "sha256-F98wvRMpDJSeI6OQYe40hKrnzAzetU7FsmJ4fPdHBWE=";
};
nativeBuildInputs = [
pkgs/by-name/ky/kythe/package.nix
+2 -2
View File
@@ -7,12 +7,12 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "0.0.74";
version = "0.0.75";
pname = "kythe";
src = fetchurl {
url = "https://github.com/kythe/kythe/releases/download/v${finalAttrs.version}/kythe-v${finalAttrs.version}.tar.gz";
sha256 = "sha256-UqnG6BESNwQ7jQthJ2N/DrjSujp3bkdJsDbpEew1Kc4=";
sha256 = "sha256-ZFZh3kt32UeqAl8AYbvrwjhqRVWtgyI/3k+Vb4/jAGo=";
};
buildInputs = [ binutils ];
pkgs/by-name/li/libosmo-netif/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libosmo-netif";
version = "1.6.1";
version = "1.7.0";
src = fetchFromGitHub {
owner = "osmocom";
repo = "libosmo-netif";
rev = finalAttrs.version;
hash = "sha256-0INgJV5fS6VdMsJqjlVc3lGMBdLP7cI+Ghc4WEh6AuU=";
hash = "sha256-4VDXqi5tK3zaCDQgsWlN34m/odgE6xWXgNaKpG0SpnU=";
};
postPatch = ''
pkgs/by-name/li/libosmo-sigtran/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libosmo-sigtran";
version = "2.1.2";
version = "2.2.1";
# fetchFromGitea hangs
src = fetchgit {
url = "https://gitea.osmocom.org/osmocom/libosmo-sigtran.git";
rev = finalAttrs.version;
hash = "sha256-/TxD7lc/htm1c24rKfnlYxGsVpxawi3nh7m34mRRhUA=";
hash = "sha256-EBBSoSX5tImTLRP7Klhjj/YM8+4RyyJClymIXQK8DgE=";
};
configureFlags = [ "--with-systemdsystemunitdir=$out" ];
pkgs/by-name/li/libosmoabis/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libosmoabis";
version = "2.0.1";
version = "2.1.0";
src = fetchFromGitHub {
owner = "osmocom";
repo = "libosmo-abis";
rev = finalAttrs.version;
hash = "sha256-OdmegQXdbpwNBepY+7MeUjaEguVo2q9b8lSkRmlXHEc=";
hash = "sha256-jJD7XvwOBisN6womVSrY+V78KpFZ7WBvvh757dAS8y0=";
};
configureFlags = [ "enable_dahdi=false" ];
pkgs/by-name/li/libosmocore/package.nix
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libosmocore";
version = "1.11.3";
version = "1.13.1";
src = fetchFromGitHub {
owner = "osmocom";
repo = "libosmocore";
rev = finalAttrs.version;
hash = "sha256-4fb7vmA3iQuQZ+T2Gp0B7bc5+CYE1cTR3IoFwOde7SE=";
hash = "sha256-lHPpV3wmsJFzanMUF6dhhmKTVCIz5MOfqr8U23sm6eI=";
};
postPatch = ''
pkgs/by-name/li/lilypond-unstable/package.nix
+2
View File
@@ -14,6 +14,8 @@ lilypond.overrideAttrs (
hash = "sha256-UFuL8TZ7uLZhXgFoMGxAye04dNcvrw1gqQMOnE4P2fc=";
};
patches = [ ];
passthru.updateScript = writeScript "update-lilypond-unstable" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts curl
pkgs/by-name/li/lilypond/package.nix
+14
View File
@@ -41,6 +41,7 @@
]
),
writeScript,
fetchpatch2,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -78,6 +79,18 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail "mem=mf2pt1" "mem=$PWD/mf/mf2pt1"
'';
patches = [
# fixes #475503
# distilled version of https://gitweb.git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commit;h=f2192eb294e
# so, remove once that commit reaches a stable release
(fetchpatch2 {
name = "fix-clang-21-build.patch";
url = "https://cgit.freebsd.org/ports/plain/print/lilypond/files/patch-lily_include_smobs.hh?id=58bab68c706086774b17dcacc61c8fd37ecc8a15";
extraPrefix = ""; # adds old/new prefixes to process properly in patchPhase
hash = "sha256-nT8+nYU+m6lLTvHEvSIpG/yAwy1Omb6+4Z+NGwEVE4Q=";
})
];
strictDeps = true;
depsBuildBuild = [
@@ -141,6 +154,7 @@ stdenv.mkDerivation (finalAttrs: {
ofl # mf/
];
maintainers = with lib.maintainers; [
eclairevoyant
yurrriq
];
platforms = lib.platforms.all;
pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix
-84
View File
@@ -1,84 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
writeShellScriptBin,
gcc-arm-embedded,
pynitrokey,
python3,
# The make target to run
makeTarget ? "release-buildv",
# Whether the firmware should include the production public key for the bootloader
release ? true,
}:
let
# The latest release is found on the releases page; do not rely on the latest tag.
# They normally contain the suffix `.nitrokey`.
# https://github.com/Nitrokey/nitrokey-fido2-firmware/releases
version = "2.4.1";
# The firmware version is pulled from `git` so we stub it here to avoid pulling the whole program.
fakeGit = writeShellScriptBin "git" ''
echo "${version}.nitrokey"
'';
in
stdenv.mkDerivation {
pname = "nitrokey-fido2-firmware";
inherit version;
src = fetchFromGitHub {
owner = "Nitrokey";
repo = "nitrokey-fido2-firmware";
tag = "${version}.nitrokey";
hash = "sha256-7AsnxRf8mdybI6Mup2mV01U09r5C/oUX6fG2ymkkOOo=";
fetchSubmodules = true;
};
postPatch = ''
# Remove a duplicate firmware_version definition. Without this,
# firmware_version is defined multiple times, triggering a build error.
substituteInPlace fido2/version.h \
--replace-fail "const version_t firmware_version ;" ""
'';
nativeBuildInputs = [
fakeGit
# only gcc-arm-embedded includes libc_nano.a
gcc-arm-embedded
pynitrokey
python3
];
preBuild = ''
cd targets/stm32l432
'';
makeFlags = [
"${makeTarget}"
"RELEASE=${toString release}"
];
installPhase = ''
runHook preInstall
cp -r release $out
runHook postInstall
'';
meta = {
description = "Firmware for the Nitrokey FIDO2 device";
homepage = "https://github.com/Nitrokey/nitrokey-fido2-firmware";
maintainers = with lib.maintainers; [
amerino
kiike
imadnyc
];
license = with lib.licenses; [
asl20
mit
];
platforms = lib.platforms.unix;
};
}
pkgs/by-name/ob/obdautodoctor/package.nix
+70
View File
@@ -0,0 +1,70 @@
{
stdenv,
lib,
fetchzip,
autoPatchelfHook,
copyDesktopItems,
makeDesktopItem,
kdePackages,
bluez,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "obdautodoctor";
version = "5.1.8";
src = fetchzip {
url = "https://cdn2.obdautodoctor.com/release/obd-auto-doctor_${finalAttrs.version}_amd64.tar.gz";
hash = "sha256-3qht1G2Qi+IhL/x9MMEAwM0exCav5iKtnZXTl6cwx3E=";
};
buildInputs = [
stdenv.cc.cc.lib
kdePackages.qtbase
bluez
];
nativeBuildInputs = [
autoPatchelfHook
kdePackages.wrapQtAppsHook
copyDesktopItems
];
dontBuild = true;
installPhase = ''
runHook preInstall
install -D obdautodoctor $out/bin/obdautodoctor
install -D obdautodoctor.png $out/share/icons/hicolor/128x128/apps/obdautodoctor.png
install -D license.txt $out/share/licenses/obdautodoctor/license.txt
install -D lgpl-3.0.txt $out/share/licenses/obdautodoctor/lgpl-3.0.txt
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = "obdautodoctor";
desktopName = "OBD Auto Doctor";
comment = "OBD Car Diagnostics Software";
icon = "obdautodoctor";
exec = "obdautodoctor";
terminal = false;
categories = [
"Qt"
"Utility"
];
})
];
meta = {
description = "Diagnose problems, reset the Check Engine Light, and monitor your car's performance with ease";
homepage = "https://www.obdautodoctor.com/";
platforms = [ "x86_64-linux" ];
license = lib.licenses.unfree;
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
maintainers = with lib.maintainers; [ leoflo ];
};
})
pkgs/by-name/oc/octopus/package.nix
+2 -2
View File
@@ -31,13 +31,13 @@ assert (blas.isILP64 == arpack.isILP64);
stdenv.mkDerivation (finalAttrs: {
pname = "octopus";
version = "16.2";
version = "16.3";
src = fetchFromGitLab {
owner = "octopus-code";
repo = "octopus";
tag = finalAttrs.version;
hash = "sha256-L97igB+bdZ19zpbffHi8DVSJXKtUyDqauUB+l5zzFwQ=";
hash = "sha256-3DYfgoKznIWY8/HZByzz0MX03QzbivU9B3gDyNMnTQ4=";
};
outputs = [
pkgs/by-name/og/ogre-next/package.nix
+61 -6
View File
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
fetchpatch2,
testers,
cmake,
ninja,
@@ -21,6 +22,7 @@
openvr,
rapidjson,
zziplib,
apple-sdk_15,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ogre-next";
@@ -41,6 +43,35 @@ stdenv.mkDerivation (finalAttrs: {
})
];
postPatch = ''
# OgreMain/CMakeLists.txt has a macOS post-build block that uses `ditto`
# (a macOS system tool unavailable in the Nix sandbox) to copy headers
# into an Ogre.framework bundle. This block runs unconditionally on
# non-iOS macOS — it is not gated by OGRE_BUILD_LIBS_AS_FRAMEWORKS.
# Wrap it in a framework guard so it is skipped when frameworks are
# disabled, avoiding the missing `ditto` and the unnecessary framework
# directory structure.
substituteInPlace OgreMain/CMakeLists.txt \
--replace-fail \
'set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)")' \
'if (OGRE_BUILD_LIBS_AS_FRAMEWORKS)
set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)")' \
--replace-fail \
'ogre_config_framework(''${OGRE_NEXT}Main)' \
'endif ()
ogre_config_framework(''${OGRE_NEXT}Main)'
# Remove Xcode-centric CMAKE_OSX_SYSROOT and CMAKE_OSX_ARCHITECTURES overrides.
# Nix stdenv already sets these correctly via apple-sdk.
substituteInPlace CMakeLists.txt \
--replace-fail 'set(XCODE_ATTRIBUTE_SDKROOT macosx)' "" \
--replace-fail 'set(CMAKE_OSX_SYSROOT macosx)' "" \
--replace-fail \
'execute_process(COMMAND xcodebuild -version -sdk "''${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT)' "" \
--replace-fail \
'string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "''${CMAKE_OSX_SYSROOT}")' ""
'';
nativeBuildInputs = [
cmake
pkg-config
@@ -53,7 +84,6 @@ stdenv.mkDerivation (finalAttrs: {
zziplib
zlib
tinyxml
openvr
rapidjson
]
++ lib.optionals stdenv.hostPlatform.isLinux [
@@ -63,7 +93,11 @@ stdenv.mkDerivation (finalAttrs: {
libxrandr
libxt
libxcb
];
# openvr is broken on darwin
openvr
]
# apple-sdk_15 provides Metal, Cocoa, and OpenGL frameworks
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_15;
# TODO: Figure out Vulkan plugin deps
@@ -73,18 +107,39 @@ stdenv.mkDerivation (finalAttrs: {
# Use STB instead of freeimage since the latter is marked as insecure
(lib.cmakeBool "OGRE_CONFIG_ENABLE_FREEIMAGE" false)
(lib.cmakeBool "OGRE_CONFIG_ENABLE_STBI" true)
# Framework bundles are incompatible with the Nix store
(lib.cmakeBool "OGRE_BUILD_LIBS_AS_FRAMEWORKS" false)
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# GL3Plus requires Khronos headers not available on darwin; Metal is the
# primary render system on macOS
(lib.cmakeBool "OGRE_BUILD_RENDERSYSTEM_GL3PLUS" false)
]
# Both NEON and SSE2 SIMD cause build failures on aarch64
++ lib.optionals stdenv.hostPlatform.isAarch64 [
(lib.cmakeBool "OGRE_SIMD_NEON" false)
(lib.cmakeBool "OGRE_SIMD_SSE2" false)
];
passthru.tests.pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
versionCheck = true;
};
meta = {
description = "3D Object-Oriented Graphics Rendering Engine";
homepage = "https://www.ogre3d.org/";
maintainers = with lib.maintainers; [
marcin-serwin
];
platforms = lib.platforms.linux;
pkgConfigModules = [
"OGRE"
"OGRE-Hlms"
"OGRE-MeshLodGenerator"
"OGRE-Overlay"
];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
license = lib.licenses.mit;
# build problems around NEON intrinsics
broken = stdenv.hostPlatform.isAarch64;
};
})
pkgs/by-name/oh/oh-my-posh/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
}:
buildGoModule (finalAttrs: {
pname = "oh-my-posh";
version = "29.9.2";
version = "29.10.0";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = "oh-my-posh";
tag = "v${finalAttrs.version}";
hash = "sha256-fPAbb2kZtGWGV8OytmgeQH6/HaSglGxZyzXI+Zg/VAk=";
hash = "sha256-+j0et6rwTX3gPqky99NjvBf5i7YhbjbJQ8CvrhYKvRA=";
};
vendorHash = "sha256-241naWsj/PwR0+JgRJA/Fa98IVmueg4d2lR0OlWNLQw=";
vendorHash = "sha256-peUWhtxKCDT3fE7CCir6l3XTjGvSMQFfkCZFHoxpBdw=";
sourceRoot = "${finalAttrs.src.name}/src";
pkgs/by-name/op/openpbs/2709.patch
-190
View File
@@ -1,190 +0,0 @@
From 236aa3fa2f5ee68a8be21a5cc3a729fb90539f1e Mon Sep 17 00:00:00 2001
From: Eisuke Kawashima <e-kwsm@users.noreply.github.com>
Date: Sun, 25 May 2025 20:38:53 +0900
Subject: [PATCH] fix: fix -Wincompatible-pointer-types
fix #2679
---
src/include/pbs_nodes.h | 4 ++--
src/include/svrfunc.h | 2 +-
src/include/work_task.h | 2 +-
src/lib/Libattr/attr_fn_acl.c | 2 +-
src/lib/Libnet/net_server.c | 2 +-
src/server/hook_func.c | 2 +-
src/server/issue_request.c | 6 +++---
src/server/node_manager.c | 2 +-
src/server/req_jobobit.c | 2 +-
src/server/req_manager.c | 2 +-
src/server/svr_movejob.c | 2 +-
11 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/include/pbs_nodes.h b/src/include/pbs_nodes.h
index bc206fdb77..5dbf1a3268 100644
--- a/src/include/pbs_nodes.h
+++ b/src/include/pbs_nodes.h
@@ -391,7 +391,7 @@ extern void set_vnode_state(struct pbsnode *, unsigned long, enum vnode_state_op
extern struct resvinfo *find_vnode_in_resvs(struct pbsnode *, enum vnode_degraded_op);
extern void free_rinf_list(struct resvinfo *);
extern void degrade_offlined_nodes_reservations(void);
-extern void degrade_downed_nodes_reservations(void);
+extern void degrade_downed_nodes_reservations(struct work_task *);
extern int mod_node_ncpus(struct pbsnode *pnode, long ncpus, int actmode);
extern int initialize_pbsnode(struct pbsnode *, char *, int);
@@ -461,7 +461,7 @@ struct pbsnode *node_recov_db(char *nd_name, struct pbsnode *pnode);
extern int add_mom_to_pool(mominfo_t *);
extern void reset_pool_inventory_mom(mominfo_t *);
extern vnpool_mom_t *find_vnode_pool(mominfo_t *pmom);
-extern void mcast_msg();
+extern void mcast_msg(struct work_task *);
int get_job_share_type(struct job *pjob);
#endif
diff --git a/src/include/svrfunc.h b/src/include/svrfunc.h
index cc555fa88d..34f9958035 100644
--- a/src/include/svrfunc.h
+++ b/src/include/svrfunc.h
@@ -311,7 +311,7 @@ extern int svr_connect(pbs_net_t, unsigned int, void (*)(int), enum conn_type, i
#ifdef _WORK_TASK_H
extern void release_req(struct work_task *);
#ifdef _BATCH_REQUEST_H
-extern int issue_Drequest(int, struct batch_request *, void (*)(), struct work_task **, int);
+extern int issue_Drequest(int, struct batch_request *, void (*)(struct work_task *), struct work_task **, int);
#endif /* _BATCH_REQUEST_H */
#endif /* _WORK_TASK_H */
diff --git a/src/include/work_task.h b/src/include/work_task.h
index 3cceb659b0..4d81795a41 100644
--- a/src/include/work_task.h
+++ b/src/include/work_task.h
@@ -90,7 +90,7 @@ struct work_task {
int wt_aux2; /* optional info 2: e.g. *real* child pid (windows), tpp msgid etc */
};
-extern struct work_task *set_task(enum work_type, long event, void (*func)(), void *param);
+extern struct work_task *set_task(enum work_type, long event, void (*func)(struct work_task *), void *param);
extern int convert_work_task(struct work_task *ptask, enum work_type);
extern void clear_task(struct work_task *ptask);
extern void dispatch_task(struct work_task *);
diff --git a/src/lib/Libattr/attr_fn_acl.c b/src/lib/Libattr/attr_fn_acl.c
index 0ef2d5328e..b0373eafeb 100644
--- a/src/lib/Libattr/attr_fn_acl.c
+++ b/src/lib/Libattr/attr_fn_acl.c
@@ -97,7 +97,7 @@ static int user_order(char *old, char *new);
static int group_order(char *old, char *new);
static int
set_allacl(attribute *, attribute *, enum batch_op,
- int (*order_func)());
+ int (*order_func)(char *, char *));
/* for all decode_*acl() - use decode_arst() */
/* for all encode_*acl() - use encode_arst() */
diff --git a/src/lib/Libnet/net_server.c b/src/lib/Libnet/net_server.c
index 045acd303d..b9f6470dbd 100644
--- a/src/lib/Libnet/net_server.c
+++ b/src/lib/Libnet/net_server.c
@@ -104,7 +104,7 @@ static char logbuf[256];
/* Private function within this file */
static int conn_find_usable_index(int);
static int conn_find_actual_index(int);
-static void accept_conn();
+static void accept_conn(int);
static void cleanup_conn(int);
/**
diff --git a/src/server/hook_func.c b/src/server/hook_func.c
index b9534dfb9a..e0d0e52745 100644
--- a/src/server/hook_func.c
+++ b/src/server/hook_func.c
@@ -229,7 +229,7 @@ extern pbs_list_head svr_execjob_preresume_hooks;
extern time_t time_now;
extern struct python_interpreter_data svr_interp_data;
extern pbs_list_head task_list_event;
-extern struct work_task *add_mom_deferred_list(int stream, mominfo_t *minfo, void (*func)(), char *msgid, void *parm1, void *parm2);
+extern struct work_task *add_mom_deferred_list(int stream, mominfo_t *minfo, void (*func)(struct work_task *), char *msgid, void *parm1, void *parm2);
extern char *path_rescdef;
extern char *path_hooks_rescdef;
diff --git a/src/server/issue_request.c b/src/server/issue_request.c
index 6bef14553b..6cf28dab76 100644
--- a/src/server/issue_request.c
+++ b/src/server/issue_request.c
@@ -201,7 +201,7 @@ reissue_to_svr(struct work_task *pwt)
/* either timed-out or got hard error, tell post-function */
pwt->wt_aux = -1; /* seen as error by post function */
pwt->wt_event = -1; /* seen as connection by post func */
- ((void (*)()) pwt->wt_parm2)(pwt);
+ ((void (*)(struct work_task *)) pwt->wt_parm2)(pwt);
}
return;
}
@@ -326,7 +326,7 @@ release_req(struct work_task *pwt)
*
*/
struct work_task *
-add_mom_deferred_list(int stream, mominfo_t *minfo, void (*func)(), char *msgid, void *parm1, void *parm2)
+add_mom_deferred_list(int stream, mominfo_t *minfo, void (*func)(struct work_task *), char *msgid, void *parm1, void *parm2)
{
struct work_task *ptask = NULL;
@@ -394,7 +394,7 @@ add_mom_deferred_list(int stream, mominfo_t *minfo, void (*func)(), char *msgid,
*
*/
int
-issue_Drequest(int conn, struct batch_request *request, void (*func)(), struct work_task **ppwt, int prot)
+issue_Drequest(int conn, struct batch_request *request, void (*func)(struct work_task *), struct work_task **ppwt, int prot)
{
struct attropl *patrl;
struct work_task *ptask;
diff --git a/src/server/node_manager.c b/src/server/node_manager.c
index a6fbf5805e..62661a2361 100644
--- a/src/server/node_manager.c
+++ b/src/server/node_manager.c
@@ -7923,7 +7923,7 @@ degrade_offlined_nodes_reservations(void)
* @par MT-safe: No
*/
void
-degrade_downed_nodes_reservations(void)
+degrade_downed_nodes_reservations(struct work_task *)
{
int i;
struct pbsnode *pn;
diff --git a/src/server/req_jobobit.c b/src/server/req_jobobit.c
index 37581cead4..034c3c0680 100644
--- a/src/server/req_jobobit.c
+++ b/src/server/req_jobobit.c
@@ -1337,7 +1337,7 @@ job_obit(ruu *pruu, int stream)
job *pjob;
svrattrl *patlist;
struct work_task *ptask;
- void (*eojproc)();
+ void (*eojproc)(struct work_task *);
char *mailmsg = NULL;
char *msg = NULL;
diff --git a/src/server/req_manager.c b/src/server/req_manager.c
index 14a50de62e..ac617d7be8 100644
--- a/src/server/req_manager.c
+++ b/src/server/req_manager.c
@@ -3612,7 +3612,7 @@ check_resource_set_on_jobs_or_resvs(struct batch_request *preq, resource_def *pr
* helper function to send/update resourcedef file.
*/
static void
-timed_send_rescdef()
+timed_send_rescdef(struct work_task *)
{
send_rescdef(1); /* forcing with 1 to avoid failures due to intermittent file stamp race issues */
rescdef_wt_g = NULL;
diff --git a/src/server/svr_movejob.c b/src/server/svr_movejob.c
index c438d5d739..8947dc8c85 100644
--- a/src/server/svr_movejob.c
+++ b/src/server/svr_movejob.c
@@ -122,7 +122,7 @@ extern time_t time_now;
extern int svr_create_tmp_jobscript(job *pj, char *script_name);
extern int scheduler_jobs_stat;
extern char *path_hooks_workdir;
-extern struct work_task *add_mom_deferred_list(int stream, mominfo_t *minfo, void (*func)(), char *msgid, void *parm1, void *parm2);
+extern struct work_task *add_mom_deferred_list(int stream, mominfo_t *minfo, void (*func)(struct work_task *), char *msgid, void *parm1, void *parm2);
/**
* @brief
pkgs/by-name/op/openpbs/2711.patch
-58
View File
@@ -1,58 +0,0 @@
diff --git a/src/cmds/qstat.c b/src/cmds/qstat.c
index 440e37cb..cb7fe62c 100644
--- a/src/cmds/qstat.c
+++ b/src/cmds/qstat.c
@@ -76,7 +76,6 @@ extern char *tcl_atrsep;
/* default server */
char *def_server;
-static void states();
static char *cvtResvstate(char *);
static int cmp_est_time(struct batch_status *a, struct batch_status *b);
char *cnvt_est_start_time(char *start_time, int shortform);
diff --git a/src/cmds/qsub.c b/src/cmds/qsub.c
index f02bb5ef..54871a08 100644
--- a/src/cmds/qsub.c
+++ b/src/cmds/qsub.c
@@ -89,6 +89,7 @@
#include <assert.h>
#include <sys/un.h>
#include <syslog.h>
+#include <unistd.h>
#include "pbs_ifl.h"
#include "cmds.h"
#include "libpbs.h"
@@ -1944,7 +1945,6 @@ job_env_basic(void)
struct utsname uns;
#endif
int len = 0;
- char *getcwd();
/* Calculate how big to make the variable string. */
len = 0;
diff --git a/src/include/qmgr.h b/src/include/qmgr.h
index eb021c53..17ae6522 100644
--- a/src/include/qmgr.h
+++ b/src/include/qmgr.h
@@ -143,7 +143,7 @@ struct objname {
/* prototypes */
struct objname *commalist2objname(char *, int);
struct server *find_server(char *);
-struct server *make_connection();
+struct server *make_connection(char *);
struct server *new_server();
struct objname *new_objname();
struct objname *strings2objname(char **, int, int);
diff --git a/src/tools/pbs_tclWrap.c b/src/tools/pbs_tclWrap.c
index 558528ad..1a9dd1d4 100644
--- a/src/tools/pbs_tclWrap.c
+++ b/src/tools/pbs_tclWrap.c
@@ -273,7 +273,7 @@ int
GetREQ(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
{
int fd;
- char *ret, *getreq();
+ char *ret;
char *cmd;
cmd = Tcl_GetStringFromObj(objv[0], NULL);
pkgs/by-name/op/openpbs/package.nix
+6 -8
View File
@@ -39,13 +39,13 @@ let
in
stdenv.mkDerivation {
pname = "openpbs";
version = "23.06.06-unstable-2026-01-29";
version = "23.06.06-unstable-2026-04-02";
src = fetchFromGitHub {
owner = "openpbs";
repo = "openpbs";
rev = "cfd431b703e8cbe3bc99db6fbbcdd970625ef032";
hash = "sha256-NZoSZmcl9a/6YWHO7qRNknB6ii0JBLo5bOpHDRKeuwI=";
rev = "e395fe79388d5f77908eeb80e3bb73d848315449";
hash = "sha256-FQgps7vdxz4gIAEE333MvELWf+Qx7dhnpoH4hLwOp5Q=";
};
nativeBuildInputs = [
@@ -73,12 +73,10 @@ stdenv.mkDerivation {
munge
];
enableParallelBuilding = true;
# https://github.com/openpbs/openpbs/issues/2713
hardeningDisable = [ "fortify" ];
patches = [
./2709.patch
./2711.patch
];
enableParallelBuilding = true;
postPatch = ''
substituteInPlace src/cmds/scripts/Makefile.am --replace-fail "/etc/profile.d" "$out/etc/profile.d"
pkgs/by-name/os/osmo-bsc/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "osmo-bsc";
version = "1.13.3";
version = "1.14.1";
src = fetchFromGitHub {
owner = "osmocom";
repo = "osmo-bsc";
rev = finalAttrs.version;
hash = "sha256-2Go+93h1Z4FV9sESfjwCaee1m4jUq2eO8fxlZAwZVfM=";
hash = "sha256-8Fli6LGzOt6/0xQTRQ5X9I+0UkIAb1pAtX1xYSxOE2U=";
};
postPatch = ''
pkgs/by-name/os/osmo-bts/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "osmo-bts";
version = "1.9.0";
version = "1.11.0";
src = fetchFromGitHub {
owner = "osmocom";
repo = "osmo-bts";
rev = finalAttrs.version;
hash = "sha256-SvlkIvdyrXlaSJl+LbHovhIlnxsxpufJCy1wVCZbjWM=";
hash = "sha256-eqra1dh84c3mv4ISqrwe7dbhlawWNGvuYd1CDLAfwNk=";
};
postPatch = ''
pkgs/by-name/os/osmo-ggsn/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "osmo-ggsn";
version = "1.13.0";
version = "1.14.0";
src = fetchFromGitHub {
owner = "osmocom";
repo = "osmo-ggsn";
rev = finalAttrs.version;
hash = "sha256-qsBjoLyMlRgUjhX1tyI/MoHGmww1XUT3OMH4dVZzLU4=";
hash = "sha256-/t5BqZYbeQb2Aea7fSJSJ4ZY2kG/6BtqHeCfFdfo4VA=";
};
postPatch = ''
pkgs/by-name/os/osmo-hlr/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "osmo-hlr";
version = "1.9.1";
version = "1.9.2";
src = fetchFromGitHub {
owner = "osmocom";
repo = "osmo-hlr";
rev = finalAttrs.version;
hash = "sha256-yi4sgcX8WOWz7qw/jGvVCtIYe867uBzLps8gdG6ziOA=";
hash = "sha256-SYyL7evxxmXGwv2TLr8ZuIrbu+GliAyuz/sKTIveQvc=";
};
postPatch = ''
pkgs/by-name/os/osmo-mgw/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "osmo-mgw";
version = "1.14.0";
version = "1.15.0";
src = fetchFromGitHub {
owner = "osmocom";
repo = "osmo-mgw";
rev = finalAttrs.version;
hash = "sha256-Y/98K81US6McNu+JEJtMluJTvsv0DHJiyjMPJz8/35o=";
hash = "sha256-rRjr3Mw3ELp1o7QYDuU7mqZEeL2seo0xEONXpkP14SQ=";
};
postPatch = ''
pkgs/by-name/os/osmo-msc/package.nix
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "osmo-msc";
version = "1.14.0";
version = "1.15.0";
src = fetchFromGitHub {
owner = "osmocom";
repo = "osmo-msc";
rev = finalAttrs.version;
hash = "sha256-+Z49TqXLEeCy7Yj0qVg1hPFOD/x+4HnwDZxZoxoUjqI=";
hash = "sha256-kRPGtMVNODh03oCqqo/AbApWasxiLYo/A9GrD3ECfaE=";
};
postPatch = ''
pkgs/by-name/os/osmo-sgsn/package.nix
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "osmo-sgsn";
version = "1.13.0";
version = "1.13.1";
src = fetchFromGitHub {
owner = "osmocom";
repo = "osmo-sgsn";
rev = finalAttrs.version;
hash = "sha256-ht8ejeD2whV0Ww5G3coUntLrIp2S0gZBRS6kF7w9KZY=";
hash = "sha256-POitmYZNSGlnIm65VmqneDOyoN+OaB69Fk3iG7L1UXQ=";
};
postPatch = ''
pkgs/by-name/os/osmo-sip-connector/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "osmo-sip-connector";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "osmocom";
repo = "osmo-sip-connector";
rev = finalAttrs.version;
hash = "sha256-NmjaN28NnAIpMwUHCUS+7LJBwvCp48kyhmHRf6cU5WE=";
hash = "sha256-JOTUa1buj9qR8dnMZMLaxjSIrsLnr9g1yylkTgPcL4k=";
};
postPatch = ''
pkgs/by-name/pa/palemoon-bin/package.nix
+3 -3
View File
@@ -23,7 +23,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "palemoon-bin";
version = "34.1.0";
version = "34.2.0";
src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
@@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: {
{
gtk3 = fetchzip {
urls = urlRegionVariants "gtk3";
hash = "sha256-TMqk3XsNMAKfKvV1R/O2R+9bd2vnTM1qDhkVoohVCUU=";
hash = "sha256-FZSPpU1L2vIJ4nn7IFBJZTxz/grjBosKgA0IivnqWxU=";
};
gtk2 = fetchzip {
urls = urlRegionVariants "gtk2";
hash = "sha256-IDIJNQ3jAI0PW03mqXU9vc8xUBbNn+zCIQlJGEJp+Mk=";
hash = "sha256-ESdPzyEinGv1LKO/6TF8s7IumxhOwUrgdnl4JnA8/PY=";
};
};
pkgs/by-name/ph/phpunit/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
php.buildComposerProject2 (finalAttrs: {
pname = "phpunit";
version = "13.0.6";
version = "13.1.1";
src = fetchFromGitHub {
owner = "sebastianbergmann";
repo = "phpunit";
tag = finalAttrs.version;
hash = "sha256-leSHb+G5zzYOw0AbQRbB8bIcKS4kvIY/6TGDFBto/9o=";
hash = "sha256-M6O+jfS2B3QUPJoxrVHW8PmeTw77D+oDoLkDstyJ5Vs=";
};
vendorHash = "sha256-uUENOq9BEX0vZU3PBc7+nL4IkUx/R2QTO+COT6oNsPM=";
vendorHash = "sha256-vpUVKV8+Ymoir8YmyoyRqdvQnUtYp1+HmjEuPGtxRy0=";
passthru = {
updateScript = nix-update-script { };
pkgs/by-name/pl/plasticscm-client-core-unwrapped/package.nix
+2 -2
View File
@@ -12,11 +12,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "plasticscm-client-core-unwrapped";
version = "11.0.16.9973";
version = "11.0.16.9998";
src = fetchurl {
url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-client-core_${finalAttrs.version}_amd64.deb";
hash = "sha256-Pu9Q+lzgCeg3TZ6d+TvmJ3Z1Lr3UNJ20ByjovLpk+qw=";
hash = "sha256-pNuPV+DpOSE7WLbKmNCtr7Cnd/RCQGz95kcBqN7iIgA=";
nativeBuildInputs = [ dpkg ];
downloadToTemp = true;
recursiveHash = true;
pkgs/by-name/pl/plasticscm-client-gui-unwrapped/package.nix
+2 -2
View File
@@ -11,11 +11,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "plasticscm-client-gui-unwrapped";
version = "11.0.16.9973";
version = "11.0.16.9998";
src = fetchurl {
url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-client-gui_${finalAttrs.version}_amd64.deb";
hash = "sha256-NdX8XQCf3bRKbiRYnLRV89kC/kN7NUzeBqS5jlPhCLE=";
hash = "sha256-zDhAXgOq9Sqboly+tNH/afiS1BklHwQToDgZwIqMVtI=";
nativeBuildInputs = [ dpkg ];
downloadToTemp = true;
recursiveHash = true;
pkgs/by-name/pl/plasticscm-theme/package.nix
+1 -1
View File
@@ -11,7 +11,7 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "plasticscm-theme";
version = "11.0.16.9973";
version = "11.0.16.9998";
src = fetchurl {
url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-theme_${finalAttrs.version}_amd64.deb";
pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
+6 -4
View File
@@ -14,6 +14,7 @@
qrencode,
stripJavaArchivesHook,
tomlplusplus,
vulkan-headers,
zlib,
msaClientID ? null,
}:
@@ -21,19 +22,19 @@ let
libnbtplusplus = fetchFromGitHub {
owner = "PrismLauncher";
repo = "libnbtplusplus";
rev = "531449ba1c930c98e0bcf5d332b237a8566f9d78";
hash = "sha256-qhmjaRkt+O7A+gu6HjUkl7QzOEb4r8y8vWZMG2R/C6o=";
rev = "3538933614059f0f44388a2b16f3db25ce42285b";
hash = "sha256-6/8clF2yNhfonV16cfIkxVIzuB9i9ThxoLMxAo/fDuY=";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "prismlauncher-unwrapped";
version = "10.0.5";
version = "11.0.0";
src = fetchFromGitHub {
owner = "PrismLauncher";
repo = "PrismLauncher";
tag = finalAttrs.version;
hash = "sha256-cQBOdF3HP4CFOSfWyVXGQBs42V/A4w6R2UwelQTE3dQ=";
hash = "sha256-hjl0GUmAwcxqGMhvrHux4kWfOZWJvDV+SqOhyYwsO6o=";
};
postUnpack = ''
@@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
libarchive
qrencode
tomlplusplus
vulkan-headers
zlib
]
++ lib.optional stdenv.hostPlatform.isLinux gamemode;
pkgs/by-name/pr/prismlauncher/package.nix
-2
View File
@@ -19,7 +19,6 @@
libjack2,
libpulseaudio,
libusb1,
mesa-demos,
openal,
pciutils,
pipewire,
@@ -107,7 +106,6 @@ symlinkJoin {
++ additionalLibs;
runtimePrograms = [
mesa-demos
pciutils # need lspci
xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
]
pkgs/by-name/qb/qbz/package.nix
+4 -4
View File
@@ -22,23 +22,23 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "qbz";
version = "1.2.3";
version = "1.2.4";
src = fetchFromGitHub {
owner = "vicrodh";
repo = "qbz";
tag = "v${finalAttrs.version}";
hash = "sha256-B9nnjsuC//9b4HmFjHHRvDaEkUWSfNZRyiek6aU0Gd4=";
hash = "sha256-3MPWLovWRmSrSfaR5ciZR2+4S7QzPYYVdVKP+mczhis=";
};
cargoHash = "sha256-6Rv+wE2FMg58A7TDRly1wC96VmbgITX8/fh073tPuPA=";
cargoHash = "sha256-jc/OZi93S0Hu3ywuwNgekyezJ1qCvxWpE60mTu0Y8jU=";
cargoRoot = "src-tauri";
buildAndTestSubdir = finalAttrs.cargoRoot;
npmDeps = fetchNpmDeps {
name = "qbz-${finalAttrs.version}-npm-deps";
inherit (finalAttrs) src;
hash = "sha256-ErO+ulCe+nx4OEHki0zKyq4HWtKfKt04VIWsDFJfCCk=";
hash = "sha256-JN3lQyEX1n5G1OcWuRNZl/KSfL7JEfsc4opeh4F/iAY=";
};
env.LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib";
pkgs/by-name/ru/rustcast/package.nix
+35
View File
@@ -0,0 +1,35 @@
{
nix-update-script,
fetchFromGitHub,
rustPlatform,
apple-sdk,
lib,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rustcast";
version = "0.5.6";
src = fetchFromGitHub {
owner = "unsecretised";
repo = "rustcast";
tag = "v${finalAttrs.version}";
hash = "sha256-88vg+xdASskbYwLbEPGmHf8P1PL4PihJDXT1ua/cfCQ=";
};
nativeBuildInputs = [
apple-sdk
];
cargoHash = "sha256-IvpvbsnWWI1I/1PmVfP6qXf8DzRknRBJjMixUp01xo8=";
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/unsecretised/rustcast/releases/tag/v${finalAttrs.version}";
description = "Modern Spotlight Alternative made opensource";
homepage = "https://github.com/unsecretised/rustcast";
license = lib.licenses.mit;
platforms = lib.platforms.darwin;
maintainers = with lib.maintainers; [ eveeifyeve ];
};
})
pkgs/by-name/se/session-desktop/package.nix
+2 -2
View File
@@ -109,7 +109,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "session-desktop";
version = "1.17.17";
version = "1.18.0";
src =
(fetchFromGitHub {
owner = "session-foundation";
@@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
rm -rf .git
popd
'';
hash = "sha256-YqDkL91PbgNlaDnfCpZn6oL2r4z0zClRb4OGys4o2Yw=";
hash = "sha256-xulsnbC3C7n+4hFeuzRS8XzzYTO6T2vR3jBxTkxHFHE=";
}).overrideAttrs
(oldAttrs: {
# https://github.com/NixOS/nixpkgs/issues/195117#issuecomment-1410398050
pkgs/by-name/sm/smile/package.nix
+2 -2
View File
@@ -15,14 +15,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "smile";
version = "2.11.0";
version = "2.12.2";
pyproject = false; # Builds with meson
src = fetchFromGitHub {
owner = "mijorus";
repo = "smile";
tag = finalAttrs.version;
hash = "sha256-uggbeFcafCvIpT+qHsnULTZ9oyQkfT7phI5KW00HEXg=";
hash = "sha256-qAeAntJXitypbSu9dVvnMenXs9UwatcdIkdqmbjxFgk=";
};
nativeBuildInputs = [
pkgs/by-name/sr/src-cli/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "src-cli";
version = "7.0.2";
version = "7.0.3";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "src-cli";
rev = version;
hash = "sha256-RX3Fxa+AyzZQn68M5ZqeCqKjkNkp80ih0ECVvud1SSg=";
hash = "sha256-B0ESsPbB4rWRLpOnU/ugVakUaduAGCs7n+XEDIYwUxs=";
};
vendorHash = "sha256-lChxbgIa4w24uUG0SYBbzouKt+a0eVLLSn/BG6Q5P6o=";
vendorHash = "sha256-WB7lXLnWsQLLfzlAyFbEbfsaTY2wbRyqsQ0PdRF1/tk=";
subPackages = [
"cmd/src"
pkgs/by-name/tf/tfenv/package.nix
+78
View File
@@ -0,0 +1,78 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
makeWrapper,
nix-update-script,
unzip,
curl,
gnugrep,
gnused,
gawk,
coreutils,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
__structuredAttrs = true;
pname = "tfenv";
version = "3.0.0";
src = fetchFromGitHub {
owner = "tfutils";
repo = "tfenv";
rev = "v${finalAttrs.version}";
hash = "sha256-2Fpaj/UQDE7PNFX9GNr4tygvKmm/X0yWVVerJ+Y6eks=";
};
nativeBuildInputs = [ makeWrapper ];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/lib $out/libexec $out/share
cp -r lib/* $out/lib/
cp -r libexec/* $out/libexec/
cp -r share/* $out/share/
install -m0644 CHANGELOG.md $out/CHANGELOG.md
install -m0755 bin/tfenv $out/bin/tfenv
install -m0755 bin/terraform $out/bin/terraform
runHook postInstall
'';
postFixup = ''
for f in $out/bin/* $out/libexec/*; do
[ -f "$f" ] || continue
wrapProgram "$f" \
--prefix PATH : "${
lib.makeBinPath [
unzip
curl
gnugrep
gnused
gawk
coreutils
]
}"
done
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Terraform version manager";
homepage = "https://github.com/tfutils/tfenv";
changelog = "https://github.com/tfutils/tfenv/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ kaynetik ];
mainProgram = "tfenv";
platforms = lib.platforms.unix;
};
})

Some files were not shown because too many files have changed in this diff Show More