Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-06-05 18:40:33 +00:00
committed by GitHub
140 changed files with 1116 additions and 1480 deletions

View File

@@ -36,7 +36,7 @@ jobs:
permission-pull-requests: write
permission-workflows: write
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
ref: ${{ github.event.pull_request.head.sha }}
token: ${{ steps.app-token.outputs.token }}

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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: |

View File

@@ -52,7 +52,7 @@ jobs:
runs-on: ${{ matrix.runner }}
timeout-minutes: 60
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions

View File

@@ -43,7 +43,7 @@ jobs:
runs-on: ubuntu-slim
timeout-minutes: 3
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
path: trusted
@@ -95,7 +95,7 @@ jobs:
runs-on: ubuntu-slim
timeout-minutes: 3
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
path: trusted
@@ -137,7 +137,7 @@ jobs:
runs-on: ubuntu-24.04-arm
timeout-minutes: 5
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions

View File

@@ -23,7 +23,7 @@ jobs:
timeout-minutes: 2
if: contains(github.event.comment.body, '@NixOS/nixpkgs-merge-bot merge')
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: |

View File

@@ -47,7 +47,7 @@ jobs:
ciPinBumpCommit: ${{ steps.find-pinned-commit.outputs.ciPinBumpCommit }}
ciPinBumpCommitShort: ${{ steps.find-pinned-commit.outputs.ciPinBumpCommitShort }}
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
path: trusted
@@ -55,7 +55,7 @@ jobs:
ci/supportedVersions.nix
- name: Check out the PR at the test merge commit
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
ref: ${{ inputs.mergedSha }}
@@ -171,7 +171,7 @@ jobs:
sudo mkswap /swap
sudo swapon /swap
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions
@@ -256,7 +256,7 @@ jobs:
statuses: write # creating 'Eval Summary' commit statuses
timeout-minutes: 5
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions
@@ -471,7 +471,7 @@ jobs:
runs-on: ubuntu-24.04-arm
timeout-minutes: 10
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions

View File

@@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-24.04-arm
timeout-minutes: 10
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions
@@ -61,7 +61,7 @@ jobs:
runs-on: ubuntu-24.04-arm
timeout-minutes: 10
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions
@@ -90,7 +90,7 @@ jobs:
runs-on: ubuntu-24.04-arm
timeout-minutes: 10
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions
@@ -134,7 +134,7 @@ jobs:
runs-on: ubuntu-slim
timeout-minutes: 5
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: true # Needed to run git fetch for large PRs.
path: trusted

View File

@@ -25,7 +25,7 @@ jobs:
targetSha: ${{ steps.prepare.outputs.targetSha }}
systems: ${{ steps.prepare.outputs.systems }}
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: |

View File

@@ -34,7 +34,7 @@ jobs:
permission-contents: write
permission-pull-requests: write
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false

View File

@@ -36,7 +36,7 @@ jobs:
systems: ${{ steps.prepare.outputs.systems }}
touched: ${{ steps.prepare.outputs.touched }}
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout-cone-mode: true # default, for clarity

View File

@@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-slim
timeout-minutes: 2
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: |

View File

@@ -30,7 +30,7 @@ jobs:
permission-pull-requests: write
- name: Fetch source
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: |

View File

@@ -19,7 +19,7 @@ jobs:
push: ${{ steps.files.outputs.push }}
targetSha: ${{ steps.prepare.outputs.targetSha }}
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout-cone-mode: true # default, for clarity

View File

@@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
sources = {
"x86_64-linux" = {
arch = "linux-x64";
hash = "sha256-fiPj/rkwNevJC2bTjRBkuhwdI3Sqgj3xsQB1yp6KxEM=";
hash = "sha256-q5j8Ip/ew3oHGIakJm/CTeKcW4O9FR062f4rILXbQrQ=";
};
"aarch64-linux" = {
arch = "linux-arm64";
hash = "sha256-NZy2I3cNZBM2oXUJ/mf56QW1edvcKu0HICAZq6VVF6U=";
hash = "sha256-viZxHDA8SfsIVB5R9I/8SB8EEWRvt1kpZPDA4w0sD54=";
};
"x86_64-darwin" = {
arch = "darwin-x64";
hash = "sha256-admTed1OpngSd2BY368AkOQGWnVLX7KM4icgx2uNJYE=";
hash = "sha256-kL0bab7BT45EEh17jKFVHqaMQEYkxLlsDKtK1deoS4M=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
hash = "sha256-l39oH4LOgFrZ5598+YWvArIHrZHSz0NU9wOAMop7kNw=";
hash = "sha256-fJW6fTGRWLBWB1yZ1pGb3p4KkFLhrDXqw+0wjOv71Vo=";
};
};
in
{
name = "claude-code";
publisher = "anthropic";
version = "2.1.158";
version = "2.1.161";
}
// sources.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

View File

@@ -29,28 +29,28 @@
},
"beta": {
"linux": {
"version": "8.12.22-16.BETA",
"version": "8.12.24-24.BETA",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.12.22-16.BETA.x64.tar.gz",
"hash": "sha256-Kpmexrq6WpGpanTIYKaMIpM4rJiy8NV2TR8TILmuhr0="
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.12.24-24.BETA.x64.tar.gz",
"hash": "sha256-2pdVY7X2qfSkxhSEIKod9+8zGsJ91r9rY3ODTjA4Bw8="
},
"aarch64": {
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.12.22-16.BETA.arm64.tar.gz",
"hash": "sha256-7ZxrPLPdGizexCRMHkufi9WapFMApxwDw0VgBTpQ7bM="
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.12.24-24.BETA.arm64.tar.gz",
"hash": "sha256-HIFlrclzIHZftUtYKyMRX9s1UjS//sibTFyhi0NU4pE="
}
}
},
"darwin": {
"version": "8.12.22-16.BETA",
"version": "8.12.24-24.BETA",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/mac/1Password-8.12.22-16.BETA-x86_64.zip",
"hash": "sha256-Ce9A3UKGxJvABDlMhlw9gElGc2iKS+j+CvBnohij4mg="
"url": "https://downloads.1password.com/mac/1Password-8.12.24-24.BETA-x86_64.zip",
"hash": "sha256-KXgqH7bFCIMdmruqnCel7tCWa8YdwKtajFv/HGxb7AE="
},
"aarch64": {
"url": "https://downloads.1password.com/mac/1Password-8.12.22-16.BETA-aarch64.zip",
"hash": "sha256-sfBVX171OQfxh+v8367nmeVNATMRAJdIk+bS2KXF+BA="
"url": "https://downloads.1password.com/mac/1Password-8.12.24-24.BETA-aarch64.zip",
"hash": "sha256-u8uRcR7z65Hs0jq3dXz4HNgI4UH4+AJjtPBH2keUXZI="
}
}
}

View File

@@ -1,46 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
pkg-config,
fuse,
gitUpdater,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "9pfs";
version = "0.6";
src = fetchFromGitHub {
owner = "ftrvxmtrx";
repo = "9pfs";
tag = finalAttrs.version;
sha256 = "sha256-zJ1H5UfnTqGWCPt24Pi+Fr3K04wUiPVUmx1AH2sjXmM=";
};
postPatch = ''
substituteInPlace Makefile --replace-fail "pkg-config" "$PKG_CONFIG"
'';
makeFlags = [
"BIN=$(out)/bin"
"MAN=$(out)/share/man/man1"
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ fuse ];
enableParallelBuilding = true;
passthru.updateScript = gitUpdater { };
meta = {
homepage = "https://github.com/ftrvxmtrx/9pfs";
description = "FUSE-based client of the 9P network filesystem protocol";
mainProgram = "9pfs";
maintainers = [ ];
platforms = lib.platforms.unix;
license = with lib.licenses; [
lpl-102
bsd2
];
};
})

View File

@@ -1,15 +0,0 @@
diff --git a/configure.ac b/configure.ac
index ef07d70..2da26aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,9 +27,9 @@ if test "$have_fuse_opt_parse" = no; then
fi
AM_CONDITIONAL(FUSE_OPT_COMPAT, test "$have_fuse_opt_parse" = no)
-AC_CHECK_FUNCS([setxattr fdatasync getline fgetln])
+AC_CHECK_FUNCS([setxattr getline fgetln])
AC_CONFIG_FILES([Makefile
src/Makefile
compat/Makefile])

View File

@@ -1,44 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
pkg-config,
autoreconfHook,
fuse,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "afuse";
version = "0.5.0";
src = fetchFromGitHub {
owner = "pcarrier";
repo = "afuse";
tag = "v${finalAttrs.version}";
sha256 = "sha256-KpysJRvDx+12BSl9pIGRqbJAM4W1NbzxMgDycGCr2RM=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [ fuse ];
patches = [ ./001-darwin-fdatasync.patch ];
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
# Fix the build on macOS with macFUSE installed
substituteInPlace configure.ac --replace-fail \
'export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH' \
""
'';
meta = {
description = "Automounter in userspace";
homepage = "https://github.com/pcarrier/afuse";
license = lib.licenses.gpl2Only;
maintainers = [ ];
platforms = lib.platforms.unix;
};
})

View File

@@ -15,12 +15,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "algol68g";
version = "3.12.1";
version = "3.12.2";
src = fetchurl {
# Uses archive.org because the original site removes older versions.
url = "https://web.archive.org/web/20260515052918/https://algol68genie.nl/algol68g-3.12.1.tar.gz";
hash = "sha256-Mdoca6W1Wyyv7WrmzaAW/fn0uLkXy6MwSDImVwB+mBk";
url = "https://web.archive.org/web/20260515052918/https://algol68genie.nl/algol68g-3.12.2.tar.gz";
hash = "sha256-4fiubqpgoH3YOlCg1bJHQ3kOayKNulW3CYbOK1awE7k";
};
outputs = [

View File

@@ -14,14 +14,14 @@
util-linux,
wget,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "alpine-make-rootfs";
version = "0.8.1";
src = fetchFromGitHub {
owner = "alpinelinux";
repo = "alpine-make-rootfs";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-ktGJXPJK94RbdqcgsA3fA8+MO0inaRcwaDLx18KFo1w=";
};
@@ -55,4 +55,4 @@ stdenvNoCC.mkDerivation rec {
license = lib.licenses.mit;
platforms = lib.platforms.linux;
};
}
})

View File

@@ -8,24 +8,24 @@
let
# Version and platform-specific data retrieved from Google's manifests
version = "1.0.3";
version = "1.0.6";
sourceData = {
"x86_64-linux" = {
url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/1.0.3-6459114696605696/linux-x64/cli_linux_x64.tar.gz";
hash = "sha256-UM/b3TuXROHHx0dKMU0KtENNREmY+VAYKmxRWewu/ic=";
url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/1.0.6-5359777384103936/linux-x64/cli_linux_x64.tar.gz";
hash = "sha256-rxDLuuium+yQl3SiRcFhLzC5+ZCZU/tG2LQfFZMOYx4=";
};
"aarch64-linux" = {
url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/1.0.3-6459114696605696/linux-arm/cli_linux_arm64.tar.gz";
hash = "sha256-Cp44KTj1wP85y6Z6oCOd1ylL2nTg1mDx7aJuv/Q7nBE=";
url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/1.0.6-5359777384103936/linux-arm/cli_linux_arm64.tar.gz";
hash = "sha256-Mol5V3Lt2A89yrGdwWiOdv4y5dCZkMaT8onXG6IsQtc=";
};
"aarch64-darwin" = {
url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/1.0.3-6459114696605696/darwin-arm/cli_mac_arm64.tar.gz";
hash = "sha256-lbf6dCJ7QhDNomfpi10Dhk9VShxAxTC0zsFIFpGlbtA=";
url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/1.0.6-5359777384103936/darwin-arm/cli_mac_arm64.tar.gz";
hash = "sha256-GmAxVP6KW0Zii2kSDvwwzsa88r/4ko2BVVpS8BeING4=";
};
"x86_64-darwin" = {
url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/1.0.3-6459114696605696/darwin-x64/cli_mac_x64.tar.gz";
hash = "sha256-B1zPkt4h3JN7ZWhin0iTQMCe+NhVvBGKWCLfKnBrZnw=";
url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/1.0.6-5359777384103936/darwin-x64/cli_mac_x64.tar.gz";
hash = "sha256-RqjKhRqiW6Fg61eYzem+uXb5LXBYi5Cyv0hwtCaqomo=";
};
};

View File

@@ -10,14 +10,14 @@
hicolor-icon-theme,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "arc-icon-theme";
version = "20161122";
src = fetchFromGitHub {
owner = "horst3180";
repo = "arc-icon-theme";
tag = version;
tag = finalAttrs.version;
hash = "sha256-TfYtzwo69AC5hHbzEqB4r5Muqvn/eghCGSlmjMCFA7I=";
};
@@ -45,4 +45,4 @@ stdenvNoCC.mkDerivation rec {
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ romildo ];
};
}
})

View File

@@ -15,15 +15,15 @@
python3,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "arc-theme";
version = "20221218";
src = fetchFromGitHub {
owner = "jnsh";
repo = "arc-theme";
tag = version;
sha256 = "sha256-7VmqsUCeG5GwmrVdt9BJj0eZ/1v+no/05KwGFb7E9ns=";
tag = finalAttrs.version;
hash = "sha256-7VmqsUCeG5GwmrVdt9BJj0eZ/1v+no/05KwGFb7E9ns=";
};
nativeBuildInputs = [
@@ -71,4 +71,4 @@ stdenv.mkDerivation rec {
romildo
];
};
}
})

View File

@@ -1,5 +1,4 @@
{
SDL,
addDriverRunpath,
alembic,
apple-sdk_15,
@@ -14,8 +13,8 @@
cudaSupport ? config.cudaSupport,
dbus,
embree,
fetchzip,
fetchFromGitHub,
fetchzip,
ffmpeg_7,
fftw,
fftwFloat,
@@ -26,16 +25,11 @@
jackaudioSupport ? false,
jemalloc,
lib,
libGL,
libGLU,
libx11,
libxext,
libxi,
libxrender,
libxxf86vm,
libdecor,
libepoxy,
libffi,
libGL,
libGLU,
libharu,
libjack2,
libjpeg,
@@ -45,13 +39,18 @@
libspnav,
libtiff,
libwebp,
libx11,
libxext,
libxi,
libxkbcommon,
libxrender,
libxxf86vm,
llvmPackages,
makeWrapper,
manifold,
mesa,
nix-update-script,
openUsdSupport ? !stdenv.hostPlatform.isDarwin,
onetbb,
openal,
opencolorio,
openexr,
@@ -60,6 +59,7 @@
openjpeg,
openpgl,
opensubdiv,
openUsdSupport ? !stdenv.hostPlatform.isDarwin,
openvdb,
openxr-loader,
pkg-config,
@@ -70,11 +70,11 @@
rocmSupport ? config.rocmSupport,
rubberband,
runCommand,
SDL,
shaderc,
spaceNavSupport ? stdenv.hostPlatform.isLinux,
sse2neon,
stdenv,
onetbb,
vulkan-headers,
vulkan-loader,
wayland,
@@ -181,7 +181,7 @@ stdenv'.mkDerivation (finalAttrs: {
(lib.cmakeBool "WITH_CYCLES_DEVICE_OPTIX" cudaSupport)
(lib.cmakeBool "WITH_CYCLES_EMBREE" embreeSupport)
(lib.cmakeBool "WITH_CYCLES_OSL" true)
(lib.cmakeBool "WITH_SYSTEM_GLOG" true)
(lib.cmakeBool "WITH_CYCLES_PARALLEL_DEVICE_KERNEL_BUILD" true)
(lib.cmakeBool "WITH_HYDRA" openUsdSupport)
(lib.cmakeBool "WITH_INSTALL_PORTABLE" false)
(lib.cmakeBool "WITH_JACK" jackaudioSupport)
@@ -193,6 +193,7 @@ stdenv'.mkDerivation (finalAttrs: {
(lib.cmakeBool "WITH_PYTHON_INSTALL_NUMPY" false)
(lib.cmakeBool "WITH_PYTHON_INSTALL_REQUESTS" false)
(lib.cmakeBool "WITH_STRICT_BUILD_OPTIONS" true)
(lib.cmakeBool "WITH_SYSTEM_GLOG" true)
(lib.cmakeBool "WITH_USD" openUsdSupport)
# Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file)
@@ -210,9 +211,7 @@ stdenv'.mkDerivation (finalAttrs: {
]
++ lib.optionals waylandSupport [
(lib.cmakeBool "WITH_GHOST_WAYLAND" true)
(lib.cmakeBool "WITH_GHOST_WAYLAND_DBUS" true)
(lib.cmakeBool "WITH_GHOST_WAYLAND_DYNLOAD" false)
(lib.cmakeBool "WITH_GHOST_WAYLAND_LIBDECOR" true)
]
++ lib.optionals stdenv.cc.isClang [
(lib.cmakeFeature "PYTHON_LINKFLAGS" "") # Clang doesn't support "-export-dynamic"
@@ -277,8 +276,9 @@ stdenv'.mkDerivation (finalAttrs: {
openjpeg
openpgl
(opensubdiv.override { inherit cudaSupport; })
openvdb
onetbb
openvdb
openxr-loader
potrace
pugixml
python3
@@ -302,7 +302,6 @@ stdenv'.mkDerivation (finalAttrs: {
libxrender
libxxf86vm
openal
openxr-loader
]
else
[
@@ -312,7 +311,6 @@ stdenv'.mkDerivation (finalAttrs: {
apple-sdk_15
brotli
llvmPackages.openmp
openxr-loader
]
)
++ lib.optionals stdenv.hostPlatform.isAarch64 [ sse2neon ]
@@ -448,17 +446,15 @@ stdenv'.mkDerivation (finalAttrs: {
meta = {
description = "3D Creation/Animation/Publishing System";
homepage = "https://www.blender.org";
# They comment two licenses: GPLv2 and Blender License, but they
# say: "We've decided to cancel the BL offering for an indefinite period."
# OptiX, enabled with cudaSupport, is non-free.
license = with lib.licenses; [ gpl2Plus ] ++ lib.optional cudaSupport nvidiaCudaRedist;
donationPage = "https://fund.blender.org/";
platforms = [
"aarch64-darwin"
"aarch64-linux"
"x86_64-darwin"
"x86_64-linux"
"aarch64-darwin"
];
maintainers = with lib.maintainers; [
amarshall

View File

@@ -15,15 +15,12 @@ stdenv.mkDerivation (finalAttrs: {
makeWrapper
];
installPhase = ''
mkdir $out/{share/applications,bin} -p
sed 's/Exec=blender/Exec=${finalAttrs.finalPackage.pname}/g' $src/share/applications/blender.desktop > $out/share/applications/${finalAttrs.finalPackage.pname}.desktop
cp -r $src/share/blender $out/share
cp -r $src/share/doc $out/share
cp -r $src/share/icons $out/share
mkdir $out/bin -p
cp -r $src/share $out/share
buildPythonPath "''${pythonPath[*]}"
makeWrapper ${blender}/bin/blender $out/bin/${finalAttrs.finalPackage.pname} \
makeWrapper ${blender}/bin/blender $out/bin/blender \
--prefix PATH : $program_PATH \
--prefix PYTHONPATH : $program_PYTHONPATH
'';

View File

@@ -26,7 +26,6 @@
libsysprof-capture,
libthai,
libxkbcommon,
pcre,
pkg-config,
python3,
sqlite,
@@ -74,7 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
libsysprof-capture
libthai
libxkbcommon
pcre
python3
sqlite
gcc-unwrapped

View File

@@ -27,8 +27,6 @@
libuuid,
libxkbcommon,
lv2,
pcre,
pcre2,
pkg-config,
python3,
sqlite,
@@ -82,8 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
libuuid
libxkbcommon
lv2
pcre
pcre2
python3
sqlite
];

View File

@@ -1,38 +0,0 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
fuse,
glib,
attr,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ciopfs";
version = "0.4";
src = fetchurl {
url = "https://www.brain-dump.org/projects/ciopfs/ciopfs-${finalAttrs.version}.tar.gz";
sha256 = "0sr9i9b3qfwbfvzvk00yrrg3x2xqk1njadbldkvn7hwwa4z5bm9l";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
fuse
glib
attr
];
makeFlags = [
"DESTDIR=$(out)"
"PREFIX="
];
meta = {
homepage = "https://www.brain-dump.org/projects/ciopfs/";
description = "Case-insensitive filesystem layered on top of any other filesystem";
license = lib.licenses.gpl2Only;
platforms = lib.platforms.linux;
};
})

View File

@@ -1,47 +1,47 @@
{
"version": "2.1.158",
"commit": "96d5f49347b9949c6a3e6287cbb62b8939b7e1c2",
"buildDate": "2026-05-29T23:34:41Z",
"version": "2.1.161",
"commit": "6a550aea7c747b1b0ddd8bb61dbe199c4ad41320",
"buildDate": "2026-06-02T01:55:49Z",
"platforms": {
"darwin-arm64": {
"binary": "claude",
"checksum": "536a0517fa64d48ddcbc8eb511a3d08027d47e06d148872332a8041d72c22768",
"size": 215233824
"checksum": "5b4dc79eab05f9756c252c71deb339efa4429dffc1967dd8392cf87fcde4867f",
"size": 218040864
},
"darwin-x64": {
"binary": "claude",
"checksum": "b7b33293702fb8e0a119b795d5af5178bd346fb46d4d7f161336d521f62d1451",
"size": 217747984
"checksum": "6f874fecac8a951f5f1991dc1470bc85a5e24f2588859b89cca0f1b6b5592310",
"size": 220555024
},
"linux-arm64": {
"binary": "claude",
"checksum": "98807675a3ed5b7b775f7eaa81eda32cba2810b97e9db9f6f98d7bd658cec00e",
"size": 240563848
"checksum": "7dfa0a79a2fc9f332057cdc0302f808cba63df7b75e2ccb5a7c1ab62639804e3",
"size": 243316360
},
"linux-x64": {
"binary": "claude",
"checksum": "dd27008acd42700bac5762652ec83ff604bf9ae0786d4dde55d57a6866017fbe",
"size": 240666320
"checksum": "1f6a22f387a3bce496b6d869389a35dffb5a69c97d9831833f3bd6dc0e6c6c28",
"size": 243439312
},
"linux-arm64-musl": {
"binary": "claude",
"checksum": "742329f43930cbb1122eb1fe7aca339cb3dfb67be83cd256867859fba1e79ce2",
"size": 233418584
"checksum": "8318d4039c60fbb21a53e81f93e46a3b1dcdb9b07462f6fee72d99c9d2b93f83",
"size": 236171096
},
"linux-x64-musl": {
"binary": "claude",
"checksum": "56d66c89bf8d3e8efdab965e1dcc840d993212b40a2e89c751567c4bc605beba",
"size": 235060272
"checksum": "f8e09e0b16502c277ca8a296245eb59f421e424763a99fd132551b701a713bcf",
"size": 237833264
},
"win32-x64": {
"binary": "claude.exe",
"checksum": "10fa305545b20baf6e074a086762bd252b89dfe7035848a5d41385503b1a6c74",
"size": 236306080
"checksum": "3b0b64caf3428fac3751bd1903c350870b34f9e7a4390ac7c2fdb3a711656a04",
"size": 239007904
},
"win32-arm64": {
"binary": "claude.exe",
"checksum": "9e0e303015eb3c9aba782b366b35194073ab8130ac6c091c2c46870798a20bdc",
"size": 232271008
"checksum": "f4a7d910fc5a8b46afc14c36108c46c8b0deeb8f316c6b7e4ede77868ce70acf",
"size": 234972832
}
}
}

View File

@@ -1,44 +0,0 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
fuse,
perl,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cromfs";
version = "1.5.10.2";
src = fetchurl {
url = "https://bisqwit.iki.fi/src/arch/cromfs-${finalAttrs.version}.tar.bz2";
sha256 = "0xy2x1ws1qqfp7hfj6yzm80zhrxzmhn0w2yns77im1lmd2h18817";
};
postPatch = "patchShebangs configure";
installPhase = ''
install -d $out/bin
install cromfs-driver $out/bin
install util/cvcromfs $out/bin
install util/mkcromfs $out/bin
install util/unmkcromfs $out/bin
'';
nativeBuildInputs = [ pkg-config ];
buildInputs = [
fuse
perl
];
makeFlags = [ "CXXFLAGS=-std=c++03" ];
meta = {
description = "FUSE Compressed ROM filesystem with lzma";
homepage = "https://bisqwit.iki.fi/source/cromfs.html";
license = lib.licenses.gpl3;
maintainers = [ ];
platforms = lib.platforms.linux;
};
})

View File

@@ -1,13 +0,0 @@
diff -Naur a/configure.ac b/configure.ac
--- a/configure.ac 2008-04-23 20:37:42.000000000 +0900
+++ b/configure.ac 2021-05-16 01:28:24.000000000 +0900
@@ -46,9 +46,7 @@
# Checks for library functions.
AC_FUNC_CHOWN
-AC_FUNC_MALLOC
AC_FUNC_MKTIME
-AC_FUNC_REALLOC
AC_FUNC_SELECT_ARGTYPES
AC_FUNC_STRFTIME
AC_FUNC_UTIME_NULL

View File

@@ -1,63 +0,0 @@
{
lib,
stdenv,
fetchurl,
autoreconfHook,
fuse,
curl,
pkg-config,
glib,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "curlftpfs";
version = "0.9.2";
src = fetchurl {
url = "mirror://sourceforge/curlftpfs/curlftpfs-${finalAttrs.version}.tar.gz";
sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f";
};
patches = [
# This removes AC_FUNC_MALLOC and AC_FUNC_REALLOC from configure.ac because
# it is known to cause problems. Search online for "rpl_malloc" and
# "rpl_realloc" to find out more.
./fix-rpl_malloc.patch
./suse-bug-580609.patch
./suse-bug-955687.patch
];
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
fuse
curl
glib
zlib
];
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
CFLAGS = "-D__off_t=off_t";
};
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
# Fix the build on macOS with macFUSE installed. Needs autoreconfHook for
# this change to effect
substituteInPlace configure.ac --replace \
'export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH' \
""
'';
doCheck = false; # fails, doesn't work well too, btw
meta = {
description = "Filesystem for accessing FTP hosts based on FUSE and libcurl";
mainProgram = "curlftpfs";
homepage = "https://curlftpfs.sourceforge.net";
license = lib.licenses.gpl2Only;
platforms = lib.platforms.unix;
};
})

View File

@@ -1,10 +0,0 @@
--- a/ftpfs.c 2008-04-30 01:05:47.000000000 +0200
+++ b/ftpfs.c 2010-05-21 13:01:42.569006163 +0200
@@ -503,7 +503,6 @@ static void *ftpfs_write_thread(void *da
curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path);
curl_easy_setopt_or_die(fh->write_conn, CURLOPT_UPLOAD, 1);
- curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, -1);
curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READFUNCTION, write_data_bg);
curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READDATA, fh);
curl_easy_setopt_or_die(fh->write_conn, CURLOPT_LOW_SPEED_LIMIT, 1);

View File

@@ -1,11 +0,0 @@
--- a/ftpfs.c
+++ b/ftpfs.c
@@ -614,6 +614,8 @@ static void free_ftpfs_file(struct ftpfs
sem_destroy(&fh->data_need);
sem_destroy(&fh->data_written);
sem_destroy(&fh->ready);
+ if (fh->buf.size) { buf_free(&fh->buf); }
+ if (fh->stream_buf.size) { buf_free(&fh->stream_buf); }
free(fh);
}

View File

@@ -4,7 +4,7 @@
rustPlatform,
cargo-tauri,
nodejs,
pnpm_9,
pnpm_11,
fetchPnpmDeps,
pnpmConfigHook,
pkg-config,
@@ -27,26 +27,26 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "deadlock-mod-manager";
version = "0.18.0";
version = "1.0.0";
src = fetchFromGitHub {
owner = "deadlock-mod-manager";
repo = "deadlock-mod-manager";
tag = "v${finalAttrs.version}";
hash = "sha256-+64Y6BFwgQIQhmFzZXOeJ/IGFn+OXV58I/ZdARVFt4w=";
hash = "sha256-tSOSjapAlAd63Xkc+MNFVKn1k4+AtW3w3GhicRTV9Pg=";
};
cargoRoot = "apps/desktop";
buildAndTestSubdir = finalAttrs.cargoRoot;
cargoHash = "sha256-6ljyPdobcoBaYyarc7Iin5N24y1YXPafrYAk2xvBtvY=";
cargoHash = "sha256-x0lhn8nAV9xTgWbRAabJscATSCNpkKpzWvdnuZ4BEvw=";
nativeBuildInputs = [
rustPlatform.cargoSetupHook
cargo-tauri.hook
nodejs
pnpmConfigHook
pnpm_9
pnpm_11
pkg-config
wrapGAppsHook3
];
@@ -76,10 +76,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
version
src
;
pnpm = pnpm_9;
pnpm = pnpm_11;
fetcherVersion = 3;
sourceRoot = "source";
hash = "sha256-6lMTvlkIeM9kkbFhHzS9jJsHk2bVZWZs6GPgn+X3Rss=";
hash = "sha256-zl+ZrI21EnMBeMInKvEkUObiZ0OA5SJLJjnHwu/Dagc=";
};
patches = [
@@ -88,9 +88,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
env.VITE_API_URL = "https://api.deadlockmods.app";
# Skip tests that require network access
checkFlags = [
# Requires network access
"--skip=download_manager::downloader::tests::test_download_file"
# Asserts that set_steam_dir rejects a non-Steam directory, but steamlocate
# 2.1.0's SteamDir::from_dir only checks that the path is a directory
# (further validation is an upstream TODO), so this fails in any environment.
"--skip=mod_manager::steam_manager::tests::set_steam_dir_rejects_invalid_directory"
];
preFixup = ''

View File

@@ -7,13 +7,13 @@
}:
buildGoModule (finalAttrs: {
pname = "deja";
version = "0.2.7";
version = "0.3.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "Giammarco-Ferranti";
repo = "deja";
tag = "v${finalAttrs.version}";
hash = "sha256-HHD9x7oM9b0Bt9QhtMhirwobW/o/zjiCVPCFKTn838g=";
hash = "sha256-xxbClKhhSwo+jUjAZ2gS4yOS5sSI76dfPpDzA3qdV18";
};
vendorHash = "sha256-KmLdMK94cGOXMPJwWS6NgLB5OiNmJbszHdnLzauqJm8=";

View File

@@ -21,37 +21,37 @@
let
deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
version = "2.49.0";
version = "2.51.0";
src = fetchFromGitHub {
owner = "chatmail";
repo = "core";
tag = "v${version}";
hash = "sha256-iMgWXlffbGG25iM/SMCQzer1J6clDWwP0hURloL3n2k=";
hash = "sha256-OXazjp3w4NxbcTUNsyeU46erbdj27n1I7dvt+Io/AZ0=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "chatmail-core";
inherit version src;
hash = "sha256-0QhMJis1Hbl/Tn3Rwiz+UjCSieodfYhgL060DWjEOIM=";
hash = "sha256-gt//65v9PF2nnX/zkZGU9hm73lfzOTmw36rbkWu9VX0=";
};
};
electron = electron_41;
in
stdenv.mkDerivation (finalAttrs: {
pname = "deltachat-desktop";
version = "2.49.1";
version = "2.51.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
tag = "v${finalAttrs.version}";
hash = "sha256-JTbhKOTtPNlromdOsdekw6hhuE4gRwm1QB+5qaKy53o=";
hash = "sha256-ORp8lZcHzswrSCe30cGKpZdyqZCcvqLgu2hwvadMHN0=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_9;
fetcherVersion = 3;
hash = "sha256-UZ6/OTUtIiOA1D5PanY4aS+VCBNj/AIbIGYe1eibGMQ=";
hash = "sha256-OP+FbBxSnyFdeKvhqhmdEr1htFSX+WoPj6Ti8Q+ab/Y=";
};
nativeBuildInputs = [

View File

@@ -27,24 +27,24 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "deltachat-tauri";
version = "2.49.1";
version = "2.51.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
tag = "v${finalAttrs.version}";
hash = "sha256-JTbhKOTtPNlromdOsdekw6hhuE4gRwm1QB+5qaKy53o=";
hash = "sha256-ORp8lZcHzswrSCe30cGKpZdyqZCcvqLgu2hwvadMHN0=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
inherit pnpm;
fetcherVersion = 3;
hash = "sha256-UZ6/OTUtIiOA1D5PanY4aS+VCBNj/AIbIGYe1eibGMQ=";
hash = "sha256-OP+FbBxSnyFdeKvhqhmdEr1htFSX+WoPj6Ti8Q+ab/Y=";
};
cargoHash = "sha256-xxO17cpZ86Pg/zlfoEYLdBkY9MstsgNqoJbPWxTaXrw=";
cargoHash = "sha256-JhsoIQZrU4GVcs/TCIug6y/84gODyEWl0Bl2jRNxL5Y=";
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace $cargoDepsCopy/source-registry-0/libappindicator-sys-*/src/lib.rs \

View File

@@ -10,6 +10,7 @@
libxcursor,
libxext,
libxrender,
lv2,
meson,
ninja,
pkg-config,
@@ -31,13 +32,14 @@ let
in
stdenv.mkDerivation {
pname = "distrho-ports";
version = "2021-03-15-unstable-2024-05-01";
version = "2021-03-15-unstable-2025-08-15";
src = fetchFromGitHub {
owner = "DISTRHO";
repo = "DISTRHO-Ports";
rev = "b3596e6a690eb0556e69e8b6d943fee2dfbb04fb";
sha256 = "00fgqwayd20akww3n2imyqscmyrjyc9jj0ar13k9dhpaxqk2jxbf";
rev = "d3b62da2e83c69b0866af5bb2e29ac78dc8014cf";
sha256 = "sha256-wlppmRTdgA/9wWqFp75UyDLYJOqzg1aY+w97wTgJ8lk=";
fetchSubmodules = true;
};
nativeBuildInputs = [
@@ -54,14 +56,20 @@ stdenv.mkDerivation {
libxcursor
libxext
libxrender
lv2
];
env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];
postPatch = ''
chmod +x scripts/*.sh
patchShebangs scripts
'';
postFixup =
let
files = [
(lib.optionalString buildLV2 "$out/lib/lv2/vitalium.lv2/vitalium.so")
(lib.optionalString buildLV2 "$out/lib/lv2/vitalium.lv2/vitalium-lv2.so")
(lib.optionalString buildVST2 "$out/lib/vst/vitalium.so")
(lib.optionalString buildVST3 "$out/lib/vst3/vitalium.vst3/Contents/x86_64-linux/vitalium.so")
];

View File

@@ -29,13 +29,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dosbox-x";
version = "2026.05.02";
version = "2026.06.02";
src = fetchFromGitHub {
owner = "joncampbell123";
repo = "dosbox-x";
rev = "dosbox-x-v${finalAttrs.version}";
hash = "sha256-4P6NH3LZgnV3CpakdKQhW+29hQl2Q30N5fScZgdk84E=";
hash = "sha256-60ZMaevTqYjHq6WrhKVQ8T8kfrQV7Auy59y3JFMHi5w=";
};
# sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants
@@ -88,12 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
# Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL2 subdirectory
env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2_net}/include/SDL2";
configureFlags = [ "--enable-sdl2" ];
configureFlags = [ (lib.strings.enableFeature true "sdl2") ];
enableParallelBuilding = true;
hardeningDisable = [ "format" ]; # https://github.com/joncampbell123/dosbox-x/issues/4436
# Build optional App Bundle target, which needs at least one arch-suffixed binary
postBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
cp src/dosbox-x src/dosbox-x-$(uname -m)

View File

@@ -57,27 +57,16 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "eden";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitea {
domain = "git.eden-emu.dev";
owner = "eden-emu";
repo = "eden";
tag = "v${finalAttrs.version}";
hash = "sha256-Q/tJP6AHAtW9AXn9G+8dF4oTlKDfNHN4cuTKXtYq0T8=";
hash = "sha256-79/JmIRWysoc3psJqMFyiNc2gjTY4VhJfdNaiTvisMk=";
};
patches = [
(fetchpatch {
# httplib uses `SameMinorVersion` compatibility for its CMake files which
# makes it reject the nixpkgs version which is newer
name = "revert-httplib-version-specification.patch";
url = "https://git.eden-emu.dev/eden-emu/eden/commit/9c13c71da8dcc37d03fc53bc3bc16978a65fd8f2.patch";
hash = "sha256-g7q40BDb9TKE8eudBS7Smajq5EYCzxSemZgsl2ialJo=";
revert = true;
})
];
strictDeps = true;
__structuredAttrs = true;

View File

@@ -7,13 +7,13 @@
}:
llvmPackages.stdenv.mkDerivation rec {
pname = "enzyme";
version = "0.0.263";
version = "0.0.264";
src = fetchFromGitHub {
owner = "EnzymeAD";
repo = "Enzyme";
rev = "v${version}";
hash = "sha256-+Br2PS5IsHaAAJM5IJR7gXMx90pduixbdbSVNxL+kLo=";
hash = "sha256-iv9BCN5b6Qn2N85vpyyuqHR3HlCSxPRYGgaf04D8bBk=";
};
postPatch = ''

View File

@@ -6,26 +6,27 @@
lib,
libayatana-appindicator,
libcanberra-gtk3,
lsfg-vk,
meson,
ninja,
nix-update-script,
python3Packages,
umu-launcher,
lsfg-vk,
vulkan-tools,
wrapGAppsHook3,
xdg-utils,
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "faugus-launcher";
version = "1.16.6";
version = "1.20.4";
pyproject = false;
src = fetchFromGitHub {
owner = "Faugus";
repo = "faugus-launcher";
tag = finalAttrs.version;
hash = "sha256-VVLq11jq7fGKgQske/FnQEkwcneuKWOvXFr4eUGHYTw=";
hash = "sha256-Kt6ZZ5yivbRzlgV+ovWiZVolxjmquAifJ/0lk1oL4fA=";
};
nativeBuildInputs = [
@@ -42,24 +43,25 @@ python3Packages.buildPythonApplication (finalAttrs: {
dependencies = with python3Packages; [
pillow
psutil
pygame
pygobject3
requests
vdf
];
postPatch = ''
substituteInPlace faugus_launcher.py \
--replace-fail "PathManager.find_binary('faugus-run')" "'$out/bin/.faugus-run-wrapped'" \
--replace-fail "PathManager.find_binary('faugus-proton-manager')" "'$out/bin/.faugus-proton-manager-wrapped'" \
substituteInPlace faugus-launcher \
--replace-fail "/usr/bin/python3" "${python3Packages.python.interpreter}"
substituteInPlace faugus/launcher.py \
--replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'" \
--replace-fail "/usr/lib/extensions/vulkan/lsfgvk/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \
--replace-fail "/usr/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \
--replace-fail 'Exec={faugus_run}' 'Exec=faugus-run'
--replace-fail "/usr/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so"
substituteInPlace faugus_run.py \
substituteInPlace faugus/runner.py \
--replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'"
substituteInPlace faugus_shortcut.py \
substituteInPlace faugus/shortcut.py \
--replace-fail "/usr/lib/extensions/vulkan/lsfgvk/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \
--replace-fail "/usr/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so"
'';
@@ -69,16 +71,19 @@ python3Packages.buildPythonApplication (finalAttrs: {
preFixup = ''
makeWrapperArgs+=(
"''${gappsWrapperArgs[@]}"
--suffix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH"
--suffix PATH : "${
lib.makeBinPath [
icoextract
imagemagick
libcanberra-gtk3
umu-launcher
vulkan-tools
xdg-utils
]
}"
)
wrapProgram $out/bin/faugus-launcher ''${makeWrapperArgs[@]}
'';
passthru.updateScript = nix-update-script { };

View File

@@ -87,7 +87,7 @@ rustPlatform.buildRustPackage rec {
# Create empty `lib/firefoxpwa` directory so the Firefox wrapper won't fail
# trying to disable the update checks. It will try to write to
# `$out/lib/firefoxpwa/is-packaged-app`, which doesn't exist by default.
# mkdir $out/lib/firefoxpwa
mkdir $out/lib/firefoxpwa
'';
passthru = {

View File

@@ -15,13 +15,13 @@
buildGoModule (finalAttrs: {
pname = "fulcio";
version = "1.8.6";
version = "1.8.7";
src = fetchFromGitHub {
owner = "sigstore";
repo = "fulcio";
tag = "v${finalAttrs.version}";
hash = "sha256-R0fqBbK3dpbjnLlB0IB5IsaJO/+PxjEphqzjXV/nmsA=";
hash = "sha256-9TvucbTD2uPFxJqUG2EwMLRV6PxGf5UbxoEIUAqUE84=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorHash = "sha256-NLBorBTXNVxvvGKgekTOQuarMcoxZv8sVzKzPStGT74=";
vendorHash = "sha256-Mb4MBqEbWAo58TLd15JUh53I7CUHu+nyyIAfZxx3DMw=";
nativeBuildInputs = [ installShellFiles ];

View File

@@ -1,11 +0,0 @@
pthread_yield() is not used by fuse-7z-ng, fails configure.
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,6 @@ AC_CHECK_HEADERS([fcntl.h stddef.h string.h unistd.h dlfcn.h dirent.h])
AC_CHECK_FUNCS([memset memmove])
AC_CHECK_FUNCS([sqrt])
-AC_CHECK_LIB([pthread], [pthread_yield],,AC_MSG_ERROR([pthread library not found.]))
AC_CHECK_LIB([dl], [dlclose])
PKG_CHECK_MODULES([fuse], [fuse >= 2.8])

View File

@@ -1,64 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
fuse,
p7zip,
autoconf,
automake,
pkg-config,
makeWrapper,
}:
stdenv.mkDerivation rec {
pname = "fuse-7z-ng";
version = "0-unstable-2014-06-08";
src = fetchFromGitHub {
owner = "kedazo";
repo = "fuse-7z-ng";
rev = "eb5efb1f304c2b7bc2e0389ba06c9bf2ac4b932c";
sha256 = "17v1gcmg5q661b047zxjar735i4d3508dimw1x3z1pk4d1zjhp3x";
};
patches = [
# Drop unused pthread library. pthread_yield()
# fails the configure.
./no-pthread.patch
# Zero-initialize unset fields of `struct fuse_operations` so that
# garbage values don't cause segfault.
# <https://github.com/kedazo/fuse-7z-ng/pull/8>
./zero-init-fuse-operations.patch
];
nativeBuildInputs = [
pkg-config
makeWrapper
autoconf
automake
];
buildInputs = [ fuse ];
preConfigure = "./autogen.sh";
libs = lib.makeLibraryPath [ p7zip ]; # 'cause 7z.so is loaded manually
postInstall = ''
wrapProgram $out/bin/fuse-7z-ng --suffix LD_LIBRARY_PATH : "${libs}/p7zip"
mkdir -p $out/share/doc/fuse-7z-ng
cp TODO README NEWS COPYING ChangeLog AUTHORS $out/share/doc/fuse-7z-ng/
'';
meta = {
inherit (src.meta) homepage;
description = "FUSE-based filesystem that uses the p7zip library";
longDescription = ''
fuse-7z-ng is a FUSE file system that uses the p7zip
library to access all archive formats supported by 7-zip.
This project is a fork of fuse-7z ( https://gitorious.org/fuse-7z/fuse-7z ).
'';
platforms = lib.platforms.linux;
license = lib.licenses.gpl3Plus;
mainProgram = "fuse-7z-ng";
};
}

View File

@@ -1,13 +0,0 @@
Zero-initialize unset fields of `struct fuse_operations`.
<https://github.com/kedazo/fuse-7z-ng/pull/8>
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -195,7 +195,7 @@ main (int argc, char **argv)
mkdir(param.mountpoint, 0750);
}
- struct fuse_operations fuse7z_oper;
+ struct fuse_operations fuse7z_oper = {0};
fuse7z_oper.init = fuse7z_init;
fuse7z_oper.destroy = fuse7z_destroy;
fuse7z_oper.readdir = fuse7z_readdir;

View File

@@ -1,76 +0,0 @@
{
lib,
stdenv,
fetchurl,
fetchpatch,
autoreconfHook,
pkg-config,
fuse,
glib,
zlib,
}:
stdenv.mkDerivation rec {
pname = "fuseiso";
version = "20070708";
src = fetchurl {
url = "mirror://sourceforge/project/fuseiso/fuseiso/${version}/fuseiso-${version}.tar.bz2";
sha256 = "127xql52dcdhmh7s5m9xc6q39jdlj3zhbjar1j821kb6gl3jw94b";
};
patches = [
(fetchpatch {
name = "00-support_large_iso.patch";
url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/00-support_large_iso.patch";
sha256 = "1lmclb1qwzz5f4wlq693g83bblwnjjl73qhgfxbsaac5hnn2shjw";
})
(fetchpatch {
name = "01-fix_typo.patch";
url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/01-fix_typo.patch";
sha256 = "14rpxp0yylzsgqv0r19l4wx1h5hvqp617gpv1yg0w48amr9drasa";
})
(fetchpatch {
name = "02-prevent-buffer-overflow_CVE-2015-8837.patch";
url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/02-prevent-buffer-overflow.patch";
sha256 = "1ls2pp3mh91pdb51qz1fsd8pwhbky6988bpd156bn7wgfxqzh8ig";
})
(fetchpatch {
name = "03-prevent-integer-overflow_CVE-2015-8836.patch";
url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/03-prevent-integer-overflow.patch";
sha256 = "100cw07fk4sa3hl7a1gk2hgz4qsxdw99y20r7wpidwwwzy463zcv";
})
];
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
fuse
glib
zlib
];
# after autoreconfHook, glib and zlib are not found, so force link against
# them
env.NIX_LDFLAGS = toString [
"-lglib-2.0"
"-lz"
];
enableParallelBuilding = true;
postInstall = ''
install -Dm444 -t $out/share/doc/${pname} NEWS README
'';
meta = {
description = "FUSE module to mount ISO filesystem images";
homepage = "https://sourceforge.net/projects/fuseiso";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
mainProgram = "fuseiso";
};
}

View File

@@ -11,13 +11,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gex";
version = "0.6.4";
version = "0.6.7";
src = fetchFromCodeberg {
owner = "Piturnah";
repo = "gex";
tag = "v${finalAttrs.version}";
hash = "sha256-Xer7a3UtFIv3idchI7DfZ5u6qgDW/XFWi5ihtcREXqo=";
hash = "sha256-L8AHJ7h2lNx04nJ//2DjH3CdnuQGMqcta0+XzJjRNb4=";
};
nativeBuildInputs = [ pkg-config ];
@@ -33,11 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
LIBGIT2_NO_VENDOR = 1;
};
cargoPatches = [
./patch-libgit2.patch
];
cargoHash = "sha256-4ejtMCuJOwT5bJQZaPQ1OjrB5O70we77yEXk9RmhywE=";
cargoHash = "sha256-FdxBYDgDxpZqqYzjX+lWP+uP2jUD3Y5Rzyx+JasAgIY=";
meta = {
description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit";

View File

@@ -1,54 +0,0 @@
From 3f9183a4de984c5d24caa9379274461e369926ed Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 8 Sep 2024 18:36:46 +0800
Subject: [PATCH] tt
---
Cargo.lock | 8 ++++----
Cargo.toml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 5101c2e..0cb59d2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -246,9 +246,9 @@ dependencies = [
[[package]]
name = "git2"
-version = "0.18.1"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
+checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
dependencies = [
"bitflags 2.3.3",
"libc",
@@ -316,9 +316,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "libgit2-sys"
-version = "0.16.1+1.7.1"
+version = "0.18.0+1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
+checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec"
dependencies = [
"cc",
"libc",
diff --git a/Cargo.toml b/Cargo.toml
index 26cef3f..f947945 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,7 @@ anyhow = "1.0.75"
clap = { version = "4.4.7", features = ["cargo", "derive"] }
crossterm = { version = "0.27.0", features = ["serde"] }
dirs = "5.0.1"
-git2 = { version = "0.18.1", default-features = false }
+git2 = { version = "0.20.0", default-features = false }
itertools = "0.11.0"
nom = "7.1.3"
paste = "1.0.14"
--
2.46.0

View File

@@ -212,6 +212,11 @@ stdenv.mkDerivation (finalAttrs: {
libsecret
];
# This is required for building the rust build.rs script when cross compiling
depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
buildPackages.stdenv.cc
];
env = {
# required to support pthread_cancel()
NIX_LDFLAGS =

View File

@@ -24,13 +24,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "goverlay";
version = "1.8.1";
version = "1.8.2";
src = fetchFromGitHub {
owner = "benjamimgois";
repo = "goverlay";
tag = finalAttrs.version;
hash = "sha256-/ItkUqUQq1aeDPB8gHNOQkFp8s+/mOwFthnC77fT+h8=";
hash = "sha256-c36s1AW0+Ar8m8y0nvxwyVMu3DvhZk5LhCfDerJZuyY=";
};
outputs = [

View File

@@ -21,7 +21,7 @@
buildGoModule (finalAttrs: {
pname = "grafana";
version = "13.0.1+security-01";
version = "13.0.2";
subPackages = [
"pkg/cmd/grafana"
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
owner = "grafana";
repo = "grafana";
rev = "v${finalAttrs.version}";
hash = "sha256-v/6a0Xlj11nZ0u8xtFzw5i674rB1YV21iLCuLc5af+I=";
hash = "sha256-knalINdJPFrvj6HNxWPV6wu6TSkrRvgkZjOnECOsWwU=";
};
patches = [
@@ -55,12 +55,12 @@ buildGoModule (finalAttrs: {
# Since this is not a dependency attribute the buildPackages has to be specified.
offlineCache = buildPackages.yarn-berry_4-fetcher.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-uOl9PemVZiKwGfhLUpAAByMvt5A8JyA5qyJ6Cdl6od4=";
hash = "sha256-NXDXmed2TsMQS99breDt0Ky6X2ZyuWkJ5KyKz5Apkt8=";
};
disallowedRequisites = [ finalAttrs.offlineCache ];
vendorHash = "sha256-PEGgrkTguHvqrclzvZDQ7yk6rwTKDLXdUSjeaQFnYtU=";
vendorHash = "sha256-rFGwtplr+n0qgIulycNQ5L/lh4ZFoHCrYeIfbb+e/h4=";
# Grafana seems to just set it to the latest version available
# nowadays.

View File

@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "harper";
version = "2.3.1";
version = "2.4.0";
src = fetchFromGitHub {
owner = "Automattic";
repo = "harper";
rev = "v${finalAttrs.version}";
hash = "sha256-VergVNMhFGhXhVAPhyc7Nsz3ezAGGrYljaNpIoOBQEw=";
hash = "sha256-tfzUSFWnJTW7xiQU6cCDgE3kPBSADTprcT1n8WZo9tQ=";
};
cargoHash = "sha256-KK4294N/v91dKccbKc1hdCLtqIRQlzT1G2At06RlCyk=";
cargoHash = "sha256-CRrdAAV2VcPat33pTWW2dRXUYWOXkgC46aEtYc2UTh0=";
cargoBuildFlags = [
"--package=harper-cli"

View File

@@ -4,17 +4,23 @@
fetchFromGitHub,
makeBinaryWrapper,
writeText,
ocaml,
findlib,
zarith,
camlp5,
camlp-streams,
fmt,
pcre2,
ocamlPackages,
ledit,
bash,
}:
let
inherit (ocamlPackages)
ocaml
findlib
zarith
camlp5
camlp-streams
fmt
pcre2
;
in
let
ocamlPath = lib.makeSearchPath "/lib/ocaml/${ocaml.version}/site-lib" [
camlp5

View File

@@ -8,22 +8,22 @@
let
pname = "hoppscotch";
version = "26.4.1-0";
version = "26.5.0-0";
src =
fetchurl
{
aarch64-darwin = {
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg";
hash = "sha256-SXJwGw8PVz4+TDjv0ZdCdR6GStr6+NsjD9qi04nFD7E=";
hash = "sha256-RnLMpXkDAk89T5ogNiVz8zMMdLtXTlAg5nu+sjyczEk=";
};
x86_64-darwin = {
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg";
hash = "sha256-wwQbXPGii5M/0rWb7KnWrrzIOYxXNp2OjyxNHVzWNTY=";
hash = "sha256-dBjwElYc3+TpAbho/8p946VtEDlCVDsfCSidQUKVC/U=";
};
x86_64-linux = {
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage";
hash = "sha256-86oDb+ZNWPxvsQEwWw/8Wmn50eU4fJkDs/E45MQ+prI=";
hash = "sha256-irPI613Y1l0j5F+Nzm9v/JXsiJY35D8dQpmMcPMYvmU=";
};
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

View File

@@ -10,7 +10,6 @@
freetype,
libx11,
gtk3,
pcre,
libpthread-stubs,
libxdmcp,
libxkbcommon,
@@ -58,7 +57,6 @@ stdenv.mkDerivation rec {
freetype
libx11
gtk3
pcre
libpthread-stubs
libxdmcp
libxkbcommon

View File

@@ -10,7 +10,6 @@
libxdmcp,
libxft,
ntk,
pcre,
fftwFloat,
zita-resampler,
}:
@@ -37,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
libxdmcp
libxft
ntk
pcre
fftwFloat
zita-resampler
];

View File

@@ -12,13 +12,13 @@
buildNpmPackage (finalAttrs: {
pname = "librechat";
version = "0.8.5";
version = "0.8.6";
src = fetchFromGitHub {
owner = "danny-avila";
repo = "LibreChat";
tag = "v${finalAttrs.version}";
hash = "sha256-iU5UoH1rbt+cVEzZAmiSjRKMJdQrKtqtHTT6vf5bGrg=";
hash = "sha256-cWgjsLN7NnJNJ1hYPo0h3lh+W4wi9qqttevNfNrYdXg=";
};
patches = [
@@ -35,7 +35,7 @@ buildNpmPackage (finalAttrs: {
];
npmDepsFetcherVersion = 2;
npmDepsHash = "sha256-mtGqMl+u/BfcrXKiOjtgOcgDFFgBzKt56TvpbrXPG5E=";
npmDepsHash = "sha256-Y+oC9eigwzL8jei5Hs4YOf32oFgULPmHrSDApxPKh+0=";
# npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535
nodejs = nodejs_22;

View File

@@ -0,0 +1,7 @@
{ transmission_4 }:
transmission_4.override {
installLib = true;
enableDaemon = false;
enableCli = false;
}

View File

@@ -1,33 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
fuse,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "littlefs-fuse";
version = "2.7.15";
src = fetchFromGitHub {
owner = "littlefs-project";
repo = "littlefs-fuse";
rev = "v${finalAttrs.version}";
hash = "sha256-01jVoKxctHy53A/dCTNeteoQD21f6TYkEFLob2wfGoM=";
};
buildInputs = [ fuse ];
installPhase = ''
runHook preInstall
install -D lfs $out/bin/littlefs-fuse
ln -s $out/bin/littlefs-fuse $out/bin/mount.littlefs
ln -s $out/bin $out/sbin
runHook postInstall
'';
meta = finalAttrs.src.meta // {
description = "FUSE wrapper that puts the littlefs in user-space";
license = lib.licenses.bsd3;
mainProgram = "littlefs-fuse";
inherit (fuse.meta) platforms;
# fatal error: 'linux/fs.h' file not found
broken = stdenv.hostPlatform.isDarwin;
};
})

View File

@@ -30,7 +30,7 @@
blas,
fetchNpmDeps,
nodejs,
nodejs_latest,
npmHooks,
pkg-config,
@@ -81,7 +81,7 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "9484";
version = "9503";
outputs = [
"out"
@@ -92,7 +92,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
owner = "ggml-org";
repo = "llama.cpp";
tag = "b${finalAttrs.version}";
hash = "sha256-YPf563WfSLlV4qc9eQRjW1YPxCbqsRs9yN/x30C/IGA=";
hash = "sha256-SnPK7hCfA7svxXhPji7Cuf7H8eHFjdTJSpNR1otPO4c=";
leaveDotGit = true;
postFetch = ''
git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -106,7 +106,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
cmake
installShellFiles
ninja
nodejs
nodejs_latest
npmHooks.npmConfigHook
pkg-config
spirv-headers
@@ -125,7 +125,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
++ [ openssl ];
npmRoot = "tools/ui";
npmDepsHash = "sha256-Iyg8FpcTKf2UYHuK7mA3cTAqVaLcQPcS0YCa5Qf01Gc=";
npmDepsHash = "sha256-1iM0LGeI9e+gZEHk46lkBe51DxIhiimfAm9o3Z3m9Ik=";
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
inherit (finalAttrs) src patches;

View File

@@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lockbook-desktop";
version = "26.5.22";
version = "26.6.1";
src = fetchFromGitHub {
owner = "lockbook";
repo = "lockbook";
tag = finalAttrs.version;
hash = "sha256-KqqiaM0txuZsylbr1+7faTdJINy1sNttT9n/YUpqyCc=";
hash = "sha256-+r5WsaqQr6NlQNWDTQf/tvCh6P5LpFFyyLMTIZw9yis=";
};
cargoHash = "sha256-d4yKch2c1w5gFBjyrYZQT/6lscRi3p05wKiJEIaXhjA=";
cargoHash = "sha256-ybAcG7sCEwZC6FxWx2KhHd1HkhK8wwkGeeLoI/KOXKU=";
nativeBuildInputs = [
pkg-config

View File

@@ -12,16 +12,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lockbook";
version = "26.5.22";
version = "26.6.1";
src = fetchFromGitHub {
owner = "lockbook";
repo = "lockbook";
tag = finalAttrs.version;
hash = "sha256-KqqiaM0txuZsylbr1+7faTdJINy1sNttT9n/YUpqyCc=";
hash = "sha256-+r5WsaqQr6NlQNWDTQf/tvCh6P5LpFFyyLMTIZw9yis=";
};
cargoHash = "sha256-d4yKch2c1w5gFBjyrYZQT/6lscRi3p05wKiJEIaXhjA=";
cargoHash = "sha256-ybAcG7sCEwZC6FxWx2KhHd1HkhK8wwkGeeLoI/KOXKU=";
doCheck = false; # there are no cli tests
cargoBuildFlags = [

View File

@@ -33,18 +33,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "miracle-wm";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "miracle-wm-org";
repo = "miracle-wm";
tag = "v${finalAttrs.version}";
hash = "sha256-yrshySK7tstNAgb9jApqqx4R+c74G2Ada6fjmCeKsV0=";
hash = "sha256-7JtdSopKBHfFK0KsV0+9OxrOx3vrSydmZSmAiBvKQiI=";
};
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail 'DESTINATION /usr/lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \
--replace-fail 'DESTINATION lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \
--replace-fail '-march=native' '# -march=native'
'';

View File

@@ -2,8 +2,9 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch2,
flac,
fuse,
fuse3,
lame,
libid3tag,
libvorbis,
@@ -15,20 +16,23 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mp3fs";
version = "1.1.1";
version = "1.1.1-unstable-2023-01-29";
src = fetchFromGitHub {
owner = "khenriks";
repo = "mp3fs";
rev = "v${finalAttrs.version}";
sha256 = "sha256-dF+DfkNKvYOucS6KjYR1MMGxayM+1HVS8mbmaavmgKM=";
rev = "cd2ca80eb3912ff8385e6d537df10d9a768a3a96";
hash = "sha256-lueF8fEV+0LQOxf2MhK9dPWkfsTF4nP3PijqjJvDPzo=";
};
postPatch = ''
substituteInPlace src/mp3fs.cc \
--replace-fail "#include <fuse_darwin.h>" "" \
--replace-fail "osxfuse_version()" "fuse_version()"
'';
patches = [
(fetchpatch2 {
name = "Enable fuse3 support.patch";
# https://github.com/khenriks/mp3fs/pull/81
url = "https://github.com/khenriks/mp3fs/commit/6e1326de4a19b236eef88b89599755adf394526f.patch?full_index=1";
hash = "sha256-V2HZy0jiXAHGAjre+QtCdGev7maWJ8hW3F2e/87CEKA=";
})
];
nativeBuildInputs = [
autoreconfHook
@@ -38,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
flac
fuse
fuse3
lame
libid3tag
libvorbis

View File

@@ -9,18 +9,18 @@ buildGoModule rec {
__structuredAttrs = true;
pname = "multica-cli";
version = "0.3.9";
version = "0.3.16";
src = fetchFromGitHub {
owner = "multica-ai";
repo = "multica";
rev = "v${version}";
hash = "sha256-gfmmuk6OOxELjCBPz8O4nPddVFtgC3MhUX8cSK8JefU=";
hash = "sha256-hD69SEhZL8TqZEg1/Hu+UDJnCZJsdDs4pai5wzMFq3I=";
};
sourceRoot = "${src.name}/server";
vendorHash = "sha256-p3Pil/iebgt9/8MSvOAJveIAnKu98/v0QnQVXCI1G98=";
vendorHash = "sha256-96hxRLb+NBirsAzk80gtFYbSySKKWix/WJFLvokYKmU=";
subPackages = [ "cmd/multica" ];

View File

@@ -15,18 +15,20 @@
django,
netaddr,
netbox,
nix-update-script,
}:
buildPythonPackage (finalAttrs: {
pname = "netbox-qrcode";
version = "0.0.20";
version = "0.0.21";
pyproject = true;
src = fetchFromGitHub {
owner = "netbox-community";
repo = "netbox-qrcode";
tag = "v${finalAttrs.version}";
hash = "sha256-7dPMpuJ2nuj9rRmVrfthD+xrEHoUaLFqDJWC6cGGCwY=";
hash = "sha256-A4qjpbfTULzS0UchUN9eX8jZmwoX/ej/18L/YAB8dKA=";
};
build-system = [ setuptools ];
@@ -49,6 +51,13 @@ buildPythonPackage (finalAttrs: {
pythonImportsCheck = [ "netbox_qrcode" ];
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"^v(\\d+\\.\\d+\\.\\d+)$"
];
};
meta = {
description = "Netbox plugin for generate QR codes for objects: Rack, Device, Cable";
homepage = "https://github.com/netbox-community/netbox-qrcode";

View File

@@ -28,7 +28,7 @@ buildNpmPackage {
__structuredAttrs = true;
npmDepsHash = "sha256-+jVD0lfOrQ3hQE15yfcB0dVnPZBFo/naLXhFRiPFUGs=`";
npmDepsHash = "sha256-+jVD0lfOrQ3hQE15yfcB0dVnPZBFo/naLXhFRiPFUGs=";
meta = {
description = "Design and print labels with NIIMBOT printers directly from your PC or mobile web browser";

View File

@@ -20,17 +20,22 @@
libsecret,
gst_all_1,
xdg-user-dirs,
gnome,
librsvg,
webp-pixbuf-loader,
libavif,
libheif,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "nocturne";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
owner = "Jeffser";
repo = "Nocturne";
tag = finalAttrs.version;
hash = "sha256-CfrPmpkjcmKMB66kdFL4HqVukaIWAkIzOkwtBqZ65k4=";
hash = "sha256-2UtlOdxXFdWoGeEwb89qI5Xp8FES2I3Eno8DIbhkBhI=";
};
__structuredAttrs = true;
@@ -76,6 +81,19 @@ stdenv.mkDerivation (finalAttrs: {
python3Packages.pillow
];
preInstall = ''
export GDK_PIXBUF_MODULE_FILE="${
gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
extraLoaders = [
librsvg
webp-pixbuf-loader
libavif
libheif.lib
];
}
}"
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}

View File

@@ -13,7 +13,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nono";
version = "0.57.0";
version = "0.61.1";
__darwinAllowLocalNetworking = true; # required for tests
@@ -21,9 +21,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "always-further";
repo = "nono";
tag = "v${finalAttrs.version}";
hash = "sha256-EoxKq8aEfc0XoSm92mZgxc2Zoc9B7Oo6NAjcFOlSZfw=";
hash = "sha256-y5oMR5Vawf/1QUj3ACDdqAjKT+Q2gizRfKkal340EP8=";
};
cargoHash = "sha256-MBTUSNbOWOhrYL18+yPCg6Ydjym50JMuqTt/U0kQiL4=";
cargoHash = "sha256-Oy/IqAK5ml1vu0eee+pF5pRjzk0Na/Fb04e1Mx0d924=";
nativeBuildInputs = [
pkg-config
@@ -81,6 +81,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
# panics with "exact-path fallback must not recursively cover descendants"
"capability_ext::tests::test_from_profile_allow_file_falls_back_to_exact_directory_when_present"
# nono-cli
# wants access to /var/folders
"sandbox_state::cap_file_validation_tests::test_acceptable_temp_roots_includes_var_folders_on_macos"
"sandbox_state::cap_file_validation_tests::test_validate_rejects_path_outside_temp"
# don't work inside of the /nix dir
# unsure why home is still under /nix with writableTmpDirAsHomeHook
"deprecated_override_deny_flag_emits_single_warning_on_stderr"
"deprecated_override_deny_flag_warning_is_emitted_once_for_multiple_uses"
"override_deny_alias_and_bypass_protection_merge_in_argv_order"
# env_vars
# don't work inside of the /nix dir
# unsure why home is still under /nix with writableTmpDirAsHomeHook

View File

@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "otel-desktop-viewer";
version = "0.2.5";
version = "0.3.0";
src = fetchFromGitHub {
owner = "CtrlSpice";
repo = "otel-desktop-viewer";
rev = "v${finalAttrs.version}";
hash = "sha256-4CFemHoMt5Fxaq66zxzWrGxq4AJuZkm45Gb4t8wseWg=";
hash = "sha256-oHnawHizBsyGSMORZz8qVQ6PZ/Ta/ftX+m799J1GhWM=";
};
# NOTE: This project uses Go workspaces, but 'buildGoModule' does not support
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
#
# cf. https://github.com/NixOS/nixpkgs/issues/203039
proxyVendor = true;
vendorHash = "sha256-2fPkSWPfEDMYH8E7dTq2AAFrsf3jimH315a8OJOIAII=";
vendorHash = "sha256-WTaPggKaQJY9t16jES9gbsFNHOn4ujxHsqezKOYMdCs=";
ldflags = [
"-s"

View File

@@ -1,48 +1,80 @@
{
lib,
stdenv,
python3,
fetchPypi,
bcc,
llvmPackages,
libbpf,
libnotify,
makeWrapper,
}:
python3.pkgs.buildPythonApplication rec {
pname = "picosnitch";
version = "1.0.3";
format = "setuptools";
version = "2.1.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "78285e91b5c4d8e07529a34a7c3fe606acb6f950ee3cc78bb6c346bc2195b68a";
sha256 = "1d13fc48280f6a355bcb155d193f93817c1225475ee9670846a56cbd39e2014d";
};
propagatedBuildInputs = with python3.pkgs; [
setuptools
bcc
psutil
dbus-python
requests
pandas
plotly
dash
geoip2
build-system = with python3.pkgs; [ hatchling ];
nativeBuildInputs = [
# Unwrapped clang/llvm: cc-wrapper injects flags (hardening,
# --gcc-toolchain, fortify) that `clang -target bpf` rejects under -Werror.
llvmPackages.clang-unwrapped
llvmPackages.llvm
makeWrapper
];
postInstall = ''
substituteInPlace $out/${python3.sitePackages}/picosnitch.py --replace '/run/picosnitch.pid' '/run/picosnitch/picosnitch.pid'
buildInputs = [ libbpf ];
# The sdist ships vendored vmlinux_{x86,arm64}.h, so the BPF compile is
# fully offline. Pre-build the .bpf.o here with an explicit libbpf include
# path; the hatch build hook sees the existing .o (newer than the .c) and
# reuses it instead of invoking clang itself.
preBuild = ''
bpfTargetArch=${if stdenv.hostPlatform.isAarch64 then "arm64" else "x86"}
cp src/picosnitch/bpf/vmlinux_$bpfTargetArch.h src/picosnitch/bpf/vmlinux.h
clang -g -O2 -target bpf -D__TARGET_ARCH_$bpfTargetArch \
-Wall -Werror -Wno-missing-declarations \
-I${lib.getDev libbpf}/include \
-Isrc/picosnitch/bpf \
-c src/picosnitch/bpf/picosnitch.bpf.c \
-o src/picosnitch/bpf/picosnitch.bpf.o
llvm-strip -g src/picosnitch/bpf/picosnitch.bpf.o || true
'';
# The build hook keys the wheel platform tag and BPF target arch off this var.
env.PICOSNITCH_BPF_TARGET_ARCH =
if stdenv.hostPlatform.isAarch64 then
"aarch64"
else if stdenv.hostPlatform.isx86_64 then
"x86_64"
else
throw "picosnitch: unsupported platform ${stdenv.hostPlatform.system}";
pythonImportsCheck = [ "picosnitch" ];
# picosnitch loads libbpf via ctypes and shells out to `notify-send`.
postFixup = ''
wrapProgram $out/bin/picosnitch \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libbpf ]} \
--prefix PATH : ${lib.makeBinPath [ libnotify ]}
'';
meta = {
description = "Monitor network traffic per executable with hashing";
description = "Monitor network traffic per executable using BPF";
mainProgram = "picosnitch";
homepage = "https://github.com/elesiuta/picosnitch";
changelog = "https://github.com/elesiuta/picosnitch/releases";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.elesiuta ];
platforms = lib.platforms.linux;
knownVulnerabilities = [
"Allows an unprivileged user to write to arbitrary files as root; see https://github.com/elesiuta/picosnitch/issues/40"
platforms = [
"x86_64-linux"
"aarch64-linux"
];
};
}

View File

@@ -35,11 +35,11 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "PortfolioPerformance";
version = "0.83.2";
version = "0.84.1";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
hash = "sha256-WJqkas9zSnSVvJmuOqdRuNYOu9RLTkvJBLITNrKz7Pk=";
hash = "sha256-Tdksl1WCO4C0h8lYWzAAEsN1C5P/t2TAH2WuMqEVL1c=";
};
nativeBuildInputs = [

View File

@@ -9,17 +9,17 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "postgres-language-server";
version = "0.25.0";
version = "0.25.2";
src = fetchFromGitHub {
owner = "supabase-community";
repo = "postgres-language-server";
tag = finalAttrs.version;
hash = "sha256-qmDatxcd6WPYuV/VHTY/+vYRPVO/ev/7W6/18ScTvx0=";
hash = "sha256-NX0OVeMjT3Fan6uN9A/UFx+VBauUYC3mxlG8V2RtGjM=";
fetchSubmodules = true;
};
cargoHash = "sha256-gNmo+rs4eLvtjMmOOHU5sekA/xYxzoNxZjkHDDD9wBY=";
cargoHash = "sha256-RqR/A9ket9kSqCDZTm0bNtRLybJGXDpgPv9Rzhw0JxM=";
nativeBuildInputs = [
rustPlatform.bindgenHook

View File

@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "precious";
version = "0.10.2";
version = "0.11.0";
src = fetchFromGitHub {
owner = "houseabsolute";
repo = "precious";
tag = "v${finalAttrs.version}";
hash = "sha256-Yst+Z64WdgAfCbtt8R7ATzvUEY772ndtptyvFf/UkAk=";
hash = "sha256-3pZ1OA1VxM1aMP1kyMzN7vlqvEQmo6kw0JBusmt8vwE=";
};
cargoHash = "sha256-DRR1EQIbJWDzBAZIXhUk0oQ24SvPwamWh5tsUkeBdqs=";
cargoHash = "sha256-tOkd++KxroZyFMSf9abYKiz/OTlAEyB3Wn1BzQPrX2k=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;

View File

@@ -45,13 +45,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "prl-tools";
version = "26.3.2-57398";
version = "26.3.3-57507";
# We download the full distribution to extract prl-tools-lin.iso from
# => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
src = fetchurl {
url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
hash = "sha256-JjbXQEtPKfCsgOpuffmGjmaypVT/JK3qx92HWUFJ7VI=";
hash = "sha256-QXrzdQ6eY3ikgwMD11/zEkYau/X0mmm2uk6O92r8w1o=";
};
hardeningDisable = [

View File

@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "redis_exporter";
version = "1.84.0";
version = "1.85.0";
src = fetchFromGitHub {
owner = "oliver006";
repo = "redis_exporter";
rev = "v${version}";
sha256 = "sha256-0GxPPtZh7qJO1jQ5Q+ED8cJK0kbn/Q7DuXLihWd67gg=";
sha256 = "sha256-04LDNXHaVADvcH3CLVYnFXnLPvBPqjGIBls2KeHHdlY=";
};
vendorHash = "sha256-O2koMGh9/1UWtV5arH3S/7b6q33P4Yv+xgPthTtZsLg=";
vendorHash = "sha256-muGgriK1DDkKk4DOWf7m+W6/qquwYwqgTOzyNGbjV+U=";
ldflags = [
"-X main.BuildVersion=${version}"

View File

@@ -11,11 +11,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-authenticator";
version = "1.1.4";
version = "1.1.5";
src = fetchurl {
url = "https://proton.me/download/authenticator/linux/ProtonAuthenticator_${finalAttrs.version}_amd64.deb";
hash = "sha256-SoTeqnYDMgCoWLGaQZXaHiRKGreFn7FPSz5C0O88uWM=";
hash = "sha256-y6VXzytstYBXdmujDWASC8AShQPkr+tNtoynGk0l3hg=";
};
dontConfigure = true;
@@ -47,7 +47,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
description = "Two-factor authentication manager with optional sync";
homepage = "https://proton.me/authenticator";
license = lib.licenses.unfree; # source not yet published
maintainers = with lib.maintainers; [ felschr ];
maintainers = with lib.maintainers; [
felschr
pbek
];
platforms = [ "x86_64-linux" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
mainProgram = "proton-authenticator";

View File

@@ -7,7 +7,6 @@
qt6,
icoutils, # build and runtime deps.
wget,
fuseiso,
wine,
which, # runtime deps.
}:
@@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
lib.makeBinPath [
icoutils
wget
fuseiso
wine
which
]

View File

@@ -28,11 +28,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "reqable";
version = "3.1.2";
version = "3.1.3";
src = fetchurl {
url = "https://github.com/reqable/reqable-app/releases/download/${finalAttrs.version}/reqable-app-linux-x86_64.deb";
hash = "sha256-cz9bTFR5WUQNb0ImEe0qShcrRWfv4mcpdBQ3p7RFKeQ=";
hash = "sha256-kOxR9qAEwQu+fFRWemMHFsal4kqC0wzPBkN/pYlEE7E=";
};
nativeBuildInputs = [

View File

@@ -1,40 +0,0 @@
{
lib,
gccStdenv,
fetchFromGitHub,
cmake,
pkg-config,
fuse,
}:
gccStdenv.mkDerivation (finalAttrs: {
pname = "romdirfs";
version = "1.2";
src = fetchFromGitHub {
owner = "mlafeldt";
repo = "romdirfs";
tag = "v${finalAttrs.version}";
hash = "sha256-5wHNL/9RcAVMUMyme9p25YkfyV/7V2wQLp/5TOetesk=";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [ fuse ];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
'';
meta = {
description = "FUSE for access Playstation 2 IOP IOPRP images and BIOS dumps";
homepage = "https://github.com/mlafeldt/romdirfs";
license = lib.licenses.gpl3;
platforms = lib.platforms.unix;
maintainers = [ ];
mainProgram = "romdirfs";
};
})

View File

@@ -7,25 +7,25 @@
curl,
openssl,
libxml2,
fuse,
fuse3,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "s3fs-fuse";
version = "1.95";
version = "1.97";
src = fetchFromGitHub {
owner = "s3fs-fuse";
repo = "s3fs-fuse";
rev = "v${finalAttrs.version}";
sha256 = "sha256-wHszw3S+fuZRwTvJy+FkxQTR2BAvr8H924Wd4/C5heE=";
tag = "v${finalAttrs.version}";
hash = "sha256-iggSIrmxnhINdzJm60yTWkmDwUWJRNNVqwHGd2Lb7lw=";
};
buildInputs = [
curl
openssl
libxml2
fuse
fuse3
];
nativeBuildInputs = [
autoreconfHook

View File

@@ -1,136 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
abseil-cpp,
boost,
cryptopp,
fuse,
libargon2,
protobuf,
sqlite,
tclap,
_experimental-update-script-combinators,
nix-update-script,
}:
let
fruit = stdenv.mkDerivation (finalAttrs: {
pname = "fruit";
version = "3.7.1-unstable-2025-05-12";
src = fetchFromGitHub {
owner = "google";
repo = "fruit";
rev = "19f5c05466565ef507a196b33de08f1c96dd0e58";
hash = "sha256-amBwZ/9GmW8kf70lXP0iN2G1iflJLaf3crn/Ped7Zz8=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ];
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
(lib.cmakeBool "FRUIT_USES_BOOST" true)
];
meta = {
description = "Dependency injection framework for C++";
homepage = "https://github.com/google/fruit";
license = lib.licenses.asl20;
platforms = lib.platforms.linux;
};
});
uni-algo = stdenv.mkDerivation (finalAttrs: {
pname = "uni-algo";
version = "1.2.0";
src = fetchFromGitHub {
owner = "uni-algo";
repo = "uni-algo";
tag = "v${finalAttrs.version}";
hash = "sha256-IyQrL/DWDj87GplSGJC4iQJAzNURLh9TRko5l+EIfuU=";
};
nativeBuildInputs = [ cmake ];
meta = {
description = "Unicode Algorithms Implementation for C/C++";
homepage = "https://github.com/uni-algo/uni-algo";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
};
});
in
stdenv.mkDerivation (finalAttrs: {
pname = "securefs";
version = "2.0.0";
src = fetchFromGitHub {
owner = "netheril96";
repo = "securefs";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-ZY6FE8DCLip8p5eWqBtkVNxhGQp8zAVhkhM6kUsBZXo=";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
abseil-cpp
cryptopp
fruit
fuse
libargon2
protobuf
uni-algo
sqlite
tclap
];
cmakeFlags = [
(lib.cmakeBool "SECUREFS_ENABLE_INTEGRATION_TEST" false)
(lib.cmakeBool "SECUREFS_ENABLE_UNIT_TEST" false)
(lib.cmakeBool "SECUREFS_USE_VCPKG" false)
];
passthru = {
inherit fruit uni-algo;
updateScript = _experimental-update-script-combinators.sequence [
(nix-update-script {
attrPath = "securefs.fruit";
extraArgs = [ "--version=branch" ];
})
(nix-update-script { attrPath = "securefs.uni-algo"; })
(nix-update-script { })
];
};
meta = {
homepage = "https://github.com/netheril96/securefs";
description = "Transparent encryption filesystem";
longDescription = ''
Securefs is a filesystem in userspace (FUSE) that transparently encrypts
and authenticates data stored. It is particularly designed to secure
data stored in the cloud.
Securefs mounts a regular directory onto a mount point. The mount point
appears as a regular filesystem, where one can read/write/create files,
directories and symbolic links. The underlying directory will be
automatically updated to contain the encrypted and authenticated
contents.
'';
license = with lib.licenses; [
bsd2
mit
];
platforms = lib.platforms.unix;
mainProgram = "securefs";
};
})

View File

@@ -20,20 +20,20 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "seerr";
version = "3.2.0";
version = "3.3.0";
src = fetchFromGitHub {
owner = "seerr-team";
repo = "seerr";
tag = "v${finalAttrs.version}";
hash = "sha256-rZ4o0ccfQjZBzWItEEFfxVi/cNO3HWnoDeNGpQ94H6E=";
hash = "sha256-L3gIpkxWIPvAz2o4gDS41w4GyCEfdVVrIQE6hNBLz90=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
inherit pnpm;
fetcherVersion = 3;
hash = "sha256-j/qMS792IFr0Cn/cFUargHSOTw4vz79kr58XhJVikBQ=";
hash = "sha256-WFbTBk2U0KS65LauKcqtD+y6RlcIMnN4tUWYM2WOUnQ=";
};
buildInputs = [ sqlite ];

View File

@@ -0,0 +1,12 @@
diff --git a/scripts/generate-emoji-data.mjs b/scripts/generate-emoji-data.mjs
index 85fd8d484..23ca0bb72 100644
--- a/scripts/generate-emoji-data.mjs
+++ b/scripts/generate-emoji-data.mjs
@@ -207,7 +207,6 @@ for (const emojiSrc of SRC_EMOJIS_SORTED) {
}
const emoji = encodeUnified(emojiSrc.unified);
- assert(isEmoji(emoji), 'Unexpected invalid emoji');
if (isDeprecated(emoji)) {
continue; // drop deprecated emoji

View File

@@ -15,23 +15,23 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "libsignal-node";
version = "0.92.2";
version = "0.94.1";
src = fetchFromGitHub {
owner = "signalapp";
repo = "libsignal";
tag = "v${finalAttrs.version}";
hash = "sha256-7VimtFjobM2EQl0cV0K1EIPeV015e+00ljfAfM4KNJI=";
hash = "sha256-re9IAC0R2QOIjyOLUjdaJw/TgDA4JT1nhtOskE5A0FQ=";
};
cargoHash = "sha256-HBrg//iKNo5/TuVtf9NuVbAyrhul2VVXwC0an7jGEgs=";
cargoHash = "sha256-EVwIRUJ8SmajjocZj3dAHkTiR7Q78m/lf+4qls/oZAM=";
npmRoot = "node";
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-npm-deps";
inherit (finalAttrs) version src;
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
hash = "sha256-BV5E898u07LLoUVMVRJCHKhp4OJJl2fc5973n16T51k=";
hash = "sha256-bEQb+36IB+kXSbIkAFDpeIXWeHoQoIIiHo9q5AbaTio=";
};
nativeBuildInputs = [

View File

@@ -40,13 +40,13 @@ let
webrtc = callPackage ./webrtc.nix { };
ringrtc = callPackage ./ringrtc.nix { inherit webrtc; };
version = "8.9.1";
version = "8.13.0";
src = fetchFromGitHub {
owner = "signalapp";
repo = "Signal-Desktop";
tag = "v${version}";
hash = "sha256-HXxIjCVGh3JFAj0UUEAvmVnm7jMZdxRqWDILRDFCGw4=";
hash = "sha256-gOYnjNCjI1eNVzcb7sx0XDXbhrAdvlgsZQaRuyBXpwI=";
# Emoji font files will be added in `postFetch` if `withAppleEmojis` is enabled. They
# are fetched separately below.
postFetch = ''
@@ -114,16 +114,10 @@ stdenv.mkDerivation (finalAttrs: {
];
patches = [
# Custom fonts currently don't work on windows other than the main one,
# which causes some of the text to look messed up. We want to include
# this patch since we are overriding the emoji font by default.
# Upstream PR: https://github.com/signalapp/Signal-Desktop/pull/7864
# This patch can be removed after `v8.11.0`.
(fetchpatch {
url = "https://github.com/signalapp/Signal-Desktop/commit/52ecd0d931e6071da79b016d2af1f508167b2a98.patch";
hash = "sha256-dtc0bwv9aLz92j5Zfm/SREWtQ43ljXN9Vm2VkeDbAx8=";
})
./force-90-days-expiration.patch
# Drop once https://github.com/NixOS/nixpkgs/pull/520553 and https://github.com/NixOS/nixpkgs/pull/525241 land.
./dont-assert-unicode-17-emoji.patch
]
++ lib.optional (!withAppleEmojis) (
# Signal ships the Apple emoji set without a licence and upstream
@@ -180,13 +174,13 @@ stdenv.mkDerivation (finalAttrs: {
;
inherit pnpm;
fetcherVersion = 3;
hash = "sha256-ls7DYPI5Dq06KI7WCdEkKHPsHTMJ3kO0qJDZsHZQHBQ=";
hash = "sha256-3EEeHmtOAdcm2Q3eNUEl2RbTFRB4YBKcZLFtEmwbVOk=";
};
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
SIGNAL_ENV = "production";
SOURCE_DATE_EPOCH = 1778260300;
SOURCE_DATE_EPOCH = 1780508208;
}
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
# Disable code signing during local macOS builds.

View File

@@ -37,7 +37,7 @@ index d9f558cd4..45a42ecd1 100644
$largeEmojiFont: 'asset:///optional-fonts/emoji-large.woff2';
diff --git a/stylesheets/components/fun/FunEmoji.scss b/stylesheets/components/fun/FunEmoji.scss
index f96218420..612538cd3 100644
index bb1464cd6..efbeca91e 100644
--- a/stylesheets/components/fun/FunEmoji.scss
+++ b/stylesheets/components/fun/FunEmoji.scss
@@ -8,14 +8,12 @@
@@ -54,8 +54,8 @@ index f96218420..612538cd3 100644
- content-visibility: auto;
vertical-align: top;
letter-spacing: inherit;
@@ -24,15 +22,6 @@
font-style: normal;
@@ -25,15 +23,6 @@
color: hsl(from currentColor h s l / 100%);
}
@@ -71,7 +71,7 @@ index f96218420..612538cd3 100644
.FunStaticEmoji--Blot {
display: inline-flex;
margin-bottom: round(-0.4em + 3px, 1px);
@@ -133,7 +122,6 @@ $inline-emoji-container-name: inline-emoji;
@@ -134,7 +123,6 @@ $inline-emoji-container-name: inline-emoji;
.FunInlineEmoji {
z-index: 0;
@@ -79,20 +79,20 @@ index f96218420..612538cd3 100644
container: $inline-emoji-container-name / inline-size;
display: inline-block;
flex: none;
@@ -142,8 +130,7 @@ $inline-emoji-container-name: inline-emoji;
@@ -143,8 +131,7 @@ $inline-emoji-container-name: inline-emoji;
font-size: var(--fun-inline-emoji-size, round(1.4em, 1px));
line-height: var(--fun-inline-emoji-size, round(1em, 1px));
letter-spacing: inherit;
- content-visibility: auto;
- vertical-align: bottom;
+ vertical-align: text-bottom;
font-style: normal;
color: hsl(from currentColor h s l / 100%);
}
.FunInlineEmoji__Image {
@@ -170,26 +157,6 @@ $inline-emoji-container-name: inline-emoji;
@container #{$inline-emoji-container-name} (width > 64px) {
display: none;
}
@@ -169,26 +156,6 @@ $inline-emoji-container-name: inline-emoji;
// Inline-block so copying multiple emoji does not insert newlines around
// each one in the clipboard plain-text serialization.
display: inline-block;
-
- // Emoji font images are slightly higher than optical center
- @container #{$inline-emoji-container-name} (width > 16px) {
@@ -117,18 +117,18 @@ index f96218420..612538cd3 100644
.FunInlineEmoji__Jumbo {
diff --git a/ts/components/fun/FunEmoji.dom.tsx b/ts/components/fun/FunEmoji.dom.tsx
index 853f8b7cd..f4589f735 100644
index dd022bbc6..d517f3cb4 100644
--- a/ts/components/fun/FunEmoji.dom.tsx
+++ b/ts/components/fun/FunEmoji.dom.tsx
@@ -31,12 +31,6 @@ function getEmojiJumboUrl(
emoji: EmojiVariantData,
@@ -21,12 +21,6 @@ function getEmojiJumboUrl(
emoji: Emoji.Variant,
size: number | undefined
): string | null {
- if (size != null && size < MIN_JUMBOMOJI_SIZE) {
- return null;
- }
- if (KNOWN_JUMBOMOJI.has(emoji.value)) {
- return `emoji://jumbo?emoji=${encodeURIComponent(emoji.value)}`;
- if (KNOWN_JUMBOMOJI.has(emoji)) {
- return `emoji://jumbo?emoji=${encodeURIComponent(emoji)}`;
- }
return null;
}

View File

@@ -19,16 +19,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ringrtc";
version = "2.67.0";
version = "2.69.0";
src = fetchFromGitHub {
owner = "signalapp";
repo = "ringrtc";
tag = "v${finalAttrs.version}";
hash = "sha256-jwLJVq3lkb7HtVigji/1ZKnyaIxyCj+fWCsKe9CjCCM=";
hash = "sha256-KQ/zAyj9caArZvl8SwMFfRcye1IzPoChjnYA0A8GcWw=";
};
cargoHash = "sha256-X/y2923IBF+ajTyjM4SX9FvkAFiyCYSGnVRYHGKgHko=";
cargoHash = "sha256-DlRAPFluKdfU1YutDNQbAEF95aydd+duc6T2hqYWwGQ=";
preConfigure = ''
# Check for matching webrtc version

View File

@@ -15,13 +15,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "node-sqlcipher";
version = "3.2.1";
version = "3.3.5";
src = fetchFromGitHub {
owner = "signalapp";
repo = "node-sqlcipher";
tag = "v${finalAttrs.version}";
hash = "sha256-lkSQXiplkY5sBpHsAhW4odWe+MCalAo100EL7h4VKbg=";
hash = "sha256-RzuyUx0WEG8j8HwV5cepVJIeqYzJpNemFNtB+9NETto=";
};
pnpmDeps = fetchPnpmDeps {
@@ -66,8 +66,10 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
mkdir $out
cp -r dist $out
cp -r prebuilds $out
cp package.json $out
runHook postInstall
'';

View File

@@ -1,25 +1,25 @@
{
"src": {
"args": {
"hash": "sha256-Q5o9fezL7E2J6rn3YxHTtrImCkMTFQL6H+T12d1QOik=",
"hash": "sha256-TsVGiR9qXq6AmvPETkCQP7BGgO21/SUwZJZrSXlj7p8=",
"owner": "signalapp",
"repo": "webrtc",
"tag": "7444h"
"tag": "7680g"
},
"fetcher": "fetchFromGitHub"
},
"src/build": {
"args": {
"hash": "sha256-UHTiL6tMDu/rhSmfy89QQPwEEdU2kS0IaYBhWKKJ4Yo=",
"rev": "045565e91c7360951bddbd0618a20ea59cdd31f3",
"hash": "sha256-ZPEL0Oy07aAd/qtboCcbD7t55f4EzHiOnE3fiVkZE3Q=",
"rev": "a37e61dc22fd633ab32146e7000068a57a2864ff",
"url": "https://chromium.googlesource.com/chromium/src/build"
},
"fetcher": "fetchFromGitiles"
},
"src/buildtools": {
"args": {
"hash": "sha256-OOCCh0pSzUPpjlaceYIR2VGQ66eAqUAv8x7kgDfBD/0=",
"rev": "3e6e75d1961a90054ee0e3030ee66b6a04164c10",
"hash": "sha256-wR2qwqxiRmInKzQiVIiZ13SNKuY5k+aJ+dxKAWV1zdo=",
"rev": "6a18683f555b4ac8b05ac8395c29c84483ac9588",
"url": "https://chromium.googlesource.com/chromium/src/buildtools"
},
"fetcher": "fetchFromGitiles"
@@ -35,40 +35,40 @@
},
"src/testing": {
"args": {
"hash": "sha256-UT4DGNjd+F6liecGeXDwS5Zast4ZriOinbrXAqd96ks=",
"rev": "c030c132cbab406942fb208b7180f8846aa4abf1",
"hash": "sha256-cE8uCDkhkzFjrEJ3ccXq5H45WJ3wvmirLeeSymnR8bk=",
"rev": "b887106bc278bb2a49e21f3a0ab2019574e7e47a",
"url": "https://chromium.googlesource.com/chromium/src/testing"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party": {
"args": {
"hash": "sha256-qxIivQe2O9L6N5T5RpjtdSXvEFQ4CDZtMSounS8iixw=",
"rev": "de738129ebb915bbe34cdf06520c7050ef8aa9d9",
"hash": "sha256-fSsA88V0cv/hAJEZJ7p+RnrnkceLMZCa+XaP+1awo9M=",
"rev": "e43b96b7a65dd3f45f066983061e6f8b2f3a112d",
"url": "https://chromium.googlesource.com/chromium/src/third_party"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/boringssl/src": {
"args": {
"hash": "sha256-yGBxpmWrFURe3gziO3en5ZKs9wAup8XEwHhzq+cKVu8=",
"rev": "db638238d29708a20b991af3b2488e45a8bbcf71",
"hash": "sha256-4eCoRVe47hZ6hc3gXgBS1gY64d+sPqeI08hNMh6JkUY=",
"rev": "305bcfce00b189f2297f53365b0454f96009927d",
"url": "https://boringssl.googlesource.com/boringssl.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/breakpad/breakpad": {
"args": {
"hash": "sha256-jGdQyM3+p3qt+Hjt44Wpg7XKiUt7kz9Lv1xRG7vp+dM=",
"rev": "a1220f673dc44632e821bd1a217089e5a159a203",
"hash": "sha256-dtuBGcYwwaqSKiW7ASFveAeJqcdnFLeU97ip8D786/Q=",
"rev": "79099fdf668ae097c9eca7052fd5c4c5de6c9098",
"url": "https://chromium.googlesource.com/breakpad/breakpad.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/catapult": {
"args": {
"hash": "sha256-Is8yDmTyNyseTBPIDwIlhRthqfkFPgQIvu3b6u5c0m0=",
"rev": "04c85a1d0e324464c6be4b3d193b47cb6177d03a",
"hash": "sha256-Buh+Ixx8CTqBb0vuu/Fnv6fx15lPMOatYGPAgQ0aWEI=",
"rev": "39805a224bb6c6e80e403a4ebe9a150c7ca0b4d1",
"url": "https://chromium.googlesource.com/catapult.git"
},
"fetcher": "fetchFromGitiles"
@@ -83,8 +83,8 @@
},
"src/third_party/clang-format/script": {
"args": {
"hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=",
"rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2",
"hash": "sha256-f+BbQ6xIubloSzx/MhPSZ8ymCskmS+9+epDGtPjZqXc=",
"rev": "c2725e0622e1a86d55f14514f2177a39efea4a0e",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
},
"fetcher": "fetchFromGitiles"
@@ -99,16 +99,16 @@
},
"src/third_party/compiler-rt/src": {
"args": {
"hash": "sha256-MHamj1BEwae6pohqjrMULEp2hrh8+jGDxNgYbzqtGK0=",
"rev": "dbef1a89100395f128231024d0c07e4dcfe72140",
"hash": "sha256-7Jnb0tzi0SkS9vL7VurdTk6Igz5I8ol4H4nRqcZ2+O0=",
"rev": "d606e955eec3d4fb0bf831dea336c3b24cba2f27",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/cpuinfo/src": {
"args": {
"hash": "sha256-JW83AgI1cWv4TSpXNe9sv/hNYAA7MOdUeTHY8+0lHgc=",
"rev": "877328f188a3c7d1fa855871a278eb48d530c4c0",
"hash": "sha256-eXrfeFK0ADKAYoy/vESv7nQnH0oGpeZKlX8XEqPQspo=",
"rev": "84818a41e074779dbb00521a4731d3e14160ff15",
"url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
},
"fetcher": "fetchFromGitiles"
@@ -123,24 +123,24 @@
},
"src/third_party/dav1d/libdav1d": {
"args": {
"hash": "sha256-dPVDZ4SyrHWsRWERUl6UKbbdUG/5dC/UTte6sItMYxg=",
"rev": "af5cf2b1e7f03d6f6de84477e1ca8eed1f3eb03d",
"hash": "sha256-E3da/LJ8HNy1osExmupovqnL8JHgVNzPUCG5F8TJKXQ=",
"rev": "b546257f770768b2c88258c533da38b91a06f737",
"url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/depot_tools": {
"args": {
"hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM=",
"rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5",
"hash": "sha256-RsmH8kxnmzOKsrfmDqULDeQsvRr1l+p8ZE1a4bPLVLs=",
"rev": "9fd48a305e18b9bbaf61734557ce2c46497192b3",
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/eigen3/src": {
"args": {
"hash": "sha256-ZXDzAuvTu46YhieLIQ7MSQ0os+v2RF+KBtFuKU9fCWE=",
"rev": "430e35fbd15d3c946d2d2ba19ec41c16ba217cb3",
"hash": "sha256-GpuSoq887Z1qGKsc4+Vz8X+Sx40P6UnWhaQgrmigkdQ=",
"rev": "afb43805349cf1cbec0083d94256bb8f72cbc53b",
"url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
},
"fetcher": "fetchFromGitiles"
@@ -155,24 +155,24 @@
},
"src/third_party/ffmpeg": {
"args": {
"hash": "sha256-ZeFzrCE9LkDcp3VTMJkm5ypX29RGZCyZkp3tEr7yFKU=",
"rev": "9e751092c9498b84bbb77e2e0689ef9f50fe608f",
"hash": "sha256-LphjwzqsrvAOzd+O+lJ/gGfaWuX4h2/UrRC694ftwSs=",
"rev": "9e588ab02e16326026aa61cc3b6515da20520cec",
"url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/flatbuffers/src": {
"args": {
"hash": "sha256-u5AVjbep3iWwGNXLrkPJUnF8SbmIXlHOYoy3NIlUl/E=",
"rev": "1c514626e83c20fffa8557e75641848e1e15cd5e",
"hash": "sha256-gV1hn1iHI7knFEXy3Oii97mLRZYJUBiBlTh6/sqOoXg=",
"rev": "a86afae9399bbe631d1ea0783f8816e780e236cc",
"url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/fontconfig/src": {
"args": {
"hash": "sha256-2h0dWn7MxAX+4o2tMZLyjRFAES+FTMaGaf8M7ySkSV8=",
"rev": "f0ed9c3f43161d3555f6f7a5234b22fe7ca60727",
"hash": "sha256-Oo4ewK86dbEkO5EXyGWvdmsPHa8Wk1BHQah784vIem0=",
"rev": "d62c2ab268d1679335daa8fb0ea6970f35224a76",
"url": "https://chromium.googlesource.com/external/fontconfig.git"
},
"fetcher": "fetchFromGitiles"
@@ -187,16 +187,16 @@
},
"src/third_party/freetype/src": {
"args": {
"hash": "sha256-b74O5i4xhHq8y0qepP8Wup2nuj9LFzBX7ahMCCVhc98=",
"rev": "d3668e00da732654b50e4e81f982544ed6e26390",
"hash": "sha256-CorCyTiS2fumIF0jhqQgw7VjGkjGXNVD8efdmfZ2wUo=",
"rev": "e3a0652b6d706ee1ce77d4dda606b6597dd8b5c4",
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/fuzztest/src": {
"args": {
"hash": "sha256-gMIDf/Alh9BCk0Gm0m+mmhHoKreHCiN7/WOomcMbS/k=",
"rev": "e101ca021a40733d0fa76a3bd9b49b5f76da4f8a",
"hash": "sha256-CqJJ1hj9nQkGONB+5tJgafg1xvrPgTuE3tM8RjO2RY0=",
"rev": "54dfec04d5c9ad1f22b08002ab6a5e2d0de77671",
"url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
},
"fetcher": "fetchFromGitiles"
@@ -219,24 +219,24 @@
},
"src/third_party/google_benchmark/src": {
"args": {
"hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=",
"rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
"hash": "sha256-GfqY2d+Nd7ovNrXxzTRm/AYWj7GuxIO6FawzUEzwOVA=",
"rev": "188e8278990a9069ffc84441cb5a024fd0bede37",
"url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/googletest/src": {
"args": {
"hash": "sha256-A3kDQbt9ITaxCjl/tJtwySsPUyH+NNb8erdjBzq81o8=",
"rev": "244cec869d12e53378fa0efb610cd4c32a454ec8",
"hash": "sha256-gJhv3DQQSP5BQ6GmDobq42/Gkx4AbOg/ZS80bM0WpEw=",
"rev": "4fe3307fb2d9f86d19777c7eb0e4809e9694dde7",
"url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/grpc/src": {
"args": {
"hash": "sha256-JUws1tD5/4mfx/muCkx5FvQoh0Vb2mD5/bIacCAZVAg=",
"rev": "de6ce7f32b1bf254d2b4c04e8872b63284632fd3",
"hash": "sha256-GvzPndJkPZsVCp0LtaQ29rnORQ7xSZ76if/feEIhvkI=",
"rev": "f394c3f07b4c685b9f6948b36d65ca10a629f4fa",
"url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
},
"fetcher": "fetchFromGitiles"
@@ -251,16 +251,16 @@
},
"src/third_party/harfbuzz-ng/src": {
"args": {
"hash": "sha256-gUUXBd2/di6MYhUzo0QkGQvRY6KLcy7qdDlSClnmnL8=",
"rev": "7d936359a27abb2d7cb14ecc102463bb15c11843",
"hash": "sha256-pXAQYEotsqZmfaJSQFaJmZAQVzUiNrHw52z0vmbxQRQ=",
"rev": "fa2908bf16d2ccd6623f4d575455fea72a1a722b",
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/icu": {
"args": {
"hash": "sha256-k3z31DhDPoqjcZdUL4vjyUMVpUiNk44+7rCMTDVPH8Q=",
"rev": "1b2e3e8a421efae36141a7b932b41e315b089af8",
"hash": "sha256-zFxeAY6lEFRGNbCOOJij0CFjp3512WkyaN1Ld0+WADs=",
"rev": "a86a32e67b8d1384b33f8fa48c83a6079b86f8cd",
"url": "https://chromium.googlesource.com/chromium/deps/icu.git"
},
"fetcher": "fetchFromGitiles"
@@ -291,40 +291,40 @@
},
"src/third_party/libaom/source/libaom": {
"args": {
"hash": "sha256-s+fFufuRRGfItmd63IbHCR6ScANkJ49y+fsIGhTdwZE=",
"rev": "dcfc0bd1934130570d04597a3b75de0824dc434d",
"hash": "sha256-SE9nevzv+e2pVvRECQM0bg3dU1l7rE/4bLPuZDHFi18=",
"rev": "557586fde2fdc09dff9c3edf6943d6d54aa8914c",
"url": "https://aomedia.googlesource.com/aom.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/libc++/src": {
"args": {
"hash": "sha256-IemCFOw1X+Kcna6cuj9e29FUhitqvVGn1DeMCShkbOs=",
"rev": "b77132b512d5411f8393fd3decb3abaeaf1d3ec8",
"hash": "sha256-7O/X2JW8ghkPTjmFZmT9cgG3Ui5zk3gUb436KlPww34=",
"rev": "7ab65651aed6802d2599dcb7a73b1f82d5179d05",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/libc++abi/src": {
"args": {
"hash": "sha256-7TUY05CW5OCyd1C1oq69rptr1RkvOMS+1CAJc7yKRFQ=",
"rev": "864f61dc9253d56586ada34c388278565ef513f6",
"hash": "sha256-L5CUvhpOLS+NBNGssCv0pY9rsDFuAI0LlPjXQRfy62A=",
"rev": "8f11bb1d4438d0239d0dfc1bd9456a9f31629dda",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/libgav1/src": {
"args": {
"hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg=",
"rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58",
"hash": "sha256-gisU0p0HDL7Po/ZXIIZVOTnxnOuVvSE/FYo9DaEUFfo=",
"rev": "40f58ed32ff39071c3f2a51056dbc49a070af0dc",
"url": "https://chromium.googlesource.com/codecs/libgav1.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/libjpeg_turbo": {
"args": {
"hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs=",
"rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad",
"hash": "sha256-FeSS7D3NietL34KgpaDFenBf/GcvapGSpkiKwgIOOHs=",
"rev": "6bb85251a8382b5e07f635a981ac685cc5ab5053",
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
},
"fetcher": "fetchFromGitiles"
@@ -347,56 +347,56 @@
},
"src/third_party/libunwind/src": {
"args": {
"hash": "sha256-veSxr/ICnBsdP+3vWjCbPxduHiEzbT0DUdwfo0xcM30=",
"rev": "322be580a5a193a921c349a15747eeeb9a716ad1",
"hash": "sha256-iRfpzVN+QEpN6okwVs5oEtZqIJYzFGxsUO/IJY1c/W8=",
"rev": "ba19d93d6d4f467fba11ff20fe2fc7c056f79345",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/libvpx/source/libvpx": {
"args": {
"hash": "sha256-44k28SJ7AbcABv1YV1tICtJ1II4AXTuvcAELSTUht6c=",
"rev": "8d00aca60b951444582b1373e4e47f0ca6e0871c",
"hash": "sha256-/FtYzbcOgOlaaWCoJfYns5oye7DoRZx1/xew3lN7tAM=",
"rev": "e83e25f791932202256479052f18bdd03a091147",
"url": "https://chromium.googlesource.com/webm/libvpx.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/libyuv": {
"args": {
"hash": "sha256-9Qn1v9iUrk28bjW9HGepvzEM0wrpmCiA43+a/GPc9/s=",
"rev": "5b22f31cb5d39c1309a589f148678c2a217e75db",
"hash": "sha256-2lnobd22L9u+h6JGWJoWT/0gjhI5JImDsEjn+RRYzJg=",
"rev": "917276084a49be726c90292ff0a6b0a3d571a6af",
"url": "https://chromium.googlesource.com/libyuv/libyuv.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/llvm-libc/src": {
"args": {
"hash": "sha256-U/ToyQwIzZlaPic6LAnR17ySrZ6eGhReJ6iKVFrIHPg=",
"rev": "0c61a55402c6a0d9d6ca2aeb3c6a2613a8bc8c55",
"hash": "sha256-ZPsVBO+5v1xR9lvzHi616unK4HEak07Sy/reMSYwiok=",
"rev": "d99c56d4b9f6663bff528c4fac5313bceb32e762",
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/lss": {
"args": {
"hash": "sha256-rhp4EcZYdgSfu9cqn+zxxGx6v2IW8uX8V+iA0UfZhFY=",
"rev": "ed31caa60f20a4f6569883b2d752ef7522de51e0",
"hash": "sha256-89CdA7vBYudbko0nAIyHcpHMXqFZHC05kwRIUmeEWGo=",
"rev": "29164a80da4d41134950d76d55199ea33fbb9613",
"url": "https://chromium.googlesource.com/linux-syscall-support.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/nasm": {
"args": {
"hash": "sha256-TxzAcp+CoKnnM0lCGjm+L3h6M30vYHjM07vW6zUe/vY=",
"rev": "e2c93c34982b286b27ce8b56dd7159e0b90869a2",
"hash": "sha256-vH3OUzfLZbaPY4DMAvSW0jKYRJmOa7aE8EfIJtZ1/Xs=",
"rev": "af5eeeb054bebadfbb79c7bcd100a95e2ad4525f",
"url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/neon_2_sse/src": {
"args": {
"hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g=",
"rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872",
"hash": "sha256-4OzG4wIPwnKbFD9LG+stxHt5O4qB85ZIXVeSrNqDAyM=",
"rev": "662a85912e8f86ec808f9b15ce77f8715ba53316",
"url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
},
"fetcher": "fetchFromGitiles"
@@ -411,8 +411,8 @@
},
"src/third_party/perfetto": {
"args": {
"hash": "sha256-FfOCX3Z7aKGkMAf8hK5itt7+8N5kBRd9NJGjOLiUjQs=",
"rev": "d5bbee7afdf259af4212929ccbff467dd5349953",
"hash": "sha256-xOFm5u6uwzktkHCLuLmy3ryiuVN8B8Fo+ltHbFmilOY=",
"rev": "2074b65d22dd04b65c2688647b9386a63338f0b9",
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git"
},
"fetcher": "fetchFromGitiles"
@@ -427,48 +427,48 @@
},
"src/third_party/pthreadpool/src": {
"args": {
"hash": "sha256-M9uMq/ZkvrWNep+CIFzx6xLfepLkfY8tjgL7ed2vjU0=",
"rev": "f5a07eddbf4be8f23e29e60a2ccf66b78b71f119",
"hash": "sha256-Es9QNblzo5b+x4K7myQJwIiUKvqyP16QExWPhGqqDO8=",
"rev": "9003ee6c137cea3b94161bd5c614fb43be523ee1",
"url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/re2/src": {
"args": {
"hash": "sha256-e18aSNVEE42LNzCDMay/Fa3BNg36pBPeEtfNvWqlnWE=",
"rev": "6569a9a3df256f4c0c3813cb8ee2f8eef6e2c1fb",
"hash": "sha256-oEU+dz8ax1S36+f9OysjB0GnQj8mjZx1VsZ/UgckdDI=",
"rev": "972a15cedd008d846f1a39b2e88ce48d7f166cbd",
"url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/ruy/src": {
"args": {
"hash": "sha256-fV0El2ZgjxLqstKVN35SL72+diHNK0FkBmG5UwVZFrk=",
"rev": "9940fbf1e0c0863907e77e0600b99bb3e2bc2b9f",
"hash": "sha256-zJ7EYxIoZvN2uOfPscKzWycBO057g4bMnTys2sUrp2M=",
"rev": "576e020f06334118994496b45f9796ed7fda3280",
"url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/tflite/src": {
"args": {
"hash": "sha256-9RWrxIDA2vvobr9Cg13SkwfScw+Lk/NCeaPVIXTCKmY=",
"rev": "313f58ae85278ced9ccc7f90ee630bdf8735c52f",
"hash": "sha256-pIhOSb9eLzel5oDPCpxCvI2XJ2jGLdLURCRkd1BbMkk=",
"rev": "01e030d23d3b904d98cbf908da74d63b3c186949",
"url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
},
"fetcher": "fetchFromGitiles"
},
"src/third_party/xnnpack/src": {
"args": {
"hash": "sha256-oxpMzIFwJ3L5cYLkwcSL7a8XS1AGHXKQjwtHoe/2mZw=",
"rev": "4d098efeac50c44a7c03e6feb1794908db4c3158",
"hash": "sha256-OdrwYAazY0E3han/fpFjlAiguY4M/xnCMJjL3KAIhvw=",
"rev": "4574c4d9b00703c15f2218634ddf101597b22b18",
"url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
},
"fetcher": "fetchFromGitiles"
},
"src/tools": {
"args": {
"hash": "sha256-a3sRfYOVGgroZu25lPS+jGN5Nf/lhfKvKhMl8WiAybs=",
"rev": "3b73a00861c1cc1d6308e20786f42045b77864cd",
"hash": "sha256-QKFYNmNwVcm7aAP3aeuSrY2ScbgMPs4/odf62dI0WJg=",
"rev": "f8f65faf07b1132c9d01932ef95846e9a82b8d54",
"url": "https://chromium.googlesource.com/chromium/src/tools"
},
"fetcher": "fetchFromGitiles"

View File

@@ -1,6 +1,7 @@
{
stdenv,
lib,
fetchpatch,
buildPackages,
ninja,
gn,
@@ -85,6 +86,19 @@ stdenv.mkDerivation (finalAttrs: {
alsa-lib
];
patches = [
# https://github.com/NixOS/nixpkgs/blob/8e689a91c5b4e47b57dee488dd7e319cc704eb9d/pkgs/applications/networking/browsers/chromium/common.nix#L604-L612
# clang++: error: unknown argument: '-fsanitize-ignore-for-ubsan-feature=array-bounds'
(fetchpatch {
name = "chromium-146-revert-Update-fsanitizer=array-bounds-config.patch";
# https://chromium-review.googlesource.com/c/chromium/src/+/7539408
url = "https://chromium.googlesource.com/chromium/src/+/acb47d9a6b56c4889a2ed4216e9968cfc740086c^!?format=TEXT";
decode = "base64 -d";
revert = true;
hash = "sha256-WZsN2qm6lX121bDf7SoN75flXtCTmPPpwtHK0ayjkPc=";
})
];
postPatch = ''
substituteInPlace build/toolchain/linux/BUILD.gn \
--replace-fail 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'

View File

@@ -12,7 +12,6 @@
encfs,
fscrypt-experimental,
gocryptfs,
securefs,
sshfs,
libgcrypt,
libsecret,
@@ -53,7 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
encfs
fscrypt-experimental
gocryptfs
securefs
sshfs
]
}"
@@ -69,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
];
meta = {
description = "Qt/C++ GUI front end to sshfs, ecryptfs-simple, cryfs, gocryptfs, securefs, fscrypt and encfs";
description = "Qt/C++ GUI front end to sshfs, ecryptfs-simple, cryfs, gocryptfs, fscrypt and encfs";
homepage = "https://github.com/mhogomchungu/sirikali";
changelog = "https://github.com/mhogomchungu/sirikali/blob/${finalAttrs.src.rev}/changelog";
license = lib.licenses.gpl3Only;

View File

@@ -6,7 +6,7 @@
fetchPnpmDeps,
pnpmConfigHook,
nodejs,
electron_39,
electron_41,
rustPlatform,
cargo,
rustc,
@@ -20,19 +20,19 @@
removeReferencesTo,
}:
let
electron = electron_39;
electron = electron_41;
pnpm = pnpm_10_29_2;
in
stdenv.mkDerivation (finalAttrs: {
pname = "splayer";
version = "3.0.0";
version = "3.1.1";
src = fetchFromGitHub {
owner = "imsyy";
owner = "SPlayer-Dev";
repo = "SPlayer";
tag = "v${finalAttrs.version}";
fetchSubmodules = false;
hash = "sha256-E29TJlp7nMokJbbi/YLuYf9qWmwvo/r4qQckKrVyumI=";
hash = "sha256-7oLFJqZ1Apq2GK5G3r10I+c3liSweDD2ZPhjpq0f+bM=";
};
pnpmDeps = fetchPnpmDeps {
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
;
inherit pnpm;
fetcherVersion = 3;
hash = "sha256-NaKI2369TlF8DDMy6Q3RUqb2B2/T756Zd6gu4ATz/yc=";
hash = "sha256-zmLc+ExrZg/y2PEI5rH+no9WenE6I+2bLkdXcA/nOic=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
version
src
;
hash = "sha256-gd/5f3yraTQI5bu1VE6HHsGDeKJLR1oTm2H+pg1PAOA=";
hash = "sha256-dv8WqT6ei0dMwXcTQmUVHO9u1nGZ8iGhP2S8DpL+Hxk=";
};
nativeBuildInputs = [
@@ -72,6 +72,9 @@ stdenv.mkDerivation (finalAttrs: {
openssl
];
strictDeps = true;
__structuredAttrs = true;
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
postConfigure = ''
@@ -157,8 +160,8 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Simple Netease Cloud Music player";
homepage = "https://github.com/imsyy/SPlayer";
changelog = "https://github.com/imsyy/SPlayer/releases/tag/v${finalAttrs.version}";
homepage = "https://github.com/SPlayer-Dev/SPlayer";
changelog = "https://github.com/SPlayer-Dev/SPlayer/releases/tag/v${finalAttrs.version}";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ ccicnce113424 ];
mainProgram = "splayer";

View File

@@ -12,16 +12,16 @@
buildGoModule (finalAttrs: {
pname = "stackit-cli";
version = "0.63.0";
version = "0.64.0";
src = fetchFromGitHub {
owner = "stackitcloud";
repo = "stackit-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-oow47NY+kVoReIXwfkhdLDY5zSPaBJhty9mjdjXmQuU=";
hash = "sha256-bJ1gOmlSRxod3fSBI+TKByjEUXzBO8tS7dViJ/UrNFI=";
};
vendorHash = "sha256-7Zxxom+RJJ4cjQ8Knl/96MUMRrQp3P4wQjSNUccLTYw=";
vendorHash = "sha256-+/AgWBpz7Magn4wFyq+t4dg2Kh1+4nKU1N21erHQbZE=";
subPackages = [ "." ];

View File

@@ -102,7 +102,7 @@ let
++ lib.optionals mediaSupport [ ffmpeg_7 ]
);
version = "15.0.14";
version = "15.0.15";
sources = {
x86_64-linux = fetchurl {
@@ -112,7 +112,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
];
hash = "sha256-kxRtNraru8w/lAwwhAD2h6Q+CqFdS2DzV2FZHnNj9Q4=";
hash = "sha256-UlKf5YPGnPCKzCiFu1dxLg6kg3bJQAcZlwOKE9rTIgQ=";
};
i686-linux = fetchurl {
@@ -122,7 +122,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
];
hash = "sha256-GHLeAyMrnwD5lC4NnwM72nZQeRN7AjrlS/zlOqfmjtw=";
hash = "sha256-bIFw4QOIgEQBdcQqjYRKWmy/C0srG0eBBR5H5oteWlo=";
};
};

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