Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-11-24 18:06:31 +00:00
committed by GitHub
154 changed files with 2493 additions and 1389 deletions
+2 -2
View File
@@ -27,7 +27,7 @@ jobs:
steps:
# Use a GitHub App to create the PR so that CI gets triggered
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
@@ -36,7 +36,7 @@ jobs:
permission-pull-requests: write
permission-workflows: write
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
ref: ${{ github.event.pull_request.head.sha }}
token: ${{ steps.app-token.outputs.token }}
+2 -2
View File
@@ -46,7 +46,7 @@ jobs:
# https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
sparse-checkout: |
@@ -56,7 +56,7 @@ jobs:
run: npm install @actions/artifact bottleneck
# Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour.
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
id: app-token
with:
+2 -2
View File
@@ -52,7 +52,7 @@ jobs:
runs-on: ${{ matrix.runner }}
timeout-minutes: 60
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
sparse-checkout: .github/actions
@@ -62,7 +62,7 @@ jobs:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
target-as-trusted-at: ${{ inputs.targetSha }}
- uses: cachix/install-nix-action@7ec16f2c061ab07b235a7245e06ed46fe9a1cab6 # v31
- uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
with:
# Sandbox is disabled on MacOS by default.
extra_nix_config: sandbox = true
+3 -3
View File
@@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-24.04-arm
timeout-minutes: 3
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
path: trusted
@@ -75,7 +75,7 @@ jobs:
runs-on: ubuntu-24.04-arm
timeout-minutes: 5
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
sparse-checkout: .github/actions
@@ -85,7 +85,7 @@ jobs:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
target-as-trusted-at: ${{ inputs.targetSha }}
- uses: cachix/install-nix-action@7ec16f2c061ab07b235a7245e06ed46fe9a1cab6 # v31
- uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
- uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
continue-on-error: true
+2 -2
View File
@@ -23,14 +23,14 @@ jobs:
timeout-minutes: 2
if: contains(github.event.comment.body, '@NixOS/nixpkgs-merge-bot merge')
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
sparse-checkout: |
ci/github-script
# Use the GitHub App to make sure the reaction happens with the same user who will later merge.
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
id: app-token
with:
+1 -1
View File
@@ -36,7 +36,7 @@ jobs:
# Use a GitHub App to create the PR so that CI gets triggered
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
# We only need Pull Requests: write here, but the app is also used for backports.
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+9 -9
View File
@@ -37,7 +37,7 @@ jobs:
outputs:
versions: ${{ steps.versions.outputs.versions }}
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
path: trusted
@@ -45,7 +45,7 @@ jobs:
ci/supportedVersions.nix
- name: Check out the PR at the test merge commit
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
ref: ${{ inputs.mergedSha }}
@@ -54,7 +54,7 @@ jobs:
ci/pinned.json
- name: Install Nix
uses: cachix/install-nix-action@7ec16f2c061ab07b235a7245e06ed46fe9a1cab6 # v31
uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
- name: Load supported versions
id: versions
@@ -89,7 +89,7 @@ jobs:
sudo mkswap /swap
sudo swapon /swap
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
sparse-checkout: .github/actions
@@ -100,7 +100,7 @@ jobs:
target-as-trusted-at: ${{ inputs.targetSha }}
- name: Install Nix
uses: cachix/install-nix-action@7ec16f2c061ab07b235a7245e06ed46fe9a1cab6 # v31
uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
- uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
continue-on-error: true
@@ -171,7 +171,7 @@ jobs:
statuses: write
timeout-minutes: 5
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
sparse-checkout: .github/actions
@@ -189,7 +189,7 @@ jobs:
merge-multiple: true
- name: Install Nix
uses: cachix/install-nix-action@7ec16f2c061ab07b235a7245e06ed46fe9a1cab6 # v31
uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
- name: Combine all output paths and eval stats
run: |
@@ -342,7 +342,7 @@ jobs:
runs-on: ubuntu-24.04-arm
timeout-minutes: 10
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
sparse-checkout: .github/actions
@@ -352,7 +352,7 @@ jobs:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
- name: Install Nix
uses: cachix/install-nix-action@7ec16f2c061ab07b235a7245e06ed46fe9a1cab6 # v31
uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
- name: Run misc eval tasks in parallel
run: |
+6 -6
View File
@@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-24.04-arm
timeout-minutes: 10
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
sparse-checkout: .github/actions
@@ -35,7 +35,7 @@ jobs:
with:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
- uses: cachix/install-nix-action@7ec16f2c061ab07b235a7245e06ed46fe9a1cab6 # v31
- uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
# 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.
@@ -61,7 +61,7 @@ jobs:
runs-on: ubuntu-24.04-arm
timeout-minutes: 10
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
sparse-checkout: .github/actions
@@ -70,7 +70,7 @@ jobs:
with:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
- uses: cachix/install-nix-action@7ec16f2c061ab07b235a7245e06ed46fe9a1cab6 # v31
- uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
- uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
continue-on-error: true
@@ -90,7 +90,7 @@ jobs:
runs-on: ubuntu-24.04-arm
timeout-minutes: 10
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
sparse-checkout: .github/actions
@@ -100,7 +100,7 @@ jobs:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
target-as-trusted-at: ${{ inputs.targetSha }}
- uses: cachix/install-nix-action@7ec16f2c061ab07b235a7245e06ed46fe9a1cab6 # v31
- uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
- uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
continue-on-error: true
+1 -1
View File
@@ -25,7 +25,7 @@ jobs:
targetSha: ${{ steps.prepare.outputs.targetSha }}
systems: ${{ steps.prepare.outputs.systems }}
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
sparse-checkout: |
+2 -2
View File
@@ -26,7 +26,7 @@ jobs:
steps:
# Use a GitHub App to create the PR so that CI gets triggered
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
@@ -34,7 +34,7 @@ jobs:
permission-contents: write
permission-pull-requests: write
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
+1 -1
View File
@@ -31,7 +31,7 @@ jobs:
systems: ${{ steps.prepare.outputs.systems }}
touched: ${{ steps.prepare.outputs.touched }}
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
sparse-checkout-cone-mode: true # default, for clarity
+2 -2
View File
@@ -20,14 +20,14 @@ jobs:
runs-on: ubuntu-24.04-arm
timeout-minutes: 2
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
sparse-checkout: |
ci/github-script
# Use the GitHub App to make sure the reaction happens with the same user who will later merge.
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
id: app-token
with:
+3 -3
View File
@@ -19,7 +19,7 @@ jobs:
steps:
# Use a GitHub App to create the PR so that CI gets triggered and to
# request team member lists.
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
@@ -30,7 +30,7 @@ jobs:
permission-pull-requests: write
- name: Fetch source
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
sparse-checkout: |
@@ -64,7 +64,7 @@ jobs:
echo "git-string=$name <$email>" >> "$GITHUB_OUTPUT"
- name: Create Pull Request
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 # v7.0.9
with:
token: ${{ steps.app-token.outputs.token }}
add-paths: maintainers/github-teams.json
+1 -1
View File
@@ -19,7 +19,7 @@ jobs:
push: ${{ steps.files.outputs.push }}
targetSha: ${{ steps.prepare.outputs.targetSha }}
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
persist-credentials: false
sparse-checkout-cone-mode: true # default, for clarity
+1 -1
View File
@@ -139,7 +139,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza
/nixos/modules/system/boot/loader/systemd-boot @JulienMalka
# Limine
/nixos/modules/system/boot/loader/limine @lzcunt @phip1611 @programmerlexi @johnrtitor
/nixos/modules/system/boot/loader/limine @lzcunt @programmerlexi @johnrtitor
/nixos/tests/limine @johnrtitor
# Images and installer media
+12
View File
@@ -3442,6 +3442,11 @@
githubId = 10164833;
name = "Birk Bohne";
};
bitbloxhub = {
name = "bitbloxhub";
github = "bitbloxhub";
githubId = 45184892;
};
bizmyth = {
email = "andrew.p.council@gmail.com";
github = "bizmythy";
@@ -23396,6 +23401,13 @@
githubId = 72168352;
matrix = "@schrobingus:matrix.org";
};
schromp = {
email = "schromp@echsen.club";
github = "schromp";
githubId = 103186360;
matrix = "@schromp:echsen.club";
name = "schromp";
};
Schweber = {
github = "Schweber";
githubId = 64630479;
-1
View File
@@ -3,7 +3,6 @@
name = "bios";
meta.maintainers = with lib.maintainers; [
lzcunt
phip1611
programmerlexi
];
meta.platforms = [
@@ -1,30 +0,0 @@
From dd4a96073d4a60ca8fff55be6ea6b17018de96a8 Mon Sep 17 00:00:00 2001
From: Varun Madiath <git@madiathv.com>
Date: Wed, 19 Jul 2023 15:30:57 -0400
Subject: [PATCH] utils: lockfile: avoid stack overflow for lockfile buffer
Original patch by @cyphar was submitted to rakshasa/rtorrent at
https://github.com/rakshasa/rtorrent/pull/1169.
Observed the segfault on nixos-unstable.
---
src/utils/lockfile.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/utils/lockfile.cc b/src/utils/lockfile.cc
index 76e4b8f..441f5c8 100644
--- a/src/utils/lockfile.cc
+++ b/src/utils/lockfile.cc
@@ -75,7 +75,8 @@ Lockfile::try_lock() {
int pos = ::gethostname(buf, 255);
if (pos == 0) {
- ::snprintf(buf + std::strlen(buf), 255, ":+%i\n", ::getpid());
+ ssize_t len = std::strlen(buf);
+ ::snprintf(buf + len, 255 - len, ":+%i\n", ::getpid());
ssize_t __attribute__((unused)) result = ::write(fd, buf, std::strlen(buf));
}
--
2.41.0
@@ -1,77 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
curl,
gtest,
libtorrent,
ncurses,
jsonRpcSupport ? true,
nlohmann_json,
xmlRpcSupport ? true,
xmlrpc_c,
}:
stdenv.mkDerivation rec {
pname = "jesec-rtorrent";
version = "0.9.8-r16";
src = fetchFromGitHub {
owner = "jesec";
repo = "rtorrent";
rev = "v${version}";
hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k=";
};
patches = [
./avoid-stack-overflow-for-lockfile-buf.patch
];
passthru = {
inherit libtorrent;
};
nativeBuildInputs = [
cmake
];
buildInputs = [
curl
libtorrent
ncurses
]
++ lib.optional jsonRpcSupport nlohmann_json
++ lib.optional xmlRpcSupport xmlrpc_c;
cmakeFlags = [
"-DUSE_RUNTIME_CA_DETECTION=NO"
]
++ lib.optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO"
++ lib.optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO";
doCheck = true;
nativeCheckInputs = [
gtest
];
prePatch = ''
substituteInPlace src/main.cc \
--replace "/etc/rtorrent/rtorrent.rc" "${placeholder "out"}/etc/rtorrent/rtorrent.rc"
'';
postFixup = ''
mkdir -p $out/etc/rtorrent
cp $src/doc/rtorrent.rc $out/etc/rtorrent/rtorrent.rc
'';
meta = with lib; {
description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach (jesec's fork)";
homepage = "https://github.com/jesec/rtorrent";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ winter ];
platforms = platforms.linux;
mainProgram = "rtorrent";
};
}
@@ -1,49 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
gtest,
openssl,
zlib,
}:
stdenv.mkDerivation rec {
pname = "jesec-libtorrent";
version = "0.13.8-r4";
src = fetchFromGitHub {
owner = "jesec";
repo = "libtorrent";
rev = "v${version}";
hash = "sha256-jC/hgGSi2qy+ToZgdxl1PhASLYbUL0O8trX0th2v5H0=";
};
nativeBuildInputs = [
cmake
];
buildInputs = [
openssl
zlib
];
# Disabled because a test is flaky; see https://github.com/jesec/libtorrent/issues/4.
# doCheck = true;
preCheck = ''
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
'';
nativeCheckInputs = [
gtest
];
meta = with lib; {
homepage = "https://github.com/jesec/libtorrent";
description = "BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ winter ];
platforms = platforms.linux;
};
}
@@ -195,5 +195,8 @@ in
substitutions = {
jq = lib.getExe jq;
};
meta = {
description = "Prune yarn dependencies and install files for packages using Yarn 1";
};
} ./yarn-install-hook.sh;
}
+21 -6
View File
@@ -32,6 +32,16 @@ let
yarn-berry = yarn-berry_4.override { inherit nodejs; };
productName = if buildType != "stable" then "AFFiNE-${buildType}" else "AFFiNE";
binName = lib.toLower productName;
electron-dist-zip = stdenvNoCC.mkDerivation {
pname = "electron-dist-zip";
version = electron.version;
src = electron.dist;
nativeBuildInputs = [ zip ];
buildPhase = ''
zip --recurse-paths - . > $out
'';
dontInstall = true;
};
in
stdenv.mkDerivation (finalAttrs: {
pname = binName;
@@ -48,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version src;
hash = "sha256-tdg0Ti+QWsIx64+WV0fPoyE/t3GlsUxXzU9qFHYfpt0=";
};
# keep yarnOfflineCache same output style with offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; hash = "" };
yarnOfflineCache = stdenvNoCC.mkDerivation {
name = "yarn-offline-cache";
inherit (finalAttrs) src;
@@ -79,19 +91,22 @@ stdenv.mkDerivation (finalAttrs: {
''
runHook preBuild
mkdir -p $out
mkdir -p $out/cache
yarn config set enableTelemetry false
yarn config set cacheFolder $out
yarn config set cacheFolder $out/cache
yarn config set enableGlobalCache false
yarn config set supportedArchitectures --json '${supportedArchitectures}'
yarn install --immutable --mode=skip-build
cp yarn.lock $out/yarn.lock
runHook postBuild
'';
dontInstall = true;
outputHashMode = "recursive";
outputHash = "sha256-wMfjlxHs1pS8QEnIgn9IZTNShKkLeVVpGFkZ2ICtiNA=";
outputHash = "sha256-iULgio5zpmJhKofkUxA98Ze7Qy+kRfbbi5oEHYw5vzY=";
};
buildInputs = lib.optionals hostPlatform.isDarwin [
@@ -133,6 +148,7 @@ stdenv.mkDerivation (finalAttrs: {
echo "$BACKEND_SERVER_PACKAGE_JSON" > packages/backend/server/package.json
'';
# FIXME: use `yarn config set cacheFolder $offlineCache/cache`
configurePhase = ''
runHook preConfigure
@@ -144,14 +160,13 @@ stdenv.mkDerivation (finalAttrs: {
# yarn config
yarn config set enableTelemetry false
yarn config set enableGlobalCache false
yarn config set cacheFolder $yarnOfflineCache
yarn config set cacheFolder $yarnOfflineCache/cache
# electron config
ELECTRON_VERSION_IN_LOCKFILE=$(yarn why electron --json | tail --lines 1 | jq --raw-output '.children | to_entries | first | .key ' | cut -d : -f 2)
rsync --archive --chmod=u+w "${electron.dist}/" $HOME/.electron-prebuilt-zip-tmp
export ELECTRON_FORGE_ELECTRON_ZIP_DIR=$PWD/.electron_zip_dir
mkdir -p $ELECTRON_FORGE_ELECTRON_ZIP_DIR
(cd $HOME/.electron-prebuilt-zip-tmp && zip --recurse-paths - .) > $ELECTRON_FORGE_ELECTRON_ZIP_DIR/electron-v$ELECTRON_VERSION_IN_LOCKFILE-${nodePlatform}-${nodeArch}.zip
cp ${electron-dist-zip} $ELECTRON_FORGE_ELECTRON_ZIP_DIR/electron-v$ELECTRON_VERSION_IN_LOCKFILE-${nodePlatform}-${nodeArch}.zip
export ELECTRON_SKIP_BINARY_DOWNLOAD=1
runHook postConfigure
+2 -2
View File
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "aldente";
version = "1.35.1";
version = "1.36.1";
src = fetchurl {
url = "https://github.com/AppHouseKitchen/AlDente-Battery_Care_and_Monitoring/releases/download/${finalAttrs.version}/AlDente.dmg";
hash = "sha256-OjajT9goWbK3dKmkvt/qbcjlytg/xOPxNEZWE7h24Uc=";
hash = "sha256-iouXZv6dfLGawWtDH+/wGOogDjUoqp55BE2ADAAos0o=";
};
dontBuild = true;
@@ -1,29 +1,23 @@
GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.1.1)
Ascii85 (2.0.1)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
afm (0.2.2)
asciidoctor (2.0.23)
afm (1.0.0)
asciidoctor (2.0.26)
asciidoctor-bibtex (0.9.0)
asciidoctor (~> 2.0)
bibtex-ruby (~> 6.1)
citeproc-ruby (~> 1)
csl-styles (~> 1)
latex-decode (~> 0.2)
asciidoctor-diagram (2.3.1)
asciidoctor-diagram (3.1.0)
asciidoctor (>= 1.5.7, < 3.x)
asciidoctor-diagram-ditaamini (~> 1.0)
asciidoctor-diagram-plantuml (~> 1.2021)
rexml
asciidoctor-diagram-batik (1.17)
asciidoctor-diagram-ditaamini (1.0.3)
asciidoctor-diagram-plantuml (1.2024.6)
asciidoctor-diagram-batik (~> 1.17)
asciidoctor-epub3 (2.1.3)
asciidoctor-epub3 (2.3.0)
asciidoctor (~> 2.0)
gepub (>= 1.0.0, <= 1.0.15)
gepub (~> 1.0.0)
mime-types (~> 3.0)
sass
asciidoctor-html5s (0.5.1)
@@ -31,9 +25,9 @@ GEM
thread_safe (~> 0.3.4)
asciidoctor-multipage (0.0.19)
asciidoctor (>= 2.0.11, < 2.1)
asciidoctor-pdf (2.3.19)
asciidoctor-pdf (2.3.24)
asciidoctor (~> 2.0)
concurrent-ruby (~> 1.1)
concurrent-ruby (~> 1.3)
matrix (~> 0.4)
prawn (~> 2.4.0)
prawn-icon (~> 3.0.0)
@@ -42,49 +36,63 @@ GEM
prawn-templates (~> 0.1.0)
treetop (~> 1.6.0)
ttfunk (~> 1.7.0)
asciidoctor-reducer (1.0.6)
asciidoctor-reducer (1.1.2)
asciidoctor (~> 2.0)
asciidoctor-revealjs (5.1.0)
asciidoctor-revealjs (5.2.0)
asciidoctor (>= 2.0.0, < 3.0.0)
bibtex-ruby (6.1.0)
bibtex-ruby (6.2.0)
latex-decode (~> 0.0)
logger (~> 1.7)
racc (~> 1.7)
citeproc (1.0.10)
citeproc (1.1.0)
date
forwardable
json
namae (~> 1.0)
observer (< 1.0)
open-uri (< 1.0)
citeproc-ruby (1.1.14)
citeproc (~> 1.0, >= 1.0.9)
csl (~> 1.6)
coderay (1.1.3)
concurrent-ruby (1.3.4)
concurrent-ruby (1.3.5)
csl (1.6.0)
namae (~> 1.0)
rexml
csl-styles (1.0.1.11)
csl (~> 1.0)
css_parser (1.19.1)
css_parser (1.21.1)
addressable
ffi (1.17.0)
gepub (1.0.15)
date (3.5.0)
ffi (1.17.2)
forwardable (1.3.3)
gepub (1.0.17)
nokogiri (>= 1.8.2, < 2.0)
rubyzip (> 1.1.1, < 2.4)
hashery (2.1.2)
json (2.16.0)
latex-decode (0.4.0)
logger (1.6.1)
matrix (0.4.2)
mime-types (3.6.0)
logger (1.7.0)
matrix (0.4.3)
mime-types (3.7.0)
logger
mime-types-data (~> 3.2015)
mime-types-data (3.2024.1001)
mini_portile2 (2.8.7)
mime-types-data (~> 3.2025, >= 3.2025.0507)
mime-types-data (3.2025.0924)
mini_portile2 (2.8.9)
namae (1.2.0)
racc (~> 1.7)
nokogiri (1.16.7)
nokogiri (1.18.10)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
observer (0.1.2)
open-uri (0.5.0)
stringio
time
uri
pdf-core (0.9.0)
pdf-reader (2.12.0)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
pdf-reader (2.15.0)
Ascii85 (>= 1.0, < 3.0, != 2.0.0)
afm (>= 0.2.1, < 2)
hashery (~> 2.0)
ruby-rc4
ttfunk
@@ -104,14 +112,14 @@ GEM
prawn-templates (0.1.2)
pdf-reader (~> 2.0)
prawn (~> 2.2)
public_suffix (6.0.1)
pygments.rb (3.0.0)
public_suffix (6.0.2)
pygments.rb (4.0.0)
racc (1.8.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.3.9)
rouge (4.4.0)
rexml (3.4.4)
rouge (4.6.1)
ruby-rc4 (0.1.5)
rubyzip (2.3.2)
sass (3.7.4)
@@ -119,10 +127,14 @@ GEM
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
stringio (3.1.8)
thread_safe (0.3.6)
treetop (1.6.12)
time (0.4.1)
date
treetop (1.6.18)
polyglot (~> 0.3)
ttfunk (1.7.0)
uri (1.1.1)
PLATFORMS
ruby
@@ -142,4 +154,4 @@ DEPENDENCIES
rouge
BUNDLED WITH
2.5.22
2.7.2
@@ -15,30 +15,30 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "06kj9hgd0z8pj27bxp2diwqh6fv7qhwwm17z64rhdc4sfn76jgn8";
sha256 = "0ia5iw9xvvy1igaxsa08vvv4b5ry9ipyr18917pi8w0y4kvddm2v";
type = "gem";
};
version = "0.2.2";
version = "1.0.0";
};
Ascii85 = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1c62cx96r0v265mywnlik43qx0wf6bjbzl54qa47x6dzjg861mvk";
sha256 = "0nmyxpngg5rycyryhq9l9hapz1y3iqyflskyksxkqm0832a5vjqm";
type = "gem";
};
version = "1.1.1";
version = "2.0.1";
};
asciidoctor = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1wyxgwmnz9bw377r3lba26b090hbsq9qnbw8575a1prpy83qh82j";
sha256 = "1hbin3j8wynl2fpqa3d6vb932pyngyfn8j2q6gbbn1n23z7srqqn";
type = "gem";
};
version = "2.0.23";
version = "2.0.26";
};
asciidoctor-bibtex = {
dependencies = [
@@ -60,49 +60,16 @@
asciidoctor-diagram = {
dependencies = [
"asciidoctor"
"asciidoctor-diagram-ditaamini"
"asciidoctor-diagram-plantuml"
"rexml"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1214scxm36k409gfy3wilfqx3akrm52r530zmra6cmmf6d22c5q4";
sha256 = "15sc6yb4qyxy4v3bki26xn0j4k8rgjjiz3nwrxsprn6f0y6ysbp3";
type = "gem";
};
version = "2.3.1";
};
asciidoctor-diagram-batik = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0220xqxmkmimxmhsqhlbr0hslijvnhzdds3s6h6fxbxqrrmm0jrl";
type = "gem";
};
version = "1.17";
};
asciidoctor-diagram-ditaamini = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "13h65bfbq7hc7z3kqn0m28w9c6ap7fikpjcvsdga6jg01slb4c56";
type = "gem";
};
version = "1.0.3";
};
asciidoctor-diagram-plantuml = {
dependencies = [ "asciidoctor-diagram-batik" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "173mp5vnzvn3yv9fw0p66rsbxaip9lhphw22yn19l62d1drlmhia";
type = "gem";
};
version = "1.2024.6";
version = "3.1.0";
};
asciidoctor-epub3 = {
dependencies = [
@@ -115,10 +82,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1yn2nhr7fr5rx7fn0nhw44gf7iampiy53bw59agpfl7h2dyazjll";
sha256 = "0n4c7silsc37gapsvkzm2l7fwa9gi28cif7mzd27lkzbkdsv4k0i";
type = "gem";
};
version = "2.1.3";
version = "2.3.0";
};
asciidoctor-html5s = {
dependencies = [
@@ -162,10 +129,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ybkw3xjv75xsc0wbwg76bk83sfspr50k2phshpvh9ynchli8jh3";
sha256 = "0ldh43ps15dpnrgqaybyq2py9cn1m14q2z6djgg22fyl698yaxih";
type = "gem";
};
version = "2.3.19";
version = "2.3.24";
};
asciidoctor-reducer = {
dependencies = [ "asciidoctor" ];
@@ -173,10 +140,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1fbrk97mdn26zk118dav2ckyiw6kgrlbkkhdcasawsl42hj16slw";
sha256 = "0d0zz9qksbxfzc73jv20rzkhy5qkfkp4fr017k06r4al79y3lvcd";
type = "gem";
};
version = "1.0.6";
version = "1.1.2";
};
asciidoctor-revealjs = {
dependencies = [ "asciidoctor" ];
@@ -184,35 +151,43 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0jgazcfzn577xlichfj0rvci0fayp63xcng11ss9mmwqgk48ri53";
sha256 = "1qkapy8nck52r7aldmnrvaabzrmizwa9664ngziivjgjxbksa11m";
type = "gem";
};
version = "5.1.0";
version = "5.2.0";
};
bibtex-ruby = {
dependencies = [
"latex-decode"
"logger"
"racc"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ggx2j1gi46f1a6p45l1abk3nryfg1pj0cdlyrnilnqqpr1cfc96";
sha256 = "16n6szgybyk7mglpajizgi7b77s48i319brxhhx51pvainkyn46n";
type = "gem";
};
version = "6.1.0";
version = "6.2.0";
};
citeproc = {
dependencies = [ "namae" ];
dependencies = [
"date"
"forwardable"
"json"
"namae"
"observer"
"open-uri"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "13vl5sjmksk5a8kjcqnjxh7kn9gn1n4f9p1rvqfgsfhs54p0m6l2";
sha256 = "159vnp84r3rywwzji6jbfjldlynai0gll868y6z84ghk924np3i7";
type = "gem";
};
version = "1.0.10";
version = "1.1.0";
};
citeproc-ruby = {
dependencies = [
@@ -243,10 +218,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
type = "gem";
};
version = "1.3.4";
version = "1.3.5";
};
csl = {
dependencies = [
@@ -279,20 +254,40 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "17i0fn99kswvfps8r698zw2cr16rc98xdrl0d26y36rv3vhdqh0r";
sha256 = "1izp5vna86s7xivqzml4nviy01bv76arrd5is8wkncwp1by3zzbc";
type = "gem";
};
version = "1.19.1";
version = "1.21.1";
};
date = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1rbfqkzr6i8b6538z16chvrkgywf5p5vafsgmnbmvrmh0ingsx2y";
type = "gem";
};
version = "3.5.0";
};
ffi = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9";
type = "gem";
};
version = "1.17.0";
version = "1.17.2";
};
forwardable = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1b5g1i3xdvmxxpq4qp0z4v78ivqnazz26w110fh4cvzsdayz8zgi";
type = "gem";
};
version = "1.3.3";
};
gepub = {
dependencies = [
@@ -303,10 +298,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "08fny807zd4700f263ckc76bladjipsniyk3clv8a7x76x3fqshx";
sha256 = "0fiwnfgvyrhgywnqvfvr3ird8p4xda6nvvqwvvfpnhvsyhrxswlc";
type = "gem";
};
version = "1.0.15";
version = "1.0.17";
};
hashery = {
groups = [ "default" ];
@@ -318,6 +313,16 @@
};
version = "2.1.2";
};
json = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "098m3q2jrx4xbf0knrbmflsynmmb5x9q9b0bzpmj7jmm1cr30mna";
type = "gem";
};
version = "2.16.0";
};
latex-decode = {
groups = [ "default" ];
platforms = [ ];
@@ -333,20 +338,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
type = "gem";
};
version = "1.6.1";
version = "1.7.0";
};
matrix = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i";
sha256 = "0nscas3a4mmrp1rc07cdjlbbpb2rydkindmbj3v3z5y1viyspmd0";
type = "gem";
};
version = "0.4.2";
version = "0.4.3";
};
mime-types = {
dependencies = [
@@ -357,30 +362,30 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg";
sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw";
type = "gem";
};
version = "3.6.0";
version = "3.7.0";
};
mime-types-data = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "06dbn0j13jwdrmlvrjd50mxqrjlkh3lvxp0afh4glyzbliqvqpsd";
sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj";
type = "gem";
};
version = "3.2024.1001";
version = "3.2025.0924";
};
mini_portile2 = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";
sha256 = "12f2830x7pq3kj0v8nz0zjvaw02sv01bqs1zwdrc04704kwcgmqc";
type = "gem";
};
version = "2.8.7";
version = "2.8.9";
};
namae = {
dependencies = [ "racc" ];
@@ -402,10 +407,35 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq";
sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m";
type = "gem";
};
version = "1.16.7";
version = "1.18.10";
};
observer = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1b2h1642jy1xrgyakyzz6bkq43gwp8yvxrs8sww12rms65qi18yq";
type = "gem";
};
version = "0.1.2";
};
open-uri = {
dependencies = [
"stringio"
"time"
"uri"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1jl7i0w0vhxpvj54707cpcpqi00maf1dma0mxmm99rirmkyhckvv";
type = "gem";
};
version = "0.5.0";
};
pdf-core = {
groups = [ "default" ];
@@ -429,10 +459,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0n0pp7blk3np3fqsb54l34fsamrww80cp3dhlhskfayg7542mrv1";
sha256 = "11h8dhhd2c8mxssibk9q6qn7ilj4p71crlfirw8pppn8pr85f0n5";
type = "gem";
};
version = "2.12.0";
version = "2.15.0";
};
polyglot = {
groups = [ "default" ];
@@ -515,20 +545,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
type = "gem";
};
version = "6.0.1";
version = "6.0.2";
};
"pygments.rb" = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "14xhvfnj188pypy6pxj29hrn60pznv6dc4ycdgyd6jv2d769wwj1";
sha256 = "0mzfxkzvgyrj9g6471mxa6d1jy59fsds9mfkx1balpng50xb12zl";
type = "gem";
};
version = "3.0.0";
version = "4.0.0";
};
racc = {
groups = [ "default" ];
@@ -566,20 +596,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r";
type = "gem";
};
version = "3.3.9";
version = "3.4.4";
};
rouge = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0r0b48945hakgy0y7lg6h1bb7pkfz8jqd0r6777f80ij3sansvbs";
sha256 = "1pkp5icgm7s10b2n6b2pzbdsfiv0l5sxqyizx55qdmlpaxnk8xah";
type = "gem";
};
version = "4.4.0";
version = "4.6.1";
};
ruby-rc4 = {
groups = [ "default" ];
@@ -626,6 +656,16 @@
};
version = "4.0.0";
};
stringio = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1v74k5yw7ndikr53wgbjn6j51p83qnzqbn9z4b53r102jcx3ri4r";
type = "gem";
};
version = "3.1.8";
};
thread_safe = {
groups = [ "default" ];
platforms = [ ];
@@ -636,16 +676,27 @@
};
version = "0.3.6";
};
time = {
dependencies = [ "date" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0qgarmdyqypzsaanf4w9vqrd9axrcrjqilxwrfmxp954102kcpq3";
type = "gem";
};
version = "0.4.1";
};
treetop = {
dependencies = [ "polyglot" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0adc8qblz8ii668r3rksjx83p675iryh52rvdvysimx2hkbasj7d";
sha256 = "1nl3q5ai7ikaa5sjdbspfa4njbrdvf7898zkplmalln6y4r3y153";
type = "gem";
};
version = "1.6.12";
version = "1.6.18";
};
ttfunk = {
groups = [ "default" ];
@@ -657,4 +708,14 @@
};
version = "1.7.0";
};
uri = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp";
type = "gem";
};
version = "1.1.1";
};
}
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "await";
version = "2.3.0";
version = "2.4.0";
src = fetchFromGitHub {
owner = "slavaGanzin";
repo = "await";
tag = version;
hash = "sha256-UfEjcf8NuLRzu/57aS738Do/lXzYX5lrus1xgZ7dask=";
hash = "sha256-MpdP4OJvxjF8zbKQ1YGVrtcC8RKxDNHDA90tWvLDQbU=";
};
nativeBuildInputs = [ installShellFiles ];
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "browsers";
version = "0.7.2";
version = "0.7.3";
src = fetchFromGitHub {
owner = "Browsers-software";
repo = "browsers";
tag = finalAttrs.version;
hash = "sha256-1RWGAEiSJWDoScKuUB5LL1tQyTw5NRnld7Fi93vP0BA=";
hash = "sha256-QrIE9buG46JDxGFI6tjxzMizic82Az61MgMhKU854bY=";
};
cargoHash = "sha256-M1KAZPjNu4j5b5Ml2J9OHpD+/jeF8WRP6EzfmLnb0hY=";
cargoHash = "sha256-JZoc5EwOXgv50LblYjEW8tsD4roJ6uZYuCbVzXdaKSY=";
nativeBuildInputs = [
pkg-config
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "budgie-media-player-applet";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "zalesyc";
repo = "budgie-media-player-applet";
tag = "v${finalAttrs.version}";
hash = "sha256-FTc/cl4qjVYx45SuZPizOGC09JERIuifCo86+Tqu5hk=";
hash = "sha256-Ekt6OXSjqKF4d6a9lmZyUa06pqz1uYkCHbzvLM7Z+W8=";
};
strictDeps = true;
@@ -44,17 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
];
mesonFlags = [
# The meson option actually enables libpeas2 support
# https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
"-Dfor-wayland=true"
"-Dbudgie-api-v2=true"
];
postPatch = ''
substituteInPlace meson.build --replace-fail "/usr" "$out"
# https://github.com/zalesyc/budgie-media-player-applet/issues/25
substituteInPlace src/{applet,testWin,Popover,BudgieMediaPlayer}.py \
--replace-fail "gi.require_version('Budgie', '1.0')" "gi.require_version('Budgie', '2.0')"
'';
postFixup = ''
+3 -3
View File
@@ -9,20 +9,20 @@
}:
let
version = "2025.11.1";
version = "2025.11.2";
product =
if proEdition then
{
productName = "pro";
productDesktop = "Burp Suite Professional Edition";
hash = "sha256-vtei5zzfbsfO3W6IIs15y4Ef+mLK9BlaNl+4wT8wEmw=";
hash = "sha256-uI3xjh1z4g9+ZjjbXi4CLoKT+9y2rbu8u8rqD9+aOFA=";
}
else
{
productName = "community";
productDesktop = "Burp Suite Community Edition";
hash = "sha256-WzURPRMr8EgBMqxp9w10gHDEyqAVcejUif0TKdxDZr4=";
hash = "sha256-XZgG6BfA2O4gZfy+dYuc5yzpe+sHPjthzvexBb4YWcQ=";
};
src = fetchurl {
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
rustPlatform,
pkg-config,
dtc,
@@ -19,6 +20,19 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-bPPs/4XMcvOH4BGfQrjQdvgjGWae4UEZjzPKjalDN3w=";
};
patches = [
(fetchpatch {
name = "vsock-seccomp-Rust-1.90.patch";
url = "https://github.com/cloud-hypervisor/cloud-hypervisor/commit/ec57aade1563075e37b8e9ccc0b85fe2c04a54b8.patch";
hash = "sha256-M+I+ZbiNDV1a8Y46+/mPTyDlQgQS7G6ytvPgli0NhJ0=";
})
(fetchpatch {
name = "vfio-user-seccomp-Rust-1.90.patch";
url = "https://github.com/cloud-hypervisor/cloud-hypervisor/commit/95b8c6afdd6eec9810243f92ec1956dccfe305da.patch";
hash = "sha256-kCP/Fu0Dg+GdnwyFQLqZWKlbqO9w4KRJcbV4sReSDYM=";
})
];
cargoHash = "sha256-5EK9V9yiF/UjmlYSKBIJgQOA1YU33ezicLikWYnKFAo=";
separateDebugInfo = true;
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "converseen";
version = "0.15.1.0";
version = "0.15.1.2";
src = fetchFromGitHub {
owner = "Faster3ck";
repo = "Converseen";
tag = "v${finalAttrs.version}";
hash = "sha256-loWwwleiBgwV/6t33HgIqEHU9y/pqyocmwBn0Qg01RY=";
hash = "sha256-GHx3mMDhPT3RCcJxu+v63m7Orn6G01hENvWzP/Aqxho=";
};
strictDeps = true;
@@ -0,0 +1,20 @@
diff --git a/apps/desktop/src/app.tsx b/apps/desktop/src/app.tsx
index 70dcbe5ff5..91ac4deb73 100644
--- a/apps/desktop/src/app.tsx
+++ b/apps/desktop/src/app.tsx
@@ -68,14 +68,6 @@
<Outlet />
</Layout>
<GlobalPluginRenderer />
- <UpdateDialog
- downloadProgress={downloadProgress}
- isDownloading={isDownloading}
- onOpenChange={handleDismiss}
- onUpdate={handleUpdate}
- open={showUpdateDialog}
- update={update}
- />
<OnboardingWizard
open={showOnboarding}
onComplete={completeOnboarding}
@@ -0,0 +1,12 @@
diff --git a/apps/desktop/src-tauri/tauri.conf.json b/apps/desktop/src-tauri/tauri.conf.json
index ed05fce..e1649e0 100644
--- a/apps/desktop/src-tauri/tauri.conf.json
+++ b/apps/desktop/src-tauri/tauri.conf.json
@@ -31,7 +31,6 @@
}
},
"active": true,
- "createUpdaterArtifacts": true,
"targets": "all",
"icon": [
"icons/32x32.png",
@@ -0,0 +1,136 @@
{
lib,
fetchFromGitHub,
rustPlatform,
cargo-tauri,
nodejs,
pnpm_9,
pkg-config,
wrapGAppsHook3,
desktop-file-utils,
webkitgtk_4_1,
cairo,
gdk-pixbuf,
glib,
glib-networking,
gtk3,
libsoup_3,
pango,
openssl,
bzip2,
gst_all_1,
makeDesktopItem,
fontconfig,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "deadlock-mod-manager";
version = "0.10.1";
src = fetchFromGitHub {
owner = "deadlock-mod-manager";
repo = "deadlock-mod-manager";
tag = "v${finalAttrs.version}";
hash = "sha256-/84P9ONG25Ia1BnRcbzQuJKt8HwstCzf0bkx1Xc9VgU=";
};
cargoRoot = "apps/desktop";
buildAndTestSubdir = finalAttrs.cargoRoot;
cargoHash = "sha256-wVsr6GwCGuuveTDT6oS1keejx+y+oSuE6dGAjvNRrdE=";
nativeBuildInputs = [
rustPlatform.cargoSetupHook
cargo-tauri.hook
nodejs
pnpm_9.configHook
pkg-config
wrapGAppsHook3
];
buildInputs = [
webkitgtk_4_1
cairo
gdk-pixbuf
glib
glib-networking
gtk3
libsoup_3
pango
openssl
bzip2
desktop-file-utils
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
];
pnpmRoot = ".";
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs)
pname
version
src
;
fetcherVersion = 2;
sourceRoot = "source";
hash = "sha256-7HhMW28hl2hHi8epcKMTbfuVjKYj+U1N/d2tMcu4aQg=";
};
patches = [
./no-updater-artifacts.patch
./disable-update-notice.patch
];
VITE_API_URL = "https://api.deadlockmods.app";
# Skip tests that require network access
checkFlags = [
"--skip=download_manager::downloader::tests::test_download_file"
];
preFixup = ''
gappsWrapperArgs+=(
--set FONTCONFIG_FILE "${fontconfig.out}/etc/fonts/fonts.conf"
--set TAURI_DIST_DIR "$out/share/deadlock-modmanager/dist"
--set WEBKIT_DISABLE_COMPOSITING_MODE 1
--set WEBKIT_DISABLE_DMABUF_RENDERER 1
--set DISABLE_UPDATE_DESKTOP_DATABASE 1
--prefix PATH : ${lib.makeBinPath [ desktop-file-utils ]}
)
'';
desktopItems = [
(makeDesktopItem {
desktopName = "deadlock-mod-manager";
name = "Deadlock Mod Manager";
exec = "deadlock-mod-manager %u";
terminal = false;
type = "Application";
icon = "deadlock-mod-manager";
mimeTypes = [ "x-scheme-handler/deadlock-mod-manager" ];
categories = [
"Utility"
"Game"
];
})
];
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Mod manager for the Valve game Deadlock";
homepage = "https://github.com/deadlock-mod-manager/deadlock-mod-manager";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
mistyttm
schromp
];
platforms = lib.platforms.linux;
mainProgram = "deadlock-mod-manager";
};
})
+6
View File
@@ -3,6 +3,7 @@
fetchurl,
appimageTools,
nix-update-script,
makeWrapper,
}:
appimageTools.wrapType2 rec {
pname = "dopamine";
@@ -13,11 +14,16 @@ appimageTools.wrapType2 rec {
hash = "sha256-kvXan5J+rxJ/ugcEz9xytq3eQG0saWrYZjF7O1d6rTA=";
};
nativeBuildInputs = [ makeWrapper ];
extraInstallCommands =
let
contents = appimageTools.extract { inherit pname version src; };
in
''
wrapProgram $out/bin/${pname} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
install -Dm644 ${contents}/dopamine.desktop $out/share/applications/dopamine.desktop
substituteInPlace $out/share/applications/dopamine.desktop \
--replace-fail 'Exec=AppRun' 'Exec=dopamine'
+3 -3
View File
@@ -8,7 +8,7 @@
let
themeName = "Dracula";
version = "4.0.0-unstable-2025-11-11";
version = "4.0.0-unstable-2025-11-20";
in
stdenvNoCC.mkDerivation {
pname = "dracula-theme";
@@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation {
src = fetchFromGitHub {
owner = "dracula";
repo = "gtk";
rev = "4d8e487dd47ad388b0bd1d9b019a8b70b72f4f78";
hash = "sha256-ZE1P883H1o0Gq+3a0w/eRkYajz7GQfjl1BX9Q67hfuE=";
rev = "c04b3531f8db463cbc0481546f4477e455908473";
hash = "sha256-eT0j//ALSqyhHMOBqTYtr9z/erov8IKHDd697vybMAo=";
};
propagatedUserEnvPkgs = [
+1 -1
View File
@@ -1,3 +1,3 @@
{
"yarn_offline_cache_hash": "sha256-EZ8dVRfzAFr8wepLuS90YHvAi9BA+4etVz+Vji+bQVA="
"yarn_offline_cache_hash": "sha256-kTdJ6zKNjH5CxcM9EvXzbz2Phrp5xI0+pvNwMLRmLgQ="
}
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "draupnir",
"version": "2.7.1",
"version": "2.8.0",
"description": "A moderation tool for Matrix",
"main": "lib/index.js",
"repository": "https://github.com/the-draupnir-project/Draupnir.git",
@@ -64,7 +64,7 @@
"jsdom": "^24.0.0",
"matrix-appservice-bridge": "^10.3.1",
"matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6",
"matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@4.1.0",
"matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@5.1.0",
"matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@4.0.2",
"pg": "^8.8.0",
"yaml": "^2.3.2"
+2 -2
View File
@@ -22,13 +22,13 @@ let
in
mkYarnPackage rec {
pname = "draupnir";
version = "2.7.1";
version = "2.8.0";
src = fetchFromGitHub {
owner = "the-draupnir-project";
repo = "Draupnir";
tag = "v${version}";
hash = "sha256-PJg+ybWe7mtLgqrBZP0xKeKWc2FPv7koyjsHyK5uRKs=";
hash = "sha256-I9DYiNxD95pzHVsgZ/hJwHfrsVqE/eBALNiePVNDpy0=";
};
nativeBuildInputs = [
@@ -30,14 +30,14 @@ writeTextFile {
XDG_CONFIG_HOME="$tmpdir" ${xvfb-run}/bin/xvfb-run --auto-display ${drawio}/bin/drawio $@
'';
meta = with lib; {
meta = {
description = "xvfb wrapper around drawio";
longDescription = ''
A wrapper around drawio (draw.io) for running in headless environments.
Runs drawio under xvfb-run, with configuration going to a temporary
directory.
'';
maintainers = with maintainers; [
maintainers = with lib.maintainers; [
qyliss
tfc
];
@@ -7,32 +7,33 @@
copyDesktopItems,
fixup-yarn-lock,
makeWrapper,
autoSignDarwinBinariesHook,
darwin,
nodejs,
yarn,
electron,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "drawio";
version = "26.1.1";
version = "29.0.3";
src = fetchFromGitHub {
owner = "jgraph";
repo = "drawio-desktop";
rev = "v${version}";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-h9APkOtH7s31r89hqqH12zYqkVMrR2ZxMyc+Zwq21+A=";
hash = "sha256-YVkGt096Vy1s/ZjvuWUWVE2eiaI7Wg/YdWSueTsKzEg=";
};
# `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
postPatch = ''
sed -i -e 's/resetAdHocDarwinSignature:.*/resetAdHocDarwinSignature: false,/' build/fuses.cjs
substituteInPlace ./build/fuses.cjs \
--replace-fail "resetAdHocDarwinSignature:" "// resetAdHocDarwinSignature:"
'';
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-kmA0z/vmWH+yD2OQ6VVSE0yPxInTAGjjG+QfcoZHlQ0=";
yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-/CzHvGUKhB2RBaz+LVXaHr5q6KLkQR0asFZRruOUmqU=";
};
nativeBuildInputs = [
@@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
copyDesktopItems
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
autoSignDarwinBinariesHook
darwin.autoSignDarwinBinariesHook
];
ELECTRON_SKIP_BINARY_DOWNLOAD = true;
@@ -77,7 +78,7 @@ stdenv.mkDerivation rec {
''
+ ''
yarn --offline run electron-builder --dir \
${lib.optionalString stdenv.hostPlatform.isDarwin "--config electron-builder-linux-mac.json"} \
${lib.optionalString stdenv.hostPlatform.isDarwin "--config electron-builder-linux-mac.json --config.mac.identity=null"} \
-c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \
-c.electronVersion=${electron.version}
@@ -137,9 +138,9 @@ stdenv.mkDerivation rec {
# The minified code authored by us in this repo is licensed under an Apache v2 license, but the sources to build those files are not in this repo. This is not an open source project.
unfreeRedistributable
];
changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}";
changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${finalAttrs.version}";
maintainers = with lib.maintainers; [ darkonion0 ];
platforms = lib.platforms.darwin ++ lib.platforms.linux;
mainProgram = "drawio";
};
}
})
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "efmt";
version = "0.19.1";
version = "0.20.0";
src = fetchFromGitHub {
owner = "sile";
repo = "efmt";
rev = version;
hash = "sha256-l+DiOMUTEF6btsgkfgDtY45fH6GyqKBqHjuTfCF/ybA=";
hash = "sha256-cRiYOJiBIRHm9s3EFhRNTvLXw66Svu1vc4ipWYKDo1s=";
};
cargoHash = "sha256-NJ49DqJW0qgM1dPOzlwMP9+JEfa1/YxvgMm4WmJ0mFA=";
cargoHash = "sha256-Wb8SNPsubhVyfIzcPjkqauforLmhNlfas4KwD/l40sI=";
meta = {
description = "Erlang code formatter";
+1 -1
View File
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
description = "exFAT filesystem userspace utilities";
homepage = "https://github.com/exfatprogs/exfatprogs";
license = licenses.gpl2Plus;
maintainers = [ ];
maintainers = with maintainers; [ yuannan ];
platforms = platforms.linux;
};
}
@@ -5,20 +5,36 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "fcitx5-pinyin-zhwiki";
version = "0.2.5";
date = "20250823";
version = "0.3.0";
date = "20251104";
src = fetchurl {
url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/${finalAttrs.version}/zhwiki-${finalAttrs.date}.dict";
hash = "sha256-cD0FKxPvdQfcrfR/Fh4aNb+pK/IFiFLyvg8LhnYI+vs=";
};
srcs = [
(fetchurl {
url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/${finalAttrs.version}/web-slang-${finalAttrs.date}.dict";
hash = "sha256-MI0gqLxtgV5gnSFI5nqFTKt0UTQec/VNKgfhptOTBo8=";
})
(fetchurl {
url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/${finalAttrs.version}/zhwiki-${finalAttrs.date}.dict";
hash = "sha256-bYp4HRUeXMUO7bkjmhp9nfotnBvyVRIROSeT7VapAKc=";
})
(fetchurl {
url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/${finalAttrs.version}/zhwikisource-${finalAttrs.date}.dict";
hash = "sha256-oxNebop+zFPMkk9swunPCl3XZG4smMw0p9ytaSdEFVE=";
})
(fetchurl {
url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/${finalAttrs.version}/zhwiktionary-${finalAttrs.date}.dict";
hash = "sha256-xizpn53RPXlQYnB7Eyqg0mOOO8DAZTWZzDHT3wrboPE=";
})
];
dontUnpack = true;
installPhase = ''
runHook preInstall
install -Dm644 $src $out/share/fcitx5/pinyin/dictionaries/zhwiki.dict
for dict in $srcs; do
install -D $dict $out/share/fcitx5/pinyin/dictionaries/$(basename $(stripHash $dict) | sed 's/-[0-9]\{8\}//')
done
runHook postInstall
'';
+36 -22
View File
@@ -1,24 +1,21 @@
{
lib,
stdenv,
fetchFromGitea,
fetchurl,
alsa-lib,
copyDesktopItems,
wrapGAppsHook3,
makeDesktopItem,
pkg-config,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
stdenv.mkDerivation rec {
pname = "free42";
version = "3.3.8";
version = "3.3.10";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "thomasokken";
repo = "free42";
tag = "v${finalAttrs.version}";
hash = "sha256-L6WZM5/+ujM6hv85ppt9YiqHLkd0vYFx3nFVcJwzEBM=";
src = fetchurl {
url = "https://thomasokken.com/free42/upstream/free42-nologo-${version}.tgz";
hash = "sha256-Vh+Sh3oX1ICy0R6R4zu9Df2+ba2mM33qHtifINNpn7Y=";
};
nativeBuildInputs = [
@@ -30,19 +27,20 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ alsa-lib ];
postPatch = ''
sed -i -e "s|/bin/ls|ls|" gtk/Makefile
substituteInPlace gtk/Makefile \
--replace-fail /bin/ls ls
'';
dontConfigure = true;
desktopItems = [
(makeDesktopItem {
name = "com.thomasokken.free42bin";
name = "free42bin";
desktopName = "Free42Bin";
genericName = "Calculator";
exec = "free42bin";
type = "Application";
comment = "A software clone of HP-42S Calculator";
comment = "Software clone of the HP-42S calculator";
icon = "free42";
categories = [
"Utility"
@@ -50,12 +48,12 @@ stdenv.mkDerivation (finalAttrs: {
];
})
(makeDesktopItem {
name = "com.thomasokken.free42dec";
name = "free42dec";
desktopName = "Free42Dec";
genericName = "Calculator";
exec = "free42dec";
type = "Application";
comment = "A software clone of HP-42S Calculator";
comment = "Software clone of the HP-42S calculator";
icon = "free42";
categories = [
"Utility"
@@ -68,9 +66,9 @@ stdenv.mkDerivation (finalAttrs: {
runHook preBuild
make -C gtk cleaner
make --jobs=$NIX_BUILD_CORES -C gtk
make --jobs=$NIX_BUILD_CORES -C gtk AUDIO_ALSA=1
make -C gtk clean
make --jobs=$NIX_BUILD_CORES -C gtk BCD_MATH=1
make --jobs=$NIX_BUILD_CORES -C gtk AUDIO_ALSA=1 BCD_MATH=1
runHook postBuild
'';
@@ -87,20 +85,36 @@ stdenv.mkDerivation (finalAttrs: {
install -m755 gtk/free42dec gtk/free42bin $out/bin
install -m644 README $out/share/doc/free42/README
install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps/free42.xpm
install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps/free42.xpm
install -m644 gtk/icon-48x48.png $out/share/icons/hicolor/48x48/apps/free42.png
install -m644 gtk/icon-128x128.png $out/share/icons/hicolor/128x128/apps/free42.png
install -m644 skins/* $out/share/free42/skins
runHook postInstall
'';
dontWrapGApps = true;
postFixup = ''
wrapProgram $out/bin/free42dec \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ alsa-lib ]} \
"''${gappsWrapperArgs[@]}"
wrapProgram $out/bin/free42bin \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ alsa-lib ]} \
"''${gappsWrapperArgs[@]}"
'';
passthru.updateScript = nix-update-script {
extraArgs = [ "--url=https://codeberg.org/thomasokken/free42" ];
};
meta = {
homepage = "https://thomasokken.com/free42/";
changelog = "https://thomasokken.com/free42/history.html";
description = "Software clone of HP-42S Calculator";
description = "Software clone of the HP-42S calculator";
license = with lib.licenses; [ gpl2Only ];
maintainers = [ ];
maintainers = with lib.maintainers; [ elfenermarcell ];
mainProgram = "free42dec";
platforms = with lib.platforms; unix;
};
})
}
+56
View File
@@ -0,0 +1,56 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
installShellFiles,
versionCheckHook,
}:
buildGoModule (finalAttrs: {
pname = "ghalint";
version = "1.5.3";
src = fetchFromGitHub {
owner = "suzuki-shunsuke";
repo = "ghalint";
tag = "v${finalAttrs.version}";
hash = "sha256-zll71vSqSKIij/TUi4LnGtVqmLhK9UViFDkpnuEvmz8=";
};
vendorHash = "sha256-pCrVBgS7eLCYlfY6FyAGAeEhpV2dYQowtE/BoRUju0o=";
subPackages = [ "cmd/ghalint" ];
env.CGO_ENABLED = 0;
ldflags = [
"-s"
"-w"
"-X main.version=${finalAttrs.version}"
"-X main.commit=v${finalAttrs.version}"
];
nativeBuildInputs = [
installShellFiles
];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd 'ghalint' \
--bash <("$out/bin/ghalint" completion bash) \
--zsh <("$out/bin/ghalint" completion zsh) \
--fish <("$out/bin/ghalint" completion fish)
'';
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
versionCheckProgramArg = "version";
meta = {
homepage = "https://github.com/suzuki-shunsuke/ghalint";
description = "GitHub Actions linter for security best practice";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ryota2357 ];
mainProgram = "ghalint";
};
})
@@ -0,0 +1,11 @@
{
lib,
callPackage,
}:
callPackage ../package.nix {
pname = "git-credential-aol";
scripts = [ "git-credential-aol" ];
description = "Git credential helper for AOL accounts";
license = lib.licenses.asl20;
}
@@ -0,0 +1,11 @@
{
lib,
callPackage,
}:
callPackage ../package.nix {
pname = "git-credential-gmail";
scripts = [ "git-credential-gmail" ];
description = "Git credential helper for Gmail accounts";
license = lib.licenses.asl20;
}
@@ -0,0 +1,11 @@
{
lib,
callPackage,
}:
callPackage ../package.nix {
pname = "git-credential-outlook";
scripts = [ "git-credential-outlook" ];
description = "Git credential helper for Microsoft Outlook accounts";
license = lib.licenses.asl20;
}
@@ -0,0 +1,11 @@
{
lib,
callPackage,
}:
callPackage ../package.nix {
pname = "git-credential-yahoo";
scripts = [ "git-credential-yahoo" ];
description = "Git credential helper for Yahoo accounts";
license = lib.licenses.asl20;
}
@@ -0,0 +1,11 @@
{
lib,
callPackage,
}:
callPackage ../package.nix {
pname = "git-msgraph";
scripts = [ "git-msgraph" ];
description = "Git helper to use Microsoft Graph API instead of SMTP to send emails";
license = lib.licenses.asl20;
}
@@ -0,0 +1,11 @@
{
lib,
callPackage,
}:
callPackage ../package.nix {
pname = "git-protonmail";
scripts = [ "git-protonmail" ];
description = "Git helper to use ProtonMail API to send emails";
license = lib.licenses.gpl3Only;
}
@@ -0,0 +1,67 @@
{
lib,
python3Packages,
fetchFromGitHub,
withOpencv ? false,
withPyqt6 ? builtins.elem "git-protonmail" scripts,
withQrcode ? true,
pname ? "git-credential-email",
scripts ? [
"git-credential-aol"
"git-credential-gmail"
"git-credential-outlook"
"git-credential-yahoo"
"git-msgraph"
"git-protonmail"
],
description ? "Git credential helpers for Microsoft Outlook, Gmail, Yahoo, AOL and Proton Mail accounts",
license ? with lib.licenses; [
asl20
gpl3Only
],
}:
let
withProtonmail = builtins.elem "git-protonmail" scripts;
in
python3Packages.buildPythonApplication rec {
inherit pname;
version = "5.5.2";
src = fetchFromGitHub {
owner = "AdityaGarg8";
repo = "git-credential-email";
tag = "v${version}";
hash = "sha256-N4w339MvIOronA4MKS4ipLpQt+0xo+JVbgKWFYP2zP0=";
};
dependencies =
with python3Packages;
[
keyring
requests
]
++ lib.optionals withPyqt6 [ pyqt6 ]
++ lib.optionals withQrcode [ qrcode ]
++ lib.optionals withProtonmail [
bcrypt
cryptography
pgpy
requests-toolbelt
typing-extensions
]
++ lib.optionals (withProtonmail && withOpencv) [ opencv4 ];
pyproject = false;
installPhase = ''
install -D -t $out/bin ${lib.concatStringsSep " " scripts}
'';
meta = {
inherit description license;
homepage = "https://github.com/AdityaGarg8/git-credential-email";
changelog = "https://github.com/AdityaGarg8/git-credential-email/releases/tag/${src.tag}";
maintainers = with lib.maintainers; [ sephalon ];
};
}
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "git-spice";
version = "0.20.1";
version = "0.20.2";
src = fetchFromGitHub {
owner = "abhinav";
repo = "git-spice";
tag = "v${finalAttrs.version}";
hash = "sha256-1kZJM1XNlpJetfJ73fbhVuav8vG9EMQs618P4ftY3eg=";
hash = "sha256-YC6nLDOBvLEw07UdgmGgFX3w91/qqK+CiDw2K+eMk7Q=";
};
vendorHash = "sha256-CXCp61iBBhANFjmFybRWQ5cj/JKOfzHX2xjLzJ4IQTc=";
+43 -13
View File
@@ -7,29 +7,40 @@
fetchFromGitLab,
python3Packages,
wrapGAppsHook4,
opensc,
gtk4,
glib,
gdk-pixbuf,
gobject-introspection,
desktop-file-utils,
shared-mime-info,
appstream-glib,
libadwaita,
gtksourceview5,
xvfb-run,
nix-update-script,
}:
python3Packages.buildPythonApplication rec {
pname = "gnome-secrets";
version = "10.4";
format = "other";
version = "12.0";
pyproject = false;
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "secrets";
rev = version;
hash = "sha256-FyBtw7Gkvd5XONkM7OVGxE+S5FpuUIl7KWLFHoQeoN4=";
tag = version;
hash = "sha256-U+ez/rhaXROcLdXhFY992YzIRBCkR05hxkAYbWIpa/A=";
};
postPatch = ''
substituteInPlace gsecrets/meson.build \
--replace-fail \
"join_paths(get_option('prefix'), get_option('libdir'), 'opensc-pkcs11.so')" \
"'${lib.getLib opensc}/lib/opensc-pkcs11.so'"
'';
nativeBuildInputs = [
meson
ninja
@@ -37,6 +48,7 @@ python3Packages.buildPythonApplication rec {
pkg-config
wrapGAppsHook4
desktop-file-utils
shared-mime-info
appstream-glib
gobject-introspection
];
@@ -46,11 +58,13 @@ python3Packages.buildPythonApplication rec {
glib
gdk-pixbuf
libadwaita
gtksourceview5
];
propagatedBuildInputs = with python3Packages; [
dependencies = with python3Packages; [
pygobject3
construct
pyhibp
pykcs11
pykeepass
pyotp
@@ -59,24 +73,40 @@ python3Packages.buildPythonApplication rec {
zxcvbn-rs-py
];
doCheck = true;
nativeCheckInputs = [
python3Packages.pytest
xvfb-run
];
checkPhase = ''
runHook preCheck
env \
GTK_A11Y=none \
PYTHONPATH="$out/${python3Packages.python.sitePackages}:$PYTHONPATH" \
XDG_DATA_DIRS="$out/share/gsettings-schemas/$name:$XDG_DATA_DIRS" \
xvfb-run meson test --print-errorlogs
runHook postCheck
'';
# Prevent double wrapping, let the Python wrapper use the args in preFixup.
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
meta = {
description = "Password manager for GNOME which makes use of the KeePass v.4 format";
homepage = "https://gitlab.gnome.org/World/secrets";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ mvnetbiz ];
teams = [ teams.gnome-circle ];
changelog = "https://gitlab.gnome.org/World/secrets/-/releases/${version}";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ mvnetbiz ];
teams = [ lib.teams.gnome-circle ];
mainProgram = "secrets";
};
}
+2 -2
View File
@@ -26,13 +26,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "golden-cheetah";
version = "3.7";
version = "3.7-SP1";
src = fetchFromGitHub {
owner = "GoldenCheetah";
repo = "GoldenCheetah";
tag = "v${finalAttrs.version}";
hash = "sha256-INlkFWugIoln7wrmgLZUC/Ye8eV+mlT6BZ0ZdP7CiqE=";
hash = "sha256-NsXTe4Ht4TFDu7/nK3/hdCk/K2mPm59I9GHkVOTDc74=";
};
buildInputs =
+2 -2
View File
@@ -35,11 +35,11 @@
stdenv.mkDerivation rec {
pname = "gpsd";
version = "3.26.1";
version = "3.27";
src = fetchurl {
url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-3H5GWWjBVA5hvFfHWG1qV6AEchKgFO/a00j5B7wuCZA=";
sha256 = "sha256-YZUpLdeRC+aMtwGNRRZig+rv0/nbl3P81umnjUnqyZk=";
};
# TODO: render & install HTML documentation using asciidoctor
+2 -2
View File
@@ -12,7 +12,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "3.5.1";
version = "3.6";
pname = "grandperspective";
src = fetchurl {
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
url = "mirror://sourceforge/grandperspectiv/GrandPerspective-${
lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version
}.dmg";
hash = "sha256-ZD6XUtsbwxHe3MYdCH9I/pYBCGgilPhhbYQChr0wCj4=";
hash = "sha256-DSdtaf5GN1PSIt8GTGrMUuaVI2C+ANKi78E1cxVrYTE=";
};
sourceRoot = "GrandPerspective.app";
+8 -3
View File
@@ -9,16 +9,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hl-log-viewer";
version = "0.31.2";
version = "0.32.2";
src = fetchFromGitHub {
owner = "pamburus";
repo = "hl";
tag = "v${finalAttrs.version}";
hash = "sha256-SYPzYdbrXltBk/A5T/yZo3IJXdowsHk38yL86BreF0k=";
hash = "sha256-JG5+RpUc8UGYxSlEX0c+dcUU2fFuVEwz/duK94XYkOc=";
};
cargoHash = "sha256-1iBpzoTyNB6ECDuGW26JMdu2YolrPmIT040V35Pi+C4=";
cargoHash = "sha256-dIUQVLjjlQGHrMgWUeFc3R/QJbddRG8wmZklUHQTaas=";
nativeBuildInputs = [ installShellFiles ];
@@ -31,6 +31,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
installManPage hl.1
'';
checkFlags = [
# test broken on zero-width TTY, see https://github.com/pamburus/hl/issues/1140
"--skip=help::tests::test_formatter_new"
];
doInstallCheck = true;
nativeInstallCheckInputs = [
versionCheckHook
+3 -3
View File
@@ -7,16 +7,16 @@
buildNpmPackage (finalAttrs: {
pname = "homebridge";
version = "1.11.0";
version = "1.11.1";
src = fetchFromGitHub {
owner = "homebridge";
repo = "homebridge";
tag = "v${finalAttrs.version}";
hash = "sha256-95wd3pVumz/KGZNjOHrSOUtI4vipeHRWK7D8e9Nzpyo=";
hash = "sha256-E21HowCRD78MZW3+um6vN5/NLncF/bt9v/Tw+RYe5xM=";
};
npmDepsHash = "sha256-fcahrKJXvEMosLbcZY6x/hklmAy4Dyf65xNfFPa4OpU=";
npmDepsHash = "sha256-Da64zHwvX0W1viNhy4afr60onlWqbizaVox9Un6c65Y=";
# Homebridge's clean phase attempts to install rimraf directly, which fails in nix builds
# rimraf is already in the declared dependencies, so we just don't need to do it.
+20 -7
View File
@@ -38,18 +38,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-03am9z381UozNsmWZefopMp8/tLycXJyiZ5BUGaV1kY=";
};
# This patch ensures that the cache implementation respects the env
# variable `NIXPKGS_HOMEPAGE_CACHE_DIR`, which is set by default in the
# wrapper below.
# The patch is automatically generated by the `update.sh` script.
patches = [ ./prerender_cache_path.patch ];
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs)
pname
version
src
patches
;
fetcherVersion = 1;
hash = "sha256-svkqmRFwZpcExFWtAbLL0lpHhzsI2s7RiLfQajIqjck=";
@@ -68,6 +61,26 @@ stdenv.mkDerivation (finalAttrs: {
env.PYTHON = "${python3}/bin/python";
preBuild = ''
# patch next.js file-system-cache to use NIXPKGS_HOMEPAGE_CACHE_DIR
# related:
# * https://github.com/NixOS/nixpkgs/issues/328621 ("homepage-dashboard: Failed to update prerender cache")
# * https://github.com/NixOS/nixpkgs/pull/337902 ("nixos/homepage-dashboard: set an explicit cache dir")
# * https://github.com/NixOS/nixpkgs/issues/458494 ("homepage-dashboard: Dashboard styles are destroyed after a server restart")
# source file
substituteInPlace node_modules/next/dist/server/lib/incremental-cache/file-system-cache.js \
--replace-fail 'this.serverDistDir = ctx.serverDistDir;' \
'this.serverDistDir = require("path").join((process.env.NIXPKGS_HOMEPAGE_CACHE_DIR || "/var/cache/homepage-dashboard"), "homepage");'
# bundled runtimes
for bundle in node_modules/next/dist/compiled/next-server/*.runtime.prod.js; do
substituteInPlace "$bundle" \
--replace-fail 'this.serverDistDir=e.serverDistDir' \
'this.serverDistDir=(process.env.NIXPKGS_HOMEPAGE_CACHE_DIR||"/var/cache/homepage-dashboard")+"/homepage"'
done
'';
buildPhase = ''
runHook preBuild
mkdir -p config
@@ -1,89 +0,0 @@
diff --git a/package.json b/package.json
index 927674f3..e7d45ae6 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,9 @@
"onlyBuiltDependencies": [
"osx-temperature-sensor",
"sharp"
- ]
+ ],
+ "patchedDependencies": {
+ "next": "patches/next.patch"
+ }
}
}
diff --git a/patches/next.patch b/patches/next.patch
new file mode 100644
index 00000000..39b17f16
--- /dev/null
+++ b/patches/next.patch
@@ -0,0 +1,13 @@
+diff --git a/dist/server/lib/incremental-cache/file-system-cache.js b/dist/server/lib/incremental-cache/file-system-cache.js
+index cc2cc2506668435d817eaa9f0aa32b568b6aa331..26f0321efcadb4f4255dbd660825759721e799eb 100644
+--- a/dist/server/lib/incremental-cache/file-system-cache.js
++++ b/dist/server/lib/incremental-cache/file-system-cache.js
+@@ -24,7 +24,7 @@ class FileSystemCache {
+ constructor(ctx){
+ this.fs = ctx.fs;
+ this.flushToDisk = ctx.flushToDisk;
+- this.serverDistDir = ctx.serverDistDir;
++ this.serverDistDir = require("path").join((process.env.NIXPKGS_HOMEPAGE_CACHE_DIR || "/var/cache/homepage-dashboard"), "homepage");
+ this.revalidatedTags = ctx.revalidatedTags;
+ if (ctx.maxMemoryCacheSize) {
+ if (!FileSystemCache.memoryCache) {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2765fe04..11dc6a81 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,6 +4,11 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
+patchedDependencies:
+ next:
+ hash: 9fc5fd5a09692f0ba1ffb8a979978da9595ed6c3f9bcb0a01205f20fdc39b68c
+ path: patches/next.patch
+
importers:
.:
@@ -52,10 +57,10 @@ importers:
version: 1.2.2
next:
specifier: ^15.5.2
- version: 15.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ version: 15.5.2(patch_hash=9fc5fd5a09692f0ba1ffb8a979978da9595ed6c3f9bcb0a01205f20fdc39b68c)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
next-i18next:
specifier: ^12.1.0
- version: 12.1.0(next@15.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ version: 12.1.0(next@15.5.2(patch_hash=9fc5fd5a09692f0ba1ffb8a979978da9595ed6c3f9bcb0a01205f20fdc39b68c)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
ping:
specifier: ^0.4.4
version: 0.4.4
@@ -5243,7 +5248,7 @@ snapshots:
net@1.0.2: {}
- next-i18next@12.1.0(next@15.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+ next-i18next@12.1.0(next@15.5.2(patch_hash=9fc5fd5a09692f0ba1ffb8a979978da9595ed6c3f9bcb0a01205f20fdc39b68c)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
dependencies:
'@babel/runtime': 7.26.9
'@types/hoist-non-react-statics': 3.3.6
@@ -5251,14 +5256,14 @@ snapshots:
hoist-non-react-statics: 3.3.2
i18next: 21.10.0
i18next-fs-backend: 1.2.0
- next: 15.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ next: 15.5.2(patch_hash=9fc5fd5a09692f0ba1ffb8a979978da9595ed6c3f9bcb0a01205f20fdc39b68c)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
react: 18.3.1
react-i18next: 11.18.6(i18next@21.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
transitivePeerDependencies:
- react-dom
- react-native
- next@15.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+ next@15.5.2(patch_hash=9fc5fd5a09692f0ba1ffb8a979978da9595ed6c3f9bcb0a01205f20fdc39b68c)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
dependencies:
'@next/env': 15.5.2
'@swc/helpers': 0.5.15
+1 -26
View File
@@ -1,34 +1,10 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl jq git nodejs pnpm sd
#!nix-shell -I nixpkgs=./. -i bash -p curl jq git
# shellcheck shell=bash
set -euo pipefail
nixpkgs="$(pwd)"
cd $(readlink -e $(dirname "${BASH_SOURCE[0]}"))
# Generate the patch file that makes homepage-dashboard aware of the NIXPKGS_HOMEPAGE_CACHE_DIR environment variable.
# Generating the patch this way ensures that both the patch is included, and the lock file is updated.
generate_patch() {
local version; version="$1"
echo "Generating homepage-dashboard patch"
git clone -b "v$version" https://github.com/gethomepage/homepage.git src
pushd src
pnpm install
pnpm patch next
sd \
'this.serverDistDir = ctx.serverDistDir;' \
'this.serverDistDir = require("path").join((process.env.NIXPKGS_HOMEPAGE_CACHE_DIR || "/var/cache/homepage-dashboard"), "homepage");' \
node_modules/.pnpm_patches/next*/dist/server/lib/incremental-cache/file-system-cache.js
pnpm patch-commit node_modules/.pnpm_patches/next*
git add -A .
git diff -p --staged --no-ext-diff > ../prerender_cache_path.patch
popd
rm -rf src
}
# Update the hash of the homepage-dashboard source code in the Nix expression.
update_homepage_dashboard_source() {
local version; version="$1"
@@ -62,5 +38,4 @@ if [[ "$CURRENT_VERSION" == "$LATEST_VERSION" ]]; then
fi
update_homepage_dashboard_source "$LATEST_VERSION"
generate_patch "$LATEST_VERSION"
update_pnpm_deps_hash
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "inputplumber";
version = "0.67.1";
version = "0.68.0";
src = fetchFromGitHub {
owner = "ShadowBlip";
repo = "InputPlumber";
tag = "v${version}";
hash = "sha256-6eoZhW6gPpVUcTbZ8wGPIDJHs8rVcjo42y9RGVeckag=";
hash = "sha256-nnHRdqX5q9WSu8d/jwTgelncCVs1UnV8Z0aae42KUls=";
};
cargoHash = "sha256-nquIe596MFg0JU6xpyBJzXKrXfakuQ1iLMnqDKa0DKk=";
cargoHash = "sha256-yfZzkVALrD/dgANS4O/JCJPgepzMmqYMQ087Fmtlw68=";
nativeBuildInputs = [
pkg-config
+2 -3
View File
@@ -20,7 +20,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "iotas";
version = "0.11.2";
version = "0.12.5";
pyproject = false;
src = fetchFromGitLab {
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "World";
repo = "iotas";
tag = version;
hash = "sha256-nDmofssoaB3BKh6X3Lpi5xftyo9Zw3IUoD3wte0wPM4=";
hash = "sha256-qbUI2hkW3rRiiBWFADuB9KFMf6Maw+WAkdy6dTE+Yo0=";
};
nativeBuildInputs = [
@@ -59,7 +59,6 @@ python3.pkgs.buildPythonApplication rec {
linkify-it-py
mdit-py-plugins
pypandoc
strenum
packaging
];
+6 -3
View File
@@ -9,13 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "korrect";
version = "0.2.1";
version = "0.3.3";
src = fetchCrate {
inherit (finalAttrs) pname version;
hash = "sha256-/tFrHTZ6YHnN9OvoHBJWEnwX780DYrs0f5wV1dPyAcc=";
hash = "sha256-iEbzYcWxDAumGLsr7MlqOrTEj3SwGFmdvw15M5Fz9cs=";
};
cargoHash = "sha256-bG31pqI/eB+J0FUq/lWak6Ekf+00JiCfuKZdyUkIAAw=";
cargoHash = "sha256-RIa1rn74I/DQktjtY4BTWiYIBO1aLpXcKtXMBOAogvE=";
# Tests create a local http server to check the download functionality
__darwinAllowLocalNetworking = true;
passthru.updateScript = nix-update-script { };
+6 -6
View File
@@ -4,13 +4,13 @@
fetchurl,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libmnl";
version = "1.0.5";
src = fetchurl {
url = "https://netfilter.org/projects/libmnl/files/${pname}-${version}.tar.bz2";
sha256 = "09851ns07399rbz0y8slrlmnw3fn1nakr8d37pxjn5gkks8rnjr7";
url = "https://netfilter.org/projects/libmnl/files/libmnl-${finalAttrs.version}.tar.bz2";
hash = "sha256-J0ubkZ7zFSv7PaOhPJUN1g1uK81UIw/+yimNA7QNBSU=";
};
meta = {
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
libmnl is a minimalistic user-space library oriented to Netlink developers.
There are a lot of common tasks in parsing, validating, constructing of both the Netlink
header and TLVs that are repetitive and easy to get wrong.
This library aims to provide simple helpers that allows you to re-use code and to avoid
This library aims to provide simple helpers that allow you to re-use code and avoid
re-inventing the wheel.
'';
homepage = "https://netfilter.org/projects/libmnl/index.html";
license = lib.licenses.lgpl21Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ azey7f ];
};
}
})
+2 -2
View File
@@ -30,13 +30,13 @@ let
in
stdenv.mkDerivation rec {
pname = "librime";
version = "1.14.0";
version = "1.15.0";
src = fetchFromGitHub {
owner = "rime";
repo = "librime";
rev = version;
sha256 = "sha256-dks8Ab2YQ8t4hZRneMP9aU0VFZgIg+meh8RI0pp0lR0=";
sha256 = "sha256-B3mhHv8fk8TGXu+jJSYJ2R8QW+nG5RJx6kFtP5ILhYY=";
};
nativeBuildInputs = [
-1
View File
@@ -114,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [
johnrtitor
lzcunt
phip1611
prince213
programmerlexi
surfaceflinger
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "luau";
version = "0.700";
version = "0.701";
src = fetchFromGitHub {
owner = "luau-lang";
repo = "luau";
tag = finalAttrs.version;
hash = "sha256-tZbpSKwiXLk6Aw5VusPnPT+4pGyURqC9hmr0jiiKMg4=";
hash = "sha256-8Zla+iPARPPbNN3l7Bc96KguhxboPYj21yVYC0u6LlY=";
};
nativeBuildInputs = [ cmake ];
+2 -2
View File
@@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation rec {
pname = "lxgw-neoxihei";
version = "1.227";
version = "1.228";
src = fetchurl {
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
hash = "sha256-7EJlMgY++YrUQ9BKZLOft1isc8EHuOLVoORMLMPngTI=";
hash = "sha256-1RCcvlgbOE06DIgBALq2PJxipGVFonhQJcFr03dOEzc=";
};
dontUnpack = true;
+1 -2
View File
@@ -119,10 +119,9 @@ rustPlatform.buildRustPackage rec {
''
export HOME=$(mktemp -d)
spec="$(mise usage)"
for shl in bash fish zsh; do
echo "testing $shl"
usage complete-word --shell $shl --spec "$spec"
usage complete-word --shell $shl --file <(mise usage)
done
touch $out
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "moor";
version = "2.9.1";
version = "2.9.2";
src = fetchFromGitHub {
owner = "walles";
repo = "moor";
tag = "v${finalAttrs.version}";
hash = "sha256-vnK/Lo/CK39gsX2FyXoB0Q7FpJ5+5AZrpVxCBkuupOQ=";
hash = "sha256-+gNM/yqoEZ0JUieRsdGCpO5MG+Jtaxwi114PQEhaMiY=";
};
vendorHash = "sha256-FNkXrmNV8Gj2gAJX9a3wXiJ36/9edQFMIc6eAR9AYRU=";
vendorHash = "sha256-KTAckjrOZVwl6UBFmbqqMjUyYJDQxySxWiV46QNTfuY=";
nativeBuildInputs = [ installShellFiles ];
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mprisence";
version = "1.2.13";
version = "1.2.14";
src = fetchFromGitHub {
owner = "lazykern";
repo = "mprisence";
tag = "v${finalAttrs.version}";
hash = "sha256-ZOkgBwph0BQVbDhKCTMd0/On2Hti2FleRVhDx1HlwVk=";
hash = "sha256-prRnDQvBewgeaHZGonwnRHoVgbSgo9FINsUu4LoI078=";
};
cargoHash = "sha256-SocWijJA2Io7AzOyM2miUCFG5rD2zCfYJrON/Q7yTaw=";
cargoHash = "sha256-yL6b6X7OHuiILDowTsWdvTvftO2p6KmfmFQ1UxHjsAg=";
nativeBuildInputs = [ pkg-config ];
+2 -2
View File
@@ -31,7 +31,7 @@ assert gpgmeSupport -> sslSupport;
stdenv.mkDerivation rec {
pname = "mutt";
version = "2.2.15";
version = "2.2.16";
outputs = [
"out"
"doc"
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
hash = "sha256-pRaGEE5CA/TCo7F2UnvjuV0I6AjpT9LcrbfDBWa/iU0=";
hash = "sha256-HTEJp0OtiyXu+XEJsr20Zdt4N9Co0hHNOIvhtvqsPzI=";
};
patches = [
+2 -2
View File
@@ -9,13 +9,13 @@
}:
python3.pkgs.buildPythonApplication rec {
version = "0.8.1";
version = "0.8.2";
pyproject = true;
pname = "nbstripout";
src = fetchPypi {
inherit pname version;
hash = "sha256-6qyLa05yno3+Hl3ywPi6RKvFoXplRI8EgBQfgL4jC7E=";
hash = "sha256-KHZTDraEv5OltI/m2SshY/eNBAchx2s31bnhUU04/Gk=";
};
testAssets = fetchFromGitHub {
+2 -2
View File
@@ -9,11 +9,11 @@
stdenvNoCC.mkDerivation rec {
pname = "net-news-wire";
version = "6.1.9";
version = "6.2";
src = fetchurl {
url = "https://github.com/Ranchero-Software/NetNewsWire/releases/download/mac-${version}/NetNewsWire${version}.zip";
hash = "sha256-wG1/EpsK1CMXDTM/WlNFBBUVq6IUSj0GEkqY5Azf/ls=";
hash = "sha256-DXpC2bXgFRKYULXlrkDkwxtU77iChh5SITAIEQC5exQ=";
};
sourceRoot = ".";
+24 -6
View File
@@ -2,16 +2,32 @@
lib,
stdenv,
fetchurl,
nix-update-script,
}:
let
version = "2.0.88";
platformMap = {
aarch64-linux = {
url = "https://github.com/netbootxyz/netboot.xyz/releases/download/${version}/netboot.xyz-arm64.efi";
hash = "sha256-AeW92FU65XVJKGPi+A/iz7Jvtb7wKIO3xG3Cx7v4kRg=";
};
x86_64-linux = {
url = "https://github.com/netbootxyz/netboot.xyz/releases/download/${version}/netboot.xyz.efi";
hash = "sha256-ipbZJ0mPCuwzb/TDtXXUBTuWOcSsKGAJ1GEGIgB2G7E=";
};
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "netboot.xyz-efi";
version = "2.0.88";
inherit version;
src = fetchurl {
url = "https://github.com/netbootxyz/netboot.xyz/releases/download/${finalAttrs.version}/netboot.xyz.efi";
hash = "sha256-ipbZJ0mPCuwzb/TDtXXUBTuWOcSsKGAJ1GEGIgB2G7E=";
inherit
(platformMap.${stdenv.hostPlatform.system}
or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
)
url
hash
;
};
dontUnpack = true;
@@ -20,12 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
cp $src $out
'';
passthru.updateScript = nix-update-script { };
passthru.updateScript = ./update.sh;
meta = {
homepage = "https://netboot.xyz/";
description = "Tool to boot OS installers and utilities over the network, to be run from a bootloader";
license = lib.licenses.asl20;
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
platforms = builtins.attrNames platformMap;
maintainers = with lib.maintainers; [ pinpox ];
};
})
+9
View File
@@ -0,0 +1,9 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq nix-update
set -eou pipefail
version="$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --silent --fail --location "https://api.github.com/repos/netbootxyz/netboot.xyz/releases/latest" | jq --raw-output .tag_name)"
nix-update --version "$version" --system x86_64-linux netbootxyz-efi
nix-update --version skip --system aarch64-linux netbootxyz-efi
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nixbit";
version = "0.2.3";
version = "0.3.0";
src = fetchFromGitHub {
owner = "pbek";
repo = "nixbit";
tag = "v${finalAttrs.version}";
hash = "sha256-mraZeNl3EegOCgRrhp3p1D0hUJ4RNJpDW37/4BasLNM=";
hash = "sha256-EaL+ekvvnKZM7fdfuzNz9Ddq7k0HN3ZGW8JpyVyNV9c=";
};
nativeBuildInputs = [
+6 -6
View File
@@ -9,10 +9,10 @@
libpulseaudio,
}:
let
versionMajor = "8.13";
versionMinor = "1";
versionBuild_x86_64 = "1";
versionBuild_i686 = "1";
versionMajor = "9.2";
versionMinor = "18";
versionBuild_x86_64 = "3";
versionBuild_i686 = "3";
in
stdenv.mkDerivation rec {
pname = "nomachine-client";
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz";
sha256 = "sha256-8rxlxdtGU8avpvYJr+bpnsy5v91sqtlij/MCGWrcanY=";
sha256 = "sha256-/ElNG6zIOdE3Qwf/si9fKXMLxM81ZmRZmvbc6rw/M0c=";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz";
sha256 = "sha256-Ekyxc4wODjqWhp0aINhaPGLy9lh6Rt9AmxIt1ulE8Go=";
sha256 = "sha256-uLkBprPjYyWN0jwB6rJwG1sLbIg/jAjx57joLBhVwr0=";
}
else
throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "nova-password";
version = "0.5.9";
version = "0.5.10";
src = fetchFromGitHub {
owner = "sapcc";
repo = "nova-password";
tag = "v${version}";
hash = "sha256-+RW+uJ9mLEiNMGYio+FcAJHvga8uzDLmgcylwoUJIho=";
hash = "sha256-73o/dSS/cmLnie4Rbc3FOzRS2clw17GI7gk2nW1u3/I=";
};
vendorHash = "sha256-7Hg5s3yZezLVwoUoeF4125QtjeLSCcsjnCD6+zbMz8I=";
vendorHash = "sha256-8eBS4kczObQZksK/bS/guv8nBNY0DInJ4Dk1Hlr2B7A=";
meta = {
description = "Decrypt the admin password generated for the VM in OpenStack";
+4 -4
View File
@@ -34,18 +34,18 @@
}:
let
openrct2-version = "0.4.28";
openrct2-version = "0.4.29";
# Those versions MUST match the pinned versions within the CMakeLists.txt
# file. The REPLAYS repository from the CMakeLists.txt is not necessary.
objects-version = "1.7.3";
objects-version = "1.7.5";
openmsx-version = "1.6.1";
opensfx-version = "1.0.6";
title-sequences-version = "0.4.26";
objects = fetchurl {
url = "https://github.com/OpenRCT2/objects/releases/download/v${objects-version}/objects.zip";
hash = "sha256-yBApJkV4cG7R24hmXhKnClg+cdxNPrTbJiU10vBYnqs=";
hash = "sha256-yLnTA5qSD2fK8VsJ6DEsxPgNWe1/4CiGJbnM7e9gZ5c=";
};
openmsx = fetchurl {
url = "https://github.com/OpenRCT2/OpenMusic/releases/download/v${openmsx-version}/openmusic.zip";
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "OpenRCT2";
repo = "OpenRCT2";
tag = "v${openrct2-version}";
hash = "sha256-/sgvlfJ3aMqpv5hJNzmnpOq7Bx0BTtGzLOMKGA543O8=";
hash = "sha256-Udwqn8RFXaUmgbA3rXH/WZTK88HbHEQucsbDP51Oe7g=";
};
nativeBuildInputs = [
+17 -6
View File
@@ -2,24 +2,29 @@
lib,
stdenv,
fetchFromGitHub,
pkg-config,
ncurses,
perl,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "openvi";
version = "7.6.31";
version = "7.7.32";
src = fetchFromGitHub {
owner = "johnsonjh";
repo = "OpenVi";
rev = version;
hash = "sha256-RqmulYHQFZmTHQAYgZmB8tAG6mSquNODmssfKB8YqDU=";
tag = finalAttrs.version;
hash = "sha256-kLULaKEefMpNLANnVdWAZeH+2KY5gEWGce6vJ/R7HAI=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
ncurses
perl
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
ncurses
];
makeFlags = [
@@ -30,6 +35,12 @@ stdenv.mkDerivation rec {
"IUSGR=$(USER)"
];
# Don't include ncurses header, but link against ncurses
# openvi requires GNU ncurses symbols, but ncurses headers
# is incompatible with macOS wchar.h, resulting in
# "error: expected function body after function declarator"
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-L${lib.getLib ncurses}/lib -lncursesw";
enableParallelBuilding = true;
meta = {
@@ -40,4 +51,4 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [ aleksana ];
mainProgram = "ovi";
};
}
})
@@ -0,0 +1,31 @@
{
lib,
buildGoModule,
fetchFromGitHub,
postgresql,
}:
buildGoModule (finalAttrs: {
pname = "pg-schema-diff";
version = "1.0.2";
src = fetchFromGitHub {
owner = "stripe";
repo = "pg-schema-diff";
tag = "v${finalAttrs.version}";
hash = "sha256-u0niTTqrzsI4u0OGY5qkgbitadcbEK/ElFGnPJsEMwo=";
};
nativeCheckInputs = [
postgresql
];
vendorHash = "sha256-Hs3xrGP8eJwW3rQ9nViB9sqC8spjHV6rCoy1u/SYHak=";
meta = {
description = "Go library for diffing Postgres schemas and generating SQL migrations";
homepage = "https://github.com/stripe/pg-schema-diff";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.bitbloxhub ];
mainProgram = "pg-schema-diff";
};
})
+3 -3
View File
@@ -13,16 +13,16 @@ let
in
buildGoModule (finalAttrs: {
pname = "pinact";
version = "3.4.2";
version = "3.4.4";
src = fetchFromGitHub {
owner = "suzuki-shunsuke";
repo = "pinact";
tag = "v${finalAttrs.version}";
hash = "sha256-O+yLhvkF84uCrgb5MPvk8i/YJ4tLR7YQvBAYbpnxwEM=";
hash = "sha256-UHKlj85TGMaiS3/nHA72KevmwoDhiULFaJonHSEFzpQ=";
};
vendorHash = "sha256-A9bMAGaNvCKfSozBwhrJLgQUrCLN78Og3eCmezsJ6c8=";
vendorHash = "sha256-GN/RiXNjwBwsA/ai5j550RAWOI7x0pv1cM/Q0AfIOyk=";
env.CGO_ENABLED = 0;
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "plasma-panel-spacer-extended";
version = "1.11.3";
version = "1.12.0";
src = fetchFromGitHub {
owner = "luisbocanegra";
repo = "plasma-panel-spacer-extended";
tag = "v${finalAttrs.version}";
hash = "sha256-FJbRKL/jALKxS97uVftyKwjSUhADtHv/hgOJA5VvGNQ=";
hash = "sha256-Tg+HvGuPCgnCkW/biY/zFuuLCokK3WaobAjNVLw9Qf0=";
};
nativeBuildInputs = [
+120
View File
@@ -0,0 +1,120 @@
{
lib,
stdenv,
fetchurl,
alsa-lib,
copyDesktopItems,
wrapGAppsHook3,
makeDesktopItem,
pkg-config,
nix-update-script,
}:
stdenv.mkDerivation rec {
pname = "plus42";
version = "1.3.12";
src = fetchurl {
url = "https://thomasokken.com/plus42/upstream/plus42-upstream-${version}.tgz";
hash = "sha256-IBXQu1hI0bJZISL9wInAzf2z8zbynXXP15oG/od+MC8=";
};
nativeBuildInputs = [
copyDesktopItems
pkg-config
wrapGAppsHook3
];
buildInputs = [ alsa-lib ];
postPatch = ''
substituteInPlace gtk/Makefile \
--replace-fail /bin/ls ls
'';
dontConfigure = true;
desktopItems = [
(makeDesktopItem {
name = "plus42bin";
desktopName = "Plus42Bin";
genericName = "Calculator";
exec = "plus42bin";
type = "Application";
comment = "Software clone of the HP-42S calculator (enhanced version)";
icon = "plus42";
categories = [
"Utility"
"Calculator"
];
})
(makeDesktopItem {
name = "plus42dec";
desktopName = "Plus42Dec";
genericName = "Calculator";
exec = "plus42dec";
type = "Application";
comment = "Software clone of the HP-42S calculator (enhanced version)";
icon = "plus42";
categories = [
"Utility"
"Calculator"
];
})
];
buildPhase = ''
runHook preBuild
make -C gtk cleaner
make --jobs=$NIX_BUILD_CORES -C gtk AUDIO_ALSA=1
make -C gtk clean
make --jobs=$NIX_BUILD_CORES -C gtk AUDIO_ALSA=1 BCD_MATH=1
runHook postBuild
'';
installPhase = ''
runHook preInstall
install --directory $out/bin \
$out/share/doc/plus42 \
$out/share/plus42/skins \
$out/share/icons/hicolor/48x48/apps \
$out/share/icons/hicolor/128x128/apps
install -m755 gtk/plus42dec gtk/plus42bin $out/bin
install -m644 README $out/share/doc/plus42/README
install -m644 gtk/icon-48x48.png $out/share/icons/hicolor/48x48/apps/plus42.png
install -m644 gtk/icon-128x128.png $out/share/icons/hicolor/128x128/apps/plus42.png
install -m644 skins/* $out/share/plus42/skins
runHook postInstall
'';
dontWrapGApps = true;
postFixup = ''
wrapProgram $out/bin/plus42dec \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ alsa-lib ]} \
"''${gappsWrapperArgs[@]}"
wrapProgram $out/bin/plus42bin \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ alsa-lib ]} \
"''${gappsWrapperArgs[@]}"
'';
passthru.updateScript = nix-update-script {
extraArgs = [ "--url=https://codeberg.org/thomasokken/plus42desktop" ];
};
meta = {
homepage = "https://thomasokken.com/plus42/";
changelog = "https://thomasokken.com/plus42/history.html";
description = "Software clone of the HP-42S calculator (enhanced version)";
license = with lib.licenses; [ gpl2Only ];
maintainers = with lib.maintainers; [ elfenermarcell ];
mainProgram = "plus42dec";
platforms = with lib.platforms; unix;
};
}
+59 -54
View File
@@ -15,7 +15,7 @@
go-md2man,
nixosTests,
python3,
makeWrapper,
makeBinaryWrapper,
symlinkJoin,
replaceVars,
extraPackages ? [ ],
@@ -39,55 +39,20 @@
coreutils,
runtimeShell,
}:
let
# do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed
binPath = lib.makeBinPath (
lib.optionals stdenv.hostPlatform.isLinux [
fuse-overlayfs
util-linuxMinimal
iptables
iproute2
nftables
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
vfkit
]
++ extraPackages
);
helpersBin = symlinkJoin {
name = "podman-helper-binary-wrapper";
# this only works for some binaries, others may need to be added to `binPath` or in the modules
paths = [
gvproxy
]
++ lib.optionals stdenv.hostPlatform.isLinux [
aardvark-dns
catatonit # added here for the pause image and also set in `containersConf` for `init_path`
netavark
passt
conmon
crun
]
++ extraRuntimes;
};
in
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "podman";
version = "5.7.0";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-SHIWfY8eKdimwpLfB1NtpF1DBh6qaR5KCDTU4vWAMFw=";
};
patches = [
(replaceVars ./hardcode-paths.patch {
bin_path = helpersBin;
bin_path = finalAttrs.passthru.helpersBin;
})
# we intentionally don't build and install the helper so we shouldn't display messages to users about it
@@ -107,7 +72,7 @@ buildGoModule rec {
pkg-config
go-md2man
installShellFiles
makeWrapper
makeBinaryWrapper
python3
];
@@ -121,11 +86,14 @@ buildGoModule rec {
systemd
];
HELPER_BINARIES_DIR = "${PREFIX}/libexec/podman"; # used in buildPhase & installPhase
PREFIX = "${placeholder "out"}";
env = {
HELPER_BINARIES_DIR = "${placeholder "out"}/libexec/podman"; # used in buildPhase & installPhase
PREFIX = "${placeholder "out"}";
};
buildPhase = ''
runHook preBuild
patchShebangs .
${
if stdenv.hostPlatform.isDarwin then
@@ -138,11 +106,13 @@ buildGoModule rec {
''
}
make docs
runHook postBuild
'';
installPhase = ''
runHook preInstall
${
if stdenv.hostPlatform.isDarwin then
''
@@ -154,10 +124,11 @@ buildGoModule rec {
''
}
make install.completions install.man
mkdir -p ${HELPER_BINARIES_DIR}
ln -s ${helpersBin}/bin/* ${HELPER_BINARIES_DIR}
mkdir -p ${finalAttrs.env.HELPER_BINARIES_DIR}
ln -s ${finalAttrs.passthru.helpersBin}/bin/* ${finalAttrs.env.HELPER_BINARIES_DIR}
wrapProgram $out/bin/podman \
--prefix PATH : ${lib.escapeShellArg binPath}
--prefix PATH : ${lib.escapeShellArg finalAttrs.passthru.binPath}
runHook postInstall
'';
@@ -177,13 +148,47 @@ buildGoModule rec {
versionCheckKeepEnvironment = [ "HOME" ];
versionCheckProgramArg = "--version";
passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
inherit (nixosTests) podman;
# related modules
inherit (nixosTests)
podman-tls-ghostunnel
;
oci-containers-podman = nixosTests.oci-containers.podman;
passthru = {
tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
inherit (nixosTests) podman;
# related modules
inherit (nixosTests)
podman-tls-ghostunnel
;
oci-containers-podman = nixosTests.oci-containers.podman;
};
# do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed
binPath = lib.makeBinPath (
lib.optionals stdenv.hostPlatform.isLinux [
fuse-overlayfs
util-linuxMinimal
iptables
iproute2
nftables
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
vfkit
]
++ extraPackages
);
helpersBin = symlinkJoin {
name = "podman-helper-binary-wrapper";
# this only works for some binaries, others may need to be added to `binPath` or in the modules
paths = [
gvproxy
]
++ lib.optionals stdenv.hostPlatform.isLinux [
aardvark-dns
catatonit # added here for the pause image and also set in `containersConf` for `init_path`
netavark
passt
conmon
crun
]
++ extraRuntimes;
};
};
meta = {
@@ -194,9 +199,9 @@ buildGoModule rec {
To install on NixOS, please use the option `virtualisation.podman.enable = true`.
'';
changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md";
changelog = "https://github.com/containers/podman/blob/v${finalAttrs.version}/RELEASE_NOTES.md";
license = lib.licenses.asl20;
teams = [ lib.teams.podman ];
mainProgram = "podman";
};
}
})
@@ -1,39 +1,35 @@
{
lib,
buildPythonApplication,
python3Packages,
fetchFromGitHub,
replaceVars,
writeShellScript,
steam-run,
steam-run-free,
fetchpatch2,
setuptools-scm,
vdf,
pillow,
winetricks,
yad,
pytestCheckHook,
nix-update-script,
extraCompatPaths ? "",
}:
buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "protontricks";
version = "1.13.0";
version = "1.13.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Matoking";
repo = "protontricks";
tag = version;
hash = "sha256-6z6J31EBXf0FU3fWjjg3dX7OAOiN9Z3ONdKIweJiZBY=";
hash = "sha256-YJUNp+8n1LPlD7lCAy6AMNxToloPBn8ZaRfREiwS9ls=";
};
patches = [
# Use steam-run to run Proton binaries
(replaceVars ./steam-run.patch {
steamRun = lib.getExe steam-run;
steamRun = lib.getExe steam-run-free;
bash = writeShellScript "steam-run-bash" ''
exec ${lib.getExe steam-run} bash "$@"
exec ${lib.getExe steam-run-free} bash "$@"
'';
})
@@ -45,9 +41,9 @@ buildPythonApplication rec {
})
];
build-system = [ setuptools-scm ];
build-system = with python3Packages; [ setuptools-scm ];
dependencies = [
dependencies = with python3Packages; [
vdf
pillow
];
@@ -64,7 +60,7 @@ buildPythonApplication rec {
]
++ lib.optional (extraCompatPaths != "") "--set STEAM_EXTRA_COMPAT_TOOLS_PATHS ${extraCompatPaths}";
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
# From 1.6.0 release notes (https://github.com/Matoking/protontricks/releases/tag/1.6.0):
# In most cases the script is unnecessary and should be removed as part of the packaging process.
@@ -76,12 +72,12 @@ buildPythonApplication rec {
passthru.updateScript = nix-update-script { };
meta = with lib; {
meta = {
description = "Simple wrapper for running Winetricks commands for Proton-enabled games";
homepage = "https://github.com/Matoking/protontricks";
changelog = "https://github.com/Matoking/protontricks/blob/${src.tag}/CHANGELOG.md";
license = licenses.gpl3Only;
maintainers = with maintainers; [ kira-bruneau ];
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ kira-bruneau ];
platforms = [
"x86_64-linux"
"i686-linux"
+38 -343
View File
@@ -1,8 +1,8 @@
[
{
"pname": "Avalonia",
"version": "11.3.1",
"hash": "sha256-732wl4/JmvYFS26NLvPD7T/V3J3JZUDy6Xwj5p1TNyE="
"version": "11.3.8",
"hash": "sha256-0cM3VVudDUELNE/fWehuCplPKLITjw1hbg9IGtIm20g="
},
{
"pname": "Avalonia.Angle.Windows.Natives",
@@ -11,53 +11,53 @@
},
{
"pname": "Avalonia.BuildServices",
"version": "0.0.31",
"hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
"version": "11.3.1",
"hash": "sha256-JYcA/DgTHRJ02/FcURqtJnXYhhdzki8DGECLkZ4zONg="
},
{
"pname": "Avalonia.Desktop",
"version": "11.3.1",
"hash": "sha256-H6SLCi3by9bFF1YR12PnNZSmtC44UQPKr+5+8LvqC90="
"version": "11.3.8",
"hash": "sha256-X/ggsRzsN7o3O4Iw4uvjgOdlW58Xbe8Jpv4llRuFcoA="
},
{
"pname": "Avalonia.Fonts.Inter",
"version": "11.3.1",
"hash": "sha256-LfNYF+SywrIzUw4T+GRE/Mr8E7GQskQQTTfK3Kc5YVQ="
"version": "11.3.8",
"hash": "sha256-EaUjJZ+K+5HaSJ1hmLgwuH4HGp1N2s1TNJogZulpVT8="
},
{
"pname": "Avalonia.FreeDesktop",
"version": "11.3.1",
"hash": "sha256-Iph1SQazNNr9liox0LR7ITidAEEWhp8Mg9Zn4MZVkRQ="
"version": "11.3.8",
"hash": "sha256-XJogaWo4ZNg/PvckA6D5EEuyQneYUKDePnT9snNwaHs="
},
{
"pname": "Avalonia.Native",
"version": "11.3.1",
"hash": "sha256-jNzqmHm58bbPGs/ogp6gFvinbN81Psg+sg+Z5UsbcDs="
"version": "11.3.8",
"hash": "sha256-Hm4uneEN3rQVmSp1Ai4cDSTJpixYDzYJzEkAesvwxPw="
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "11.3.1",
"hash": "sha256-evkhJOxKjsR+jNLrXRcrhqjFdlrxYMMMRBJ6FK08vMM="
"version": "11.3.8",
"hash": "sha256-pCIcQuTTcpik4xg5x8Y/QuXaW/GmNny/5ZBVr0bhmNU="
},
{
"pname": "Avalonia.Skia",
"version": "11.3.1",
"hash": "sha256-zN09CcuSqtLcQrTCQOoPJrhLd4LioZqt/Qi4sDp/cJI="
"version": "11.3.8",
"hash": "sha256-FeJ6tdgeGKHkv0JKPOq2eHTxaDTT0t2yJ7wavBKnr68="
},
{
"pname": "Avalonia.Themes.Fluent",
"version": "11.3.1",
"hash": "sha256-PApWHwIoLzbzrnyXJQLVy85Rbxag7NFEKMXOs2iVVaA="
"version": "11.3.8",
"hash": "sha256-fVXc8+WPRa3YkX4EIt/Wjz9hnI7y6pv3P1cCBhEPgOg="
},
{
"pname": "Avalonia.Win32",
"version": "11.3.1",
"hash": "sha256-w3+8luJByeIchiVQ0wsq0olDabX/DndigyBEuK8Ty04="
"version": "11.3.8",
"hash": "sha256-YwzyF4YJtCzcLpGxDe6U3Tpxjcqft8mcYjUNnL2Ockg="
},
{
"pname": "Avalonia.X11",
"version": "11.3.1",
"hash": "sha256-0iUFrDM+10T3OiOeGSEiqQ6EzEucQL3shZUNqOiqkyQ="
"version": "11.3.8",
"hash": "sha256-SlAWkiaGYc+Ynq4QcO3/xorz2EIWWyrZcHXIk7F68i0="
},
{
"pname": "CommunityToolkit.Mvvm",
@@ -91,33 +91,33 @@
},
{
"pname": "LTRData.DiscUtils.Core",
"version": "1.0.57",
"hash": "sha256-W3MWde/i+/AjEnVrddhcBiuyHmujVAxq+NpJudgoIpc="
"version": "1.0.70",
"hash": "sha256-JkhbjVxQRipBp83zj2c5UyDHwEj/ubVi3r3GZ42onbI="
},
{
"pname": "LTRData.DiscUtils.Iso9660",
"version": "1.0.57",
"hash": "sha256-h1LEAyKcrLB/QY77HH2eLAPtdFQccVeycwkVPr7x9/U="
"version": "1.0.70",
"hash": "sha256-HU15n+1yxQdgxPtEXNZ9FRhX6TMa9YevrI+gkODdMco="
},
{
"pname": "LTRData.DiscUtils.OpticalDisk",
"version": "1.0.57",
"hash": "sha256-SD26HhU4622oUBWU+iK2yTj025RQh+P8ZJybJsZyUSs="
"version": "1.0.70",
"hash": "sha256-lRof+dic1S/M8Llxy34NAbPkipYm9RRwNBl2oywS9KY="
},
{
"pname": "LTRData.DiscUtils.Streams",
"version": "1.0.57",
"hash": "sha256-00o7vHJGU0yNzFp9FlKBH+gCHVie4VBcx2PnTdW5XZQ="
"version": "1.0.70",
"hash": "sha256-wM3hkrr3nv1vzgkzVw/e4m/VwMGvwzSTm8jnN/Tt4I4="
},
{
"pname": "LTRData.DiscUtils.Udf",
"version": "1.0.57",
"hash": "sha256-HHCfCaW7SUpOiYBXARnXeAq0yKfPLudVL8HwLrmhL0g="
"version": "1.0.70",
"hash": "sha256-cmv6YkU/tS94w8/QZwrdJkDtxicXjhqyZ3GsdJYxjLQ="
},
{
"pname": "LTRData.Extensions",
"version": "1.0.18",
"hash": "sha256-BUmv97cIUDNtjPj7IKW1iZHhqx9iyidb4xwAGXbRyvM="
"version": "1.0.20",
"hash": "sha256-K/y4fOHXQ3HbgwisjVbKmCz0lHEPilG+Icdj5choJg8="
},
{
"pname": "MicroCom.Runtime",
@@ -129,21 +129,6 @@
"version": "6.0.0",
"hash": "sha256-lNL5C4W7/p8homWooO/3ZKDZQ2M0FUTDixJwqWBPVbo="
},
{
"pname": "Microsoft.Bcl.HashCode",
"version": "6.0.0",
"hash": "sha256-87myurC/jMcX1f32167j7FTjbZ6FvUE0esrhYTGcvWs="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.1.0",
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
},
{
"pname": "Microsoft.NETCore.Targets",
"version": "1.1.0",
"hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
},
{
"pname": "Newtonsoft.Json",
"version": "12.0.1",
@@ -159,156 +144,6 @@
"version": "1.0.2",
"hash": "sha256-ZUj6YFSMZp5CZtXiamw49eZmbp1iYBuNsIKNnjxcRzA="
},
{
"pname": "runtime.any.System.Collections",
"version": "4.3.0",
"hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
},
{
"pname": "runtime.any.System.Diagnostics.Tracing",
"version": "4.3.0",
"hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="
},
{
"pname": "runtime.any.System.Globalization",
"version": "4.3.0",
"hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="
},
{
"pname": "runtime.any.System.IO",
"version": "4.3.0",
"hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="
},
{
"pname": "runtime.any.System.Reflection",
"version": "4.3.0",
"hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
},
{
"pname": "runtime.any.System.Reflection.Primitives",
"version": "4.3.0",
"hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="
},
{
"pname": "runtime.any.System.Resources.ResourceManager",
"version": "4.3.0",
"hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="
},
{
"pname": "runtime.any.System.Runtime",
"version": "4.3.0",
"hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
},
{
"pname": "runtime.any.System.Runtime.Handles",
"version": "4.3.0",
"hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="
},
{
"pname": "runtime.any.System.Runtime.InteropServices",
"version": "4.3.0",
"hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="
},
{
"pname": "runtime.any.System.Text.Encoding",
"version": "4.3.0",
"hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
},
{
"pname": "runtime.any.System.Threading.Tasks",
"version": "4.3.0",
"hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
},
{
"pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="
},
{
"pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="
},
{
"pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="
},
{
"pname": "runtime.native.System",
"version": "4.3.0",
"hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
},
{
"pname": "runtime.native.System.Security.Cryptography.Apple",
"version": "4.3.1",
"hash": "sha256-Mt2QAjNH5nKnwpbyoUe2O+En97CP84EQFoS3CkmYXAM="
},
{
"pname": "runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.0",
"hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
},
{
"pname": "runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="
},
{
"pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="
},
{
"pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY="
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
"version": "4.3.1",
"hash": "sha256-J5RHzSIfUs001NsY82+ZXn0ZIqux+aLvY7uDuXjRd8U="
},
{
"pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="
},
{
"pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="
},
{
"pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="
},
{
"pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="
},
{
"pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
"version": "4.3.2",
"hash": "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q="
},
{
"pname": "runtime.unix.System.Diagnostics.Debug",
"version": "4.3.0",
"hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="
},
{
"pname": "runtime.unix.System.Private.Uri",
"version": "4.3.0",
"hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
},
{
"pname": "runtime.unix.System.Runtime.Extensions",
"version": "4.3.0",
"hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="
},
{
"pname": "SkiaSharp",
"version": "2.88.9",
@@ -334,150 +169,10 @@
"version": "2.88.9",
"hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
},
{
"pname": "System.Collections",
"version": "4.3.0",
"hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
},
{
"pname": "System.Collections.Concurrent",
"version": "4.3.0",
"hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
},
{
"pname": "System.Diagnostics.Debug",
"version": "4.3.0",
"hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
},
{
"pname": "System.Diagnostics.Tracing",
"version": "4.3.0",
"hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
},
{
"pname": "System.Globalization",
"version": "4.3.0",
"hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
},
{
"pname": "System.IO",
"version": "4.3.0",
"hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
},
{
"pname": "System.IO.Hashing",
"version": "9.0.6",
"hash": "sha256-QhOlqpeQsqJ2Lly8xV0lzSaNBmkGPEgtyTe9xSvkyAw="
},
{
"pname": "System.IO.Pipelines",
"version": "8.0.0",
"hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
},
{
"pname": "System.Linq",
"version": "4.3.0",
"hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
},
{
"pname": "System.Memory",
"version": "4.5.5",
"hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
},
{
"pname": "System.Memory",
"version": "4.6.3",
"hash": "sha256-JgeK63WMmumF6L+FH5cwJgYdpqXrSDcgTQwtIgTHKVU="
},
{
"pname": "System.Private.Uri",
"version": "4.3.0",
"hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
},
{
"pname": "System.Reflection",
"version": "4.3.0",
"hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
},
{
"pname": "System.Reflection.Primitives",
"version": "4.3.0",
"hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
},
{
"pname": "System.Resources.ResourceManager",
"version": "4.3.0",
"hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
},
{
"pname": "System.Runtime",
"version": "4.3.0",
"hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
},
{
"pname": "System.Runtime.Extensions",
"version": "4.3.0",
"hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
},
{
"pname": "System.Runtime.Handles",
"version": "4.3.0",
"hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
},
{
"pname": "System.Runtime.InteropServices",
"version": "4.3.0",
"hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
},
{
"pname": "System.Runtime.Numerics",
"version": "4.3.0",
"hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
},
{
"pname": "System.Security.Cryptography.Algorithms",
"version": "4.3.1",
"hash": "sha256-QlO/ppRk/OyDYHCimD867RAlKIOakidD0ICNOt63XNQ="
},
{
"pname": "System.Security.Cryptography.Encoding",
"version": "4.3.0",
"hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
},
{
"pname": "System.Security.Cryptography.Primitives",
"version": "4.3.0",
"hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="
},
{
"pname": "System.Text.Encoding",
"version": "4.3.0",
"hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
},
{
"pname": "System.Text.Encoding.CodePages",
"version": "9.0.5",
"hash": "sha256-trMfhFwGMnM60+UUqud7gFLL2YF5pCdhleKSonkkd84="
},
{
"pname": "System.Threading",
"version": "4.3.0",
"hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
},
{
"pname": "System.Threading.Tasks",
"version": "4.3.0",
"hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
},
{
"pname": "System.Threading.Tasks.Extensions",
"version": "4.5.4",
"hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
},
{
"pname": "System.Threading.Tasks.Extensions",
"version": "4.6.3",
"hash": "sha256-GrySx1F6Ah6tfnnQt/PHC+dbzg+sfP47OOFX0yJF/xo="
"version": "10.0.0",
"hash": "sha256-zq3baIIsQ1kaY4CVl0vpkDcZb2ZNwT7wC0wDqzEN5oI="
},
{
"pname": "Tmds.DBus.Protocol",
@@ -486,7 +181,7 @@
},
{
"pname": "WmiLight",
"version": "6.14.0",
"hash": "sha256-MmfXmWsLonyTKNXqmszFbvyaDjPexgH5UoCGI8h2JlA="
"version": "6.16.0",
"hash": "sha256-R2L7HLEkGEWFtiLDVqXNHyszPUlLdP/jm4hX8iAmHkk="
}
]
+4 -5
View File
@@ -10,18 +10,17 @@
buildDotnetModule rec {
pname = "ps3-disc-dumper";
version = "4.3.9";
version = "4.4.0";
src = fetchFromGitHub {
owner = "13xforever";
repo = "ps3-disc-dumper";
tag = "v${version}";
hash = "sha256-F+FyCuxzg7oTF2iRxWygXeGnspHrZ3Za8HhCSKNgoR4=";
hash = "sha256-urIeR6iVL5DDqzOUfI291WYArrEpLzNg7pnvjACUuk8=";
};
dotnet-sdk = dotnetCorePackages.sdk_9_0;
dotnet-runtime = dotnetCorePackages.sdk_9_0;
dotnetFlags = [ "-p:TargetFramework=net9.0" ];
dotnet-sdk = dotnetCorePackages.sdk_10_0;
dotnet-runtime = dotnetCorePackages.sdk_10_0;
dotnetRestoreFlags = [ "-p:Configuration=${buildType}" ];
buildType = "Linux";
projectFile = "UI.Avalonia/UI.Avalonia.csproj";
+2 -2
View File
@@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "quarkus-cli";
version = "3.28.5";
version = "3.29.4";
src = fetchurl {
url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
hash = "sha256-uXDZIFqH+PgI0MSZb3SYFpQm2XMFdXBdPZrjb7DT1Bg=";
hash = "sha256-ApMv7nHYBaW/L0Gvs6M8rJc3n/9yhSRtSAnWda06iak=";
};
nativeBuildInputs = [ makeWrapper ];
+3 -3
View File
@@ -12,19 +12,19 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raycast";
version = "1.103.2";
version = "1.103.7";
src =
{
aarch64-darwin = fetchurl {
name = "Raycast.dmg";
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
hash = "sha256-i8wMyuHIgKztklBcr5AZjsaf+C1N7QGnF2E3VUNwh5A=";
hash = "sha256-wsFjjBYF8yQE7y/WyTPX2OM5euqYK2PBcxbUFLB3XY0=";
};
x86_64-darwin = fetchurl {
name = "Raycast.dmg";
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
hash = "sha256-2/+/TQz7AIeR6mTZXEPKXE8K10r4Qw0hIRop9kysGpc=";
hash = "sha256-+btAHctDvsOLUG/v7c3PGxJTWAxj28laQu72Wq2pl/M=";
};
}
.${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");
+3 -3
View File
@@ -17,7 +17,7 @@
buildGoModule rec {
pname = "rclone";
version = "1.71.2";
version = "1.72.0";
outputs = [
"out"
@@ -28,10 +28,10 @@ buildGoModule rec {
owner = "rclone";
repo = "rclone";
tag = "v${version}";
hash = "sha256-fmqIjwWhWj8ucw/OP6B9dCGKaF8eiVQdJEtK0a6G9E4=";
hash = "sha256-zZFjGkxQLkYNYpSRrVVsLFK6CvpVSJEvLn6FDdufxqA=";
};
vendorHash = "sha256-0RK2gc3InPZZnAEgv01fgG19cWeKCsBP6JN2OCVY8O4=";
vendorHash = "sha256-tNeL43WGWeX88vXJwQzxubUPIyejl3PPHXLc8oNeno4=";
subPackages = [ "." ];
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rumdl";
version = "0.0.169";
version = "0.0.181";
src = fetchFromGitHub {
owner = "rvben";
repo = "rumdl";
tag = "v${finalAttrs.version}";
hash = "sha256-1ly0bAA8NGGqdF6U/BYGvr+aR6OU0ArbK7A0vAMdtlQ=";
hash = "sha256-qwsZ4S0F9JEpVP05RbvUQT8mBemtJQwJ6DRMp+r2TM0=";
};
cargoHash = "sha256-qnNm69SM3pt0LAIOvu0xhnTFft+SCD2LmY3hNoturmo=";
cargoHash = "sha256-DwCzpyoJcnD/j3umEJGMaMlt0WgPtK3HaztDieuWo90=";
cargoBuildFlags = [
"--bin=rumdl"
@@ -6,13 +6,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "stevenblack-blocklist";
version = "3.16.34";
version = "3.16.36";
src = fetchFromGitHub {
owner = "StevenBlack";
repo = "hosts";
tag = finalAttrs.version;
hash = "sha256-8bMy/zGjf42QG5c/6v99dZQiLNsUI68+ij4l5RC8L7s=";
hash = "sha256-7sOoxpT65O3Mks9+xfISuRgx55E6eRdbsDpdMafTq98=";
};
outputs = [
+16 -10
View File
@@ -9,23 +9,26 @@
python3Packages,
}:
# NOTE: for subunit python library see pkgs/top-level/python-packages.nix
# NOTE: for the subunit python library see pkgs/top-level/python-packages.nix
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "subunit";
version = "1.4.2";
src = fetchurl {
url = "https://launchpad.net/subunit/trunk/${version}/+download/${pname}-${version}.tar.gz";
url = "https://launchpad.net/subunit/trunk/${finalAttrs.version}/+download/subunit-${finalAttrs.version}.tar.gz";
hash = "sha256-hlOOv6kIC97w7ICVsuXeWrsUbVu3tCSzEVKUHXYG2dI=";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
pkg-config
perl
python3Packages.wrapPython
python3Packages.testscenarios
];
buildInputs = [
check
cppunit
perl
python3Packages.wrapPython
];
propagatedBuildInputs = with python3Packages; [
@@ -33,13 +36,16 @@ stdenv.mkDerivation rec {
testscenarios
];
strictDeps = true;
postFixup = "wrapPythonPrograms";
meta = with lib; {
meta = {
description = "Streaming protocol for test results";
mainProgram = "subunit-diff";
homepage = "https://launchpad.net/subunit";
license = licenses.asl20;
platforms = platforms.all;
license = lib.licenses.asl20;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ azey7f ];
};
}
})
+3 -3
View File
@@ -12,14 +12,14 @@
buildGoModule (finalAttrs: {
pname = "symfony-cli";
version = "5.15.1";
vendorHash = "sha256-tAaTgcZMvpw1a6sSu86gbgP66Wzkvga1FIIGZHCFSQA=";
version = "5.16.0";
vendorHash = "sha256-StRdOTEuijjnDWvXNjAVzvDL3zXQJ4LZOioart1CFPw=";
src = fetchFromGitHub {
owner = "symfony-cli";
repo = "symfony-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-sjiGHIwCI2W/hN/+b3SPiSANtZyOnv110E9Dgi0qr70=";
hash = "sha256-rPiqvlRygwernra/NyoLxpUfD8eAKeHQzt09VMvvi0U=";
leaveDotGit = true;
postFetch = ''
git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE

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