Merge b3ac5a8a8c into haskell-updates
This commit is contained in:
@@ -97,7 +97,7 @@ jobs:
|
||||
github.event_name == 'pull_request_target' &&
|
||||
!contains(fromJSON(inputs.headBranch).type, 'development')
|
||||
with:
|
||||
repo-token: ${{ steps.app-token.outputs.token }}
|
||||
repo-token: ${{ steps.app-token.outputs.token || github.token }}
|
||||
configuration-path: .github/labeler.yml # default
|
||||
sync-labels: true
|
||||
|
||||
@@ -107,7 +107,7 @@ jobs:
|
||||
github.event_name == 'pull_request_target' &&
|
||||
!contains(fromJSON(inputs.headBranch).type, 'development')
|
||||
with:
|
||||
repo-token: ${{ steps.app-token.outputs.token }}
|
||||
repo-token: ${{ steps.app-token.outputs.token || github.token }}
|
||||
configuration-path: .github/labeler-no-sync.yml
|
||||
sync-labels: false
|
||||
|
||||
@@ -120,7 +120,7 @@ jobs:
|
||||
github.event_name == 'pull_request_target' &&
|
||||
contains(fromJSON(inputs.headBranch).type, 'development')
|
||||
with:
|
||||
repo-token: ${{ steps.app-token.outputs.token }}
|
||||
repo-token: ${{ steps.app-token.outputs.token || github.token }}
|
||||
configuration-path: .github/labeler-development-branches.yml
|
||||
sync-labels: true
|
||||
|
||||
|
||||
@@ -65,5 +65,5 @@ jobs:
|
||||
with:
|
||||
issue-number: 105153
|
||||
body: |
|
||||
Periodic merge from `${{ inputs.from }}` into `[${{ inputs.into }}](https://github.com/NixOS/nixpkgs/tree/${{ inputs.into }})` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
|
||||
Periodic merge from `${{ inputs.from }}` into [`${{ inputs.into }}`](https://github.com/NixOS/nixpkgs/tree/${{ inputs.into }}) has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
|
||||
token: ${{ steps.app-token.outputs.token }}
|
||||
|
||||
+49
-4
@@ -9,6 +9,9 @@ module.exports = async ({ github, context, core, dry }) => {
|
||||
|
||||
const artifactClient = new DefaultArtifactClient()
|
||||
|
||||
// Detect if running in a fork (not NixOS/nixpkgs)
|
||||
const isFork = context.repo.owner !== 'NixOS'
|
||||
|
||||
async function downloadMaintainerMap(branch) {
|
||||
let run
|
||||
|
||||
@@ -68,9 +71,18 @@ module.exports = async ({ github, context, core, dry }) => {
|
||||
|
||||
// We get here when none of the 10 commits we looked at contained a maintainer map.
|
||||
// For the master branch, we don't have any fallback options, so we error out.
|
||||
// For other branches, we select a suitable fallback below.
|
||||
if (branch === 'master') throw new Error('No maintainer map found.')
|
||||
// In forks without merge-group history, return empty map to allow testing.
|
||||
if (branch === 'master') {
|
||||
if (isFork) {
|
||||
core.warning(
|
||||
'No maintainer map found. Using empty map (expected in forks without merge-group history).',
|
||||
)
|
||||
return {}
|
||||
}
|
||||
throw new Error('No maintainer map found.')
|
||||
}
|
||||
|
||||
// For other branches, we select a suitable fallback below.
|
||||
const { stable, version } = classify(branch)
|
||||
|
||||
const release = `release-${version}`
|
||||
@@ -109,6 +121,11 @@ module.exports = async ({ github, context, core, dry }) => {
|
||||
return []
|
||||
}
|
||||
|
||||
// Forks don't have NixOS teams, return empty list
|
||||
if (isFork) {
|
||||
return []
|
||||
}
|
||||
|
||||
if (!members[team_slug]) {
|
||||
members[team_slug] = github.paginate(github.rest.teams.listMembersInOrg, {
|
||||
org: context.repo.owner,
|
||||
@@ -304,9 +321,37 @@ module.exports = async ({ github, context, core, dry }) => {
|
||||
expectedHash: artifact.digest,
|
||||
})
|
||||
|
||||
const evalLabels = JSON.parse(
|
||||
const changedPaths = JSON.parse(
|
||||
await readFile(`${pull_number}/changed-paths.json`, 'utf-8'),
|
||||
).labels
|
||||
)
|
||||
const evalLabels = changedPaths.labels
|
||||
|
||||
// Fetch all PR commits to check their messages for package patterns
|
||||
const prCommits = await github.paginate(github.rest.pulls.listCommits, {
|
||||
...context.repo,
|
||||
pull_number,
|
||||
per_page: 100,
|
||||
})
|
||||
const commitMessages = prCommits.map((c) => c.commit.message)
|
||||
|
||||
// Label new package PRs: "packagename: init at X.Y.Z"
|
||||
// Exclude NixOS module commits like "nixos/timekpr: init at 0.5.8"
|
||||
const newPackagePattern = /(?<!nixos\/\S+): init at\b/
|
||||
const hasNewPackages = changedPaths.attrdiff?.added?.length > 0
|
||||
const commitsIndicateNewPackage = commitMessages.some((msg) =>
|
||||
newPackagePattern.test(msg),
|
||||
)
|
||||
evalLabels['8.has: package (new)'] =
|
||||
hasNewPackages && commitsIndicateNewPackage
|
||||
|
||||
// Label package update PRs: "packagename: X.Y.Z -> A.B.C"
|
||||
// Matches versions like: 1.2.3, 0-unstable-2024-01-15, 1.3rc1, alpha, unstable
|
||||
// Exclude NixOS module commits like "nixos/ncps: types.str -> types.path"
|
||||
const updatePackagePattern = /(?<!nixos\/\S+): [\w.-]+ (->|→) [\w.-]+/
|
||||
const commitsIndicateUpdate = commitMessages.some((msg) =>
|
||||
updatePackagePattern.test(msg),
|
||||
)
|
||||
evalLabels['8.has: package (update)'] = commitsIndicateUpdate
|
||||
|
||||
// TODO: Get "changed packages" information from list of changed by-name files
|
||||
// in addition to just the Eval results, to make this work for these packages
|
||||
|
||||
@@ -3931,12 +3931,6 @@
|
||||
githubId = 15181236;
|
||||
keys = [ { fingerprint = "AE1E 3B80 7727 C974 B972 AB3C C324 01C3 BF52 1179"; } ];
|
||||
};
|
||||
bridgesense = {
|
||||
name = "Saad Nadeem";
|
||||
email = "saad29nadeem@gmail.com";
|
||||
github = "BridgeSenseDev";
|
||||
githubId = 88615188;
|
||||
};
|
||||
britter = {
|
||||
name = "Benedikt Ritter";
|
||||
email = "beneritter@gmail.com";
|
||||
@@ -16996,6 +16990,13 @@
|
||||
githubId = 68288772;
|
||||
name = "Markus Heinrich";
|
||||
};
|
||||
MH0386 = {
|
||||
name = "Mohamed Hisham Abdelzaher";
|
||||
email = "mohamed.hisham.abdelzaher@gmail.com";
|
||||
github = "MH0386";
|
||||
githubId = 77013511;
|
||||
matrix = "@mh0386:matrix.org";
|
||||
};
|
||||
mh182 = {
|
||||
email = "mh182@chello.at";
|
||||
github = "mh182";
|
||||
@@ -23262,6 +23263,12 @@
|
||||
github = "s1341";
|
||||
githubId = 5682183;
|
||||
};
|
||||
saadndm = {
|
||||
name = "Saad Nadeem";
|
||||
email = "saad29nadeem@gmail.com";
|
||||
github = "saadndm";
|
||||
githubId = 88615188;
|
||||
};
|
||||
sagikazarmark = {
|
||||
name = "Mark Sagi-Kazar";
|
||||
email = "mark.sagikazar@gmail.com";
|
||||
|
||||
@@ -158,7 +158,7 @@ tl,,,,,,mephistophiles
|
||||
toml-edit,,,,,5.1,mrcjkb
|
||||
tree-sitter-http,,,,0.0.33-1,,
|
||||
tree-sitter-norg,,,,,5.1,mrcjkb
|
||||
tree-sitter-orgmode,,,,,,
|
||||
tree-sitter-orgmode,,,,,5.1,
|
||||
vstruct,,,,,,
|
||||
vusted,,,,,,
|
||||
xml2lua,,,,,,teto
|
||||
|
||||
|
@@ -118,6 +118,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
|
||||
|
||||
- `services.pingvin-share` has been removed as the `pingvin-share.backend` package was broken and the project was archived upstream.
|
||||
|
||||
- `geph` package's built-in GUI `geph5-client-gui` has been [removed](https://github.com/geph-official/geph5/commit/f2221fb8386312daf2cef05483ebb353ff48bdb4) by the upstream. All users who wish to continue using the GUI should install the `gephgui-wry`, which is consistent with the official release version.
|
||||
|
||||
## Other Notable Changes {#sec-release-26.05-notable-changes}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
@@ -17,6 +17,7 @@ let
|
||||
concatMapStringsSep
|
||||
types
|
||||
literalExpression
|
||||
optional
|
||||
;
|
||||
|
||||
pdsadminWrapper =
|
||||
@@ -32,7 +33,7 @@ let
|
||||
${getExe pkgs.bluesky-pdsadmin} "$@"
|
||||
'';
|
||||
in
|
||||
# All defaults are from https://github.com/bluesky-social/pds/blob/8b9fc24cec5f30066b0d0b86d2b0ba3d66c2b532/installer.sh
|
||||
# All defaults are from https://github.com/bluesky-social/pds/blob/9a72155fee4e7e1de0e0add5454c5571b89e05e0/installer.sh
|
||||
{
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModule [ "services" "pds" "enable" ] [ "services" "bluesky-pds" "enable" ])
|
||||
@@ -130,6 +131,12 @@ in
|
||||
default = "true";
|
||||
description = "Enable logging";
|
||||
};
|
||||
|
||||
PDS_RATE_LIMITS_ENABLED = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = "true";
|
||||
description = "Enable rate limiting";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -162,19 +169,27 @@ in
|
||||
};
|
||||
|
||||
pdsadmin = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
defaultText = false;
|
||||
description = "Add pdsadmin script to PATH";
|
||||
};
|
||||
};
|
||||
|
||||
goat = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = cfg.enable;
|
||||
defaultText = literalExpression "config.services.bluesky-pds.enable";
|
||||
description = "Add pdsadmin script to PATH";
|
||||
description = "Add goat to PATH";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment = mkIf cfg.pdsadmin.enable {
|
||||
systemPackages = [ pdsadminWrapper ];
|
||||
};
|
||||
environment.systemPackages =
|
||||
optional cfg.pdsadmin.enable pdsadminWrapper ++ optional cfg.goat.enable pkgs.atproto-goat;
|
||||
|
||||
systemd.services.bluesky-pds = {
|
||||
description = "bluesky pds";
|
||||
|
||||
@@ -1389,7 +1389,7 @@ in
|
||||
rosenpass = runTest ./rosenpass.nix;
|
||||
roundcube = runTest ./roundcube.nix;
|
||||
routinator = handleTest ./routinator.nix { };
|
||||
rqbit = handleTest ./rqbit.nix { };
|
||||
rqbit = runTest ./rqbit.nix;
|
||||
rshim = handleTest ./rshim.nix { };
|
||||
rspamd = handleTest ./rspamd.nix { };
|
||||
rspamd-trainer = runTest ./rspamd-trainer.nix;
|
||||
|
||||
+25
-27
@@ -1,30 +1,28 @@
|
||||
import ./make-test-python.nix (
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
port = 3030;
|
||||
in
|
||||
{
|
||||
name = "rqbit";
|
||||
meta = {
|
||||
maintainers = with pkgs.lib.maintainers; [ CodedNil ];
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
port = 3030;
|
||||
in
|
||||
{
|
||||
name = "rqbit";
|
||||
meta = {
|
||||
maintainers = with pkgs.lib.maintainers; [ CodedNil ];
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.rqbit = {
|
||||
httpPort = port;
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.rqbit = {
|
||||
httpPort = port;
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
};
|
||||
testScript = /* python */ ''
|
||||
machine.start()
|
||||
machine.wait_for_unit("rqbit.service")
|
||||
machine.wait_for_open_port(${toString port})
|
||||
|
||||
testScript = /* python */ ''
|
||||
machine.start()
|
||||
machine.wait_for_unit("rqbit.service")
|
||||
machine.wait_for_open_port(${toString port})
|
||||
|
||||
machine.succeed("curl --fail http://localhost:${toString port}")
|
||||
'';
|
||||
}
|
||||
)
|
||||
machine.succeed("curl --fail http://localhost:${toString port}")
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -80,11 +80,11 @@
|
||||
}:
|
||||
|
||||
let
|
||||
drvName = "android-studio-${channel}-${version}";
|
||||
filename = "android-studio-${version}-linux.tar.gz";
|
||||
|
||||
androidStudio = stdenv.mkDerivation {
|
||||
name = "${drvName}-unwrapped";
|
||||
pname = "${pname}-unwrapped";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/${filename}";
|
||||
@@ -228,7 +228,7 @@ let
|
||||
# (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS
|
||||
# environment is used as a work around for that.
|
||||
fhsEnv = buildFHSEnv {
|
||||
pname = "${drvName}-fhs-env";
|
||||
pname = "${pname}-fhs-env";
|
||||
inherit version;
|
||||
multiPkgs = pkgs: [
|
||||
ncurses5
|
||||
@@ -245,8 +245,9 @@ let
|
||||
androidStudio,
|
||||
androidSdk ? null,
|
||||
}:
|
||||
runCommand drvName
|
||||
runCommand "${pname}-${version}"
|
||||
{
|
||||
inherit pname version;
|
||||
startScript =
|
||||
let
|
||||
hasAndroidSdk = androidSdk != null;
|
||||
@@ -283,7 +284,7 @@ let
|
||||
unset ANDROID_HOME
|
||||
fi
|
||||
''}
|
||||
exec ${fhsEnv}/bin/${drvName}-fhs-env ${lib.getExe androidStudio} "$@"
|
||||
exec ${lib.getExe fhsEnv} ${lib.getExe androidStudio} "$@"
|
||||
'';
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
@@ -292,7 +293,6 @@ let
|
||||
withSdk = androidSdk: mkAndroidStudioWrapper { inherit androidStudio androidSdk; };
|
||||
in
|
||||
{
|
||||
inherit version;
|
||||
unwrapped = androidStudio;
|
||||
full = withSdk androidenv.androidPkgs.androidsdk;
|
||||
inherit withSdk;
|
||||
|
||||
@@ -16,8 +16,8 @@ let
|
||||
inherit tiling_wm;
|
||||
};
|
||||
stableVersion = {
|
||||
version = "2025.2.2.8"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Patch 1"
|
||||
sha256Hash = "sha256-xs9ABQ9f8/gtxcoiZkf/xEtmTOj6rb4Ty+w70/+C4Ss=";
|
||||
version = "2025.2.3.9"; # "Android Studio Otter 3 Feature Drop | 2025.2.3"
|
||||
sha256Hash = "sha256-mG6myss22nI/LIVQzM19jNPouLe7JEbTqL85u6+Rq8E=";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2025.2.3.8"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 RC 3"
|
||||
|
||||
@@ -76,6 +76,9 @@ in
|
||||
|
||||
cl-print = null; # builtin
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/483425
|
||||
consult = addPackageRequires super.consult [ self.flymake ];
|
||||
|
||||
# missing optional dependencies https://codeberg.org/rahguzar/consult-hoogle/issues/4
|
||||
consult-hoogle = addPackageRequiresIfOlder super.consult-hoogle [ self.consult ] "0.2.2";
|
||||
|
||||
|
||||
@@ -10,18 +10,18 @@
|
||||
vimUtils,
|
||||
}:
|
||||
let
|
||||
version = "e3f788f-unstable-2025-12-13";
|
||||
version = "6b01f95-unstable-2026-01-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmtrKovalenko";
|
||||
repo = "fff.nvim";
|
||||
rev = "e3f788f87b014f61e39cd916edc766d10e563d73";
|
||||
hash = "sha256-NSTo5zs9DvGDVUp6PJNHCQsSNPgdkJCTYvlA/IP12h4=";
|
||||
rev = "6b01f95ca6305511ef28175c42b250925376f181";
|
||||
hash = "sha256-vI1oOVzpTpYZ0ea6w0e2wyKa0TsyLFFauOZkhYbXLYM=";
|
||||
};
|
||||
fff-nvim-lib = rustPlatform.buildRustPackage {
|
||||
pname = "fff-nvim-lib";
|
||||
inherit version src;
|
||||
|
||||
cargoHash = "sha256-kNTJC+0KBQKt0nMY2HAUWnr55x8nTd5oRGeDuam8X30=";
|
||||
cargoHash = "sha256-jch2snZVoDqPkbeuF++yc/3ikoWal29bTKZjkyDgVjU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -49,10 +49,15 @@ vimUtils.buildVimPlugin {
|
||||
postPatch = ''
|
||||
substituteInPlace lua/fff/download.lua \
|
||||
--replace-fail \
|
||||
"return plugin_dir .. '/../target'" \
|
||||
"return plugin_dir .. '/../target/release'" \
|
||||
"return '${fff-nvim-lib}/lib'"
|
||||
'';
|
||||
|
||||
nvimSkipModule = [
|
||||
# Skip single file dev config for testing fff.nvim locally
|
||||
"empty_config"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
@@ -69,6 +74,7 @@ vimUtils.buildVimPlugin {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
saadndm
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,11 +7,10 @@
|
||||
makeDesktopItem,
|
||||
unzip,
|
||||
libsecret,
|
||||
libXScrnSaver,
|
||||
libxshmfence,
|
||||
buildPackages,
|
||||
at-spi2-atk,
|
||||
autoPatchelfHook,
|
||||
buildFHSEnv,
|
||||
alsa-lib,
|
||||
libgbm,
|
||||
nss,
|
||||
@@ -19,22 +18,21 @@
|
||||
xorg,
|
||||
systemdLibs,
|
||||
fontconfig,
|
||||
imagemagick,
|
||||
libdbusmenu,
|
||||
glib,
|
||||
buildFHSEnv,
|
||||
wayland,
|
||||
libglvnd,
|
||||
libkrb5,
|
||||
openssl,
|
||||
webkitgtk_4_1,
|
||||
|
||||
# Populate passthru.tests
|
||||
tests,
|
||||
ripgrep,
|
||||
|
||||
# needed to fix "Save as Root"
|
||||
asar,
|
||||
bash,
|
||||
}:
|
||||
|
||||
{
|
||||
# Attributes inherit from specific versions
|
||||
version,
|
||||
vscodeVersion ? version,
|
||||
@@ -54,10 +52,17 @@
|
||||
vscodeServer ? null,
|
||||
sourceExecutableName ? executableName,
|
||||
useVSCodeRipgrep ? false,
|
||||
ripgrep,
|
||||
hasVsceSign ? false,
|
||||
patchVSCodePath ? true,
|
||||
imagemagick,
|
||||
|
||||
# Populate passthru.tests
|
||||
tests,
|
||||
|
||||
extraNativeBuildInputs ? [ ],
|
||||
|
||||
# Customize FHS environment
|
||||
# Function that takes default buildFHSEnv arguments and returns modified arguments
|
||||
customizeFHSEnv ? args: args,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (
|
||||
@@ -77,82 +82,86 @@ stdenv.mkDerivation (
|
||||
{
|
||||
additionalPkgs ? pkgs: [ ],
|
||||
}:
|
||||
buildFHSEnv {
|
||||
# also determines the name of the wrapped command
|
||||
pname = executableName;
|
||||
inherit version;
|
||||
let
|
||||
defaultArgs = {
|
||||
# also determines the name of the wrapped command
|
||||
pname = executableName;
|
||||
inherit version;
|
||||
|
||||
# additional libraries which are commonly needed for extensions
|
||||
targetPkgs =
|
||||
pkgs:
|
||||
(with pkgs; [
|
||||
# ld-linux-x86-64-linux.so.2 and others
|
||||
glibc
|
||||
# additional libraries which are commonly needed for extensions
|
||||
targetPkgs =
|
||||
pkgs:
|
||||
(with pkgs; [
|
||||
# ld-linux-x86-64-linux.so.2 and others
|
||||
glibc
|
||||
|
||||
# dotnet
|
||||
curl
|
||||
icu
|
||||
libunwind
|
||||
libuuid
|
||||
lttng-ust
|
||||
openssl
|
||||
zlib
|
||||
# dotnet
|
||||
curl
|
||||
icu
|
||||
libunwind
|
||||
libuuid
|
||||
lttng-ust
|
||||
openssl
|
||||
zlib
|
||||
|
||||
# mono
|
||||
krb5
|
||||
# mono
|
||||
krb5
|
||||
|
||||
# Needed for headless browser-in-vscode based plugins such as
|
||||
# anything based on Puppeteer https://pptr.dev .
|
||||
# e.g. Roo Code
|
||||
glib
|
||||
nspr
|
||||
nss
|
||||
dbus
|
||||
at-spi2-atk
|
||||
cups
|
||||
expat
|
||||
libxkbcommon
|
||||
xorg.libX11
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libxcb
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXrandr
|
||||
cairo
|
||||
pango
|
||||
alsa-lib
|
||||
libgbm
|
||||
udev
|
||||
libudev0-shim
|
||||
])
|
||||
++ additionalPkgs pkgs;
|
||||
# Needed for headless browser-in-vscode based plugins such as
|
||||
# anything based on Puppeteer https://pptr.dev .
|
||||
# e.g. Roo Code
|
||||
glib
|
||||
nspr
|
||||
nss
|
||||
dbus
|
||||
at-spi2-atk
|
||||
cups
|
||||
expat
|
||||
libxkbcommon
|
||||
xorg.libX11
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libxcb
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXrandr
|
||||
cairo
|
||||
pango
|
||||
alsa-lib
|
||||
libgbm
|
||||
udev
|
||||
libudev0-shim
|
||||
])
|
||||
++ additionalPkgs pkgs;
|
||||
|
||||
extraBwrapArgs = [
|
||||
"--bind-try /etc/nixos/ /etc/nixos/"
|
||||
"--ro-bind-try /etc/xdg/ /etc/xdg/"
|
||||
];
|
||||
extraBwrapArgs = [
|
||||
"--bind-try /etc/nixos/ /etc/nixos/"
|
||||
"--ro-bind-try /etc/xdg/ /etc/xdg/"
|
||||
];
|
||||
|
||||
# symlink shared assets, including icons and desktop entries
|
||||
extraInstallCommands = ''
|
||||
ln -s "${finalAttrs.finalPackage}/share" "$out/"
|
||||
'';
|
||||
# symlink shared assets, including icons and desktop entries
|
||||
extraInstallCommands = ''
|
||||
ln -s "${finalAttrs.finalPackage}/share" "$out/"
|
||||
'';
|
||||
|
||||
runScript = "${finalAttrs.finalPackage}/bin/${executableName}";
|
||||
runScript = "${finalAttrs.finalPackage}/bin/${executableName}";
|
||||
|
||||
# vscode likes to kill the parent so that the
|
||||
# gui application isn't attached to the terminal session
|
||||
dieWithParent = false;
|
||||
# vscode likes to kill the parent so that the
|
||||
# gui application isn't attached to the terminal session
|
||||
dieWithParent = false;
|
||||
|
||||
passthru = {
|
||||
inherit executableName;
|
||||
inherit (finalAttrs.finalPackage) pname version; # for home-manager module
|
||||
passthru = {
|
||||
inherit executableName;
|
||||
inherit (finalAttrs.finalPackage) pname version; # for home-manager module
|
||||
};
|
||||
|
||||
meta = meta // {
|
||||
description = "Wrapped variant of ${pname} which launches in a FHS compatible environment, should allow for easy usage of extensions without nix-specific modifications";
|
||||
};
|
||||
};
|
||||
|
||||
meta = meta // {
|
||||
description = "Wrapped variant of ${pname} which launches in a FHS compatible environment, should allow for easy usage of extensions without nix-specific modifications";
|
||||
};
|
||||
};
|
||||
customizedArgs = customizeFHSEnv defaultArgs;
|
||||
in
|
||||
buildFHSEnv customizedArgs;
|
||||
in
|
||||
{
|
||||
|
||||
@@ -225,13 +234,10 @@ stdenv.mkDerivation (
|
||||
|
||||
buildInputs = [
|
||||
libsecret
|
||||
libXScrnSaver
|
||||
libxshmfence
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
libkrb5
|
||||
libgbm
|
||||
nss
|
||||
nspr
|
||||
@@ -252,6 +258,7 @@ stdenv.mkDerivation (
|
||||
unzip
|
||||
imagemagick
|
||||
]
|
||||
++ extraNativeBuildInputs
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
autoPatchelfHook
|
||||
asar
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
callPackage,
|
||||
buildVscode,
|
||||
fetchurl,
|
||||
nixosTests,
|
||||
srcOnly,
|
||||
@@ -51,7 +51,7 @@ let
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "585eba7c0c34fd6b30faac7c62a42050bfbc0086";
|
||||
in
|
||||
callPackage ./generic.nix {
|
||||
buildVscode {
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
callPackage,
|
||||
buildVscode,
|
||||
fetchurl,
|
||||
nixosTests,
|
||||
commandLineArgs ? "",
|
||||
@@ -38,7 +38,7 @@ let
|
||||
|
||||
sourceRoot = lib.optionalString (!stdenv.hostPlatform.isDarwin) ".";
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
buildVscode rec {
|
||||
inherit sourceRoot commandLineArgs useVSCodeRipgrep;
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "ppsspp";
|
||||
version = "0-unstable-2026-01-18";
|
||||
version = "0-unstable-2026-01-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrydgard";
|
||||
repo = "ppsspp";
|
||||
rev = "3c3de9ce6b93dc718ad7487ee249dea560a791ed";
|
||||
hash = "sha256-ZzOrK0ccYew91bZLMp5B4r5wC/4e6N5SaDled0fskcI=";
|
||||
rev = "bab01f1b162ed76dde584b9a1f9f327fecbf5cb5";
|
||||
hash = "sha256-SXI6EmvpQ80nkzxswBrvCZTVi8qW6R5097D4aZTSie4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -310,11 +310,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"digitalocean_digitalocean": {
|
||||
"hash": "sha256-SmpbPDlJxsXT63d4KnUSzbPLSG5c2mPy6SCA8TCpxe4=",
|
||||
"hash": "sha256-inPOojpjliZpEN3Bk67mPdmq0XDCFHFpwthwuJjyIZg=",
|
||||
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
|
||||
"owner": "digitalocean",
|
||||
"repo": "terraform-provider-digitalocean",
|
||||
"rev": "v2.73.0",
|
||||
"rev": "v2.74.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -382,11 +382,11 @@
|
||||
"vendorHash": "sha256-M5cX70GwfdEJ22V8CwoaNEdEWb1CX7wsBgvj3GvjE0Q="
|
||||
},
|
||||
"exoscale_exoscale": {
|
||||
"hash": "sha256-8FIZO+iRqYa7y5Li8GoGnFT069vx4q4KczCgEB4SKuk=",
|
||||
"hash": "sha256-V7mG584wyr99myizr/jx9AadkAnBCZvUvAKF0sX/CIA=",
|
||||
"homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
|
||||
"owner": "exoscale",
|
||||
"repo": "terraform-provider-exoscale",
|
||||
"rev": "v0.67.1",
|
||||
"rev": "v0.67.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -472,13 +472,13 @@
|
||||
"vendorHash": "sha256-mzDFyk2oImRXt72kFV5Ln++ScgoecpJEJtzUKjvCaws="
|
||||
},
|
||||
"grafana_grafana": {
|
||||
"hash": "sha256-gfS+sJREaObaXSgfVK7oUAgm05EqSRhiLauGP6V9Vhw=",
|
||||
"hash": "sha256-EO18AHTtuchRpHxcXa5shmCpoLR91Ows8doBUTjollI=",
|
||||
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
|
||||
"owner": "grafana",
|
||||
"repo": "terraform-provider-grafana",
|
||||
"rev": "v4.23.0",
|
||||
"rev": "v4.25.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-sP86GbNZUmltn5a7AREyw54Fa3eFNwW/lMIFZIEj/Bo="
|
||||
"vendorHash": "sha256-5+nBYEAdiyNYsZsWvghciCYixQB3ojRlpSiSdjNWDHY="
|
||||
},
|
||||
"gridscale_gridscale": {
|
||||
"hash": "sha256-FAKvQ/MEod5Ck0PG4ffQ+gQp6zZ0JDRXPOrOiDpWMls=",
|
||||
@@ -923,13 +923,13 @@
|
||||
"vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU="
|
||||
},
|
||||
"mongodb_mongodbatlas": {
|
||||
"hash": "sha256-yVkhW1cYH+1biC1kUI6MdAK00QpiCyG/sGbOOxTEmm8=",
|
||||
"hash": "sha256-PACDH+CIEzUC/LYmppXin93vi0xp+1fMev2xn9iroRo=",
|
||||
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
|
||||
"owner": "mongodb",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v2.4.0",
|
||||
"rev": "v2.5.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-5xHm81ribxzdgSkMPAY7JEnlwf7wN/QGD8UyxUx2FOQ="
|
||||
"vendorHash": "sha256-3LMym5LFcrtEPA1exhrqbn3lqur7Vh8RP9wOwWChuKc="
|
||||
},
|
||||
"namecheap_namecheap": {
|
||||
"hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",
|
||||
@@ -1031,13 +1031,13 @@
|
||||
"vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="
|
||||
},
|
||||
"opentelekomcloud_opentelekomcloud": {
|
||||
"hash": "sha256-68JyLHSHyse7znn7egPLMz4DeyHaWAGfa0TLCHQJd4k=",
|
||||
"hash": "sha256-Pco5/kiFOyqwjktDFgHgCtq/kVKshzZyp9cjT+mJYJs=",
|
||||
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
|
||||
"owner": "opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.36.56",
|
||||
"rev": "v1.36.57",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-ESu1guITtquRqdGI3KdMhOf24gjtii45i5TkVrqJ18U="
|
||||
"vendorHash": "sha256-v7t3W7v38xw7M8r9rdx+9cTUT6FFY4x5ujkVYD7qThw="
|
||||
},
|
||||
"opsgenie_opsgenie": {
|
||||
"hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=",
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "sponsorblock";
|
||||
namespace = "script.service.sponsorblock";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siku2";
|
||||
repo = namespace;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IBgh2kdPgCy+HHrR7UZxTgjF1LR77ABGlUp3PgaobNM=";
|
||||
hash = "sha256-9+0gIY12C+bZNsCRzla1IFmtVZiiGnS4TL3srkOBWsQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
+4
-4
@@ -5,7 +5,7 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@sourcegraph/amp": "^0.0.1768760544-gf06f5a"
|
||||
"@sourcegraph/amp": "^0.0.1769346334-gc7e300"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring": {
|
||||
@@ -228,9 +228,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@sourcegraph/amp": {
|
||||
"version": "0.0.1768760544-gf06f5a",
|
||||
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1768760544-gf06f5a.tgz",
|
||||
"integrity": "sha512-ECw/n1n3aKERHW8qo5KaFgKgLDj4zJElFsyHnAS10BRv3ON0T6BPbboMvqvtYq1NEeX00QGpBDO2u0Q1+k3oGQ==",
|
||||
"version": "0.0.1769346334-gc7e300",
|
||||
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1769346334-gc7e300.tgz",
|
||||
"integrity": "sha512-inYgc+ARJbXEXrDMQsG2kwQI9/tRHD/TPubNGv6XnQSd0MxCq9hr4KxiSryFnw5qIASWYn85RdSy6LM9dRFa7Q==",
|
||||
"license": "Amp Commercial License",
|
||||
"dependencies": {
|
||||
"@napi-rs/keyring": "1.1.9"
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "amp-cli";
|
||||
version = "0.0.1768760544-gf06f5a";
|
||||
version = "0.0.1769346334-gc7e300";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-URgYg3SZXeHrw+xXiXC1BDe0/ZUFRu9mDmqtTIA9ObU=";
|
||||
hash = "sha256-Y0ySMlYP/mvD+ydkGhqt03zYkFj6BmZpe2zLnAV5rDk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
|
||||
chmod +x bin/amp-wrapper.js
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-7r522RT+38rjv1YqjhR9XIhWYoxVHmRUKeYfToCbsHA=";
|
||||
npmDepsHash = "sha256-2e0kJJqmIB3kAaSzATSaNojLvsCIq5MwTGK0y0OxfO4=";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ripgrep
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "android-studio-tools";
|
||||
version = "13114758";
|
||||
version = "14742923";
|
||||
|
||||
src = fetchzip {
|
||||
# The only difference between the Linux and Mac versions is a single comment at the top of all the scripts
|
||||
# Therefore, we will use the Linux version and just patch the comment
|
||||
url = "https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip";
|
||||
hash = "sha256-dt8nwjL8wyRfBZOedCPYXh7zyeMUeH0gOPpTcpxCegU=";
|
||||
url = "https://dl.google.com/android/repository/commandlinetools-linux-14742923_latest.zip";
|
||||
hash = "sha256-oimC4ToDFIa8Rlv+5RB+swl8M5PHdX4omlrMZMQEx8M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -30,13 +30,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "android-translation-layer";
|
||||
version = "0-unstable-2025-09-14";
|
||||
version = "0-unstable-2026-01-08";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "android_translation_layer";
|
||||
repo = "android_translation_layer";
|
||||
rev = "9de91586994af5078decda17db92ce50c5673951";
|
||||
hash = "sha256-iRjP++WzLsV7oDGNdF3m9JJJS7zLrG5W46U3h39H5uk=";
|
||||
rev = "b4d749b9b7f1a8620b976f03a2924d0661f7232f";
|
||||
hash = "sha256-SeMxbqyD3MXDR4fHans7pdQSa/SLoWOl9QhnpH7CWCY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{
|
||||
"version": "1.15.6",
|
||||
"version": "1.15.8",
|
||||
"vscodeVersion": "1.104.0",
|
||||
"sources": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.6-5250816192937984/linux-x64/Antigravity.tar.gz",
|
||||
"sha256": "e399b13e4b6d8ec5b57a746478a87b0f7652f8a69024febd4c25ec847a4c8ea6"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/linux-x64/Antigravity.tar.gz",
|
||||
"sha256": "44afc76e06599b5eed8eab68db3d2c553c77ea6b9cc7652250e3d1a58bbb1498"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.6-5250816192937984/linux-arm/Antigravity.tar.gz",
|
||||
"sha256": "645247bc7c6c637b07610884350588e888eabd22e32a2786695606bebbb97900"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/linux-arm/Antigravity.tar.gz",
|
||||
"sha256": "a39cb7fb78eaceb939e82cf8024fc7e16694a61b32d2af61ba414fe4284e41cd"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.6-5250816192937984/darwin-x64/Antigravity.zip",
|
||||
"sha256": "d99b852cf831c4a1d3207a9cbef0b2cb92a68fdbb84f121d908d694617f0a8a4"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/darwin-x64/Antigravity.zip",
|
||||
"sha256": "2554e90087f83e92655650a66d51f47c5577fade58627d5ec8b4221e5ed62ed8"
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.6-5250816192937984/darwin-arm/Antigravity.zip",
|
||||
"sha256": "85d62d8efc97777d77c176809025235d9138a7f3d1b3d6003526499b8e48ec3c"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.15.8-5724687216017408/darwin-arm/Antigravity.zip",
|
||||
"sha256": "cc3199592ff91325e395ba9fff1a0cd9f3c709bec52ec36d30f27101d6231239"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
callPackage,
|
||||
vscode-generic,
|
||||
buildVscode,
|
||||
fetchurl,
|
||||
jq,
|
||||
buildFHSEnv,
|
||||
writeShellScript,
|
||||
coreutils,
|
||||
commandLineArgs ? "",
|
||||
@@ -19,7 +17,7 @@ let
|
||||
information.sources."${hostPlatform.system}"
|
||||
or (throw "antigravity: unsupported system ${hostPlatform.system}");
|
||||
in
|
||||
(callPackage vscode-generic {
|
||||
(buildVscode {
|
||||
inherit commandLineArgs useVSCodeRipgrep;
|
||||
inherit (information) version vscodeVersion;
|
||||
pname = "antigravity";
|
||||
@@ -34,32 +32,30 @@ in
|
||||
|
||||
sourceRoot = if hostPlatform.isDarwin then "Antigravity.app" else "Antigravity";
|
||||
|
||||
# When running inside an FHS environment, try linking Google Chrome or Chromium
|
||||
# to the hardcoded Playwright search path: /opt/google/chrome/chrome
|
||||
buildFHSEnv =
|
||||
args:
|
||||
buildFHSEnv (
|
||||
args
|
||||
// {
|
||||
extraBuildCommands = (args.extraBuildCommands or "") + ''
|
||||
mkdir -p "$out/opt/google/chrome"
|
||||
'';
|
||||
extraBwrapArgs = (args.extraBwrapArgs or [ ]) ++ [ "--tmpfs /opt/google/chrome" ];
|
||||
runScript = writeShellScript "antigravity-wrapper" ''
|
||||
for candidate in google-chrome-stable google-chrome chromium-browser chromium; do
|
||||
if target=$(command -v "$candidate"); then
|
||||
${coreutils}/bin/ln -sf "$target" /opt/google/chrome/chrome
|
||||
break
|
||||
fi
|
||||
done
|
||||
exec ${args.runScript} "$@"
|
||||
'';
|
||||
}
|
||||
);
|
||||
|
||||
tests = { };
|
||||
updateScript = ./update.js;
|
||||
|
||||
# When running inside an FHS environment, try linking Google Chrome or Chromium
|
||||
# to the hardcoded Playwright search path: /opt/google/chrome/chrome
|
||||
customizeFHSEnv =
|
||||
args:
|
||||
args
|
||||
// {
|
||||
extraBwrapArgs = (args.extraBwrapArgs or [ ]) ++ [ "--tmpfs /opt/google/chrome" ];
|
||||
extraBuildCommands = (args.extraBuildCommands or "") + ''
|
||||
mkdir -p "$out/opt/google/chrome"
|
||||
'';
|
||||
runScript = writeShellScript "antigravity-wrapper" ''
|
||||
for candidate in google-chrome-stable google-chrome chromium-browser chromium; do
|
||||
if target=$(command -v "$candidate"); then
|
||||
${coreutils}/bin/ln -sf "$target" /opt/google/chrome/chrome
|
||||
break
|
||||
fi
|
||||
done
|
||||
exec ${args.runScript} "$@"
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
mainProgram = "antigravity";
|
||||
description = "Agentic development platform, evolving the IDE into the agent-first era";
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "art-standalone";
|
||||
version = "0-unstable-2025-09-03";
|
||||
version = "0-unstable-2025-10-09";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "android_translation_layer";
|
||||
repo = "art_standalone";
|
||||
rev = "10d60509c9073791f9eca1d2b8443d40a40edc05";
|
||||
hash = "sha256-Xg6s58jymma1sNb6P7pwWFpYq1O6GoynrgPeLZRD+rI=";
|
||||
rev = "e78bf68917bcaaf58fef3960cd88793b3b7f39cc";
|
||||
hash = "sha256-0r6Ap41AMSHhZpMJ5QoWiGGcHPj35et4kiA20xs9uLs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -28,18 +28,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bcachefs-tools";
|
||||
version = "1.35.1";
|
||||
version = "1.35.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koverstreet";
|
||||
repo = "bcachefs-tools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1p2zbzQLza8w+hu+5OjPr+Lh6q6Kh9HdVxFkuCl2x8o=";
|
||||
hash = "sha256-YreeoI9ct3Gt0za3bW4cFP8mA3mrgpVnHVUzfX1m5CI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-OlXkshfEXtY6fDBqhEJQhWhPjwQ5ofDIZ9IuchchKxk=";
|
||||
hash = "sha256-1TxACD4xXZ3BfVdoQUCzWe5Ovv0tKw6ALBw0+tRLOaQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bionic-translation";
|
||||
version = "0-unstable-2025-07-07";
|
||||
version = "0-unstable-2025-11-25";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "android_translation_layer";
|
||||
repo = "bionic_translation";
|
||||
rev = "18c65637bf02dba86415dd009036b72f62cbb37d";
|
||||
hash = "sha256-cqmWT9mbYJRLaX1Ey0lDfRFYM7JXuwayDN4o2WJIAVc=";
|
||||
rev = "5c31d4366fbb0af70690e72e5a861e7b44ffb1ef";
|
||||
hash = "sha256-dlHjx6+yymvIjDEs2TZexZUIUz32iKD0r+H4AJ89xig=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,31 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "brotab";
|
||||
version = "1.4.2";
|
||||
version = "1.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "balta2ar";
|
||||
repo = "brotab";
|
||||
tag = version;
|
||||
hash = "sha256-HKKjiW++FwjdorqquSCIdi1InE6KbMbFKZFYHBxzg8Q=";
|
||||
hash = "sha256-Pv5tEDL11brc/n3TuFcad9kTr7Jb/Bt7JFb29HuX/28=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/balta2ar/brotab/pull/102
|
||||
(fetchpatch {
|
||||
name = "remove-unnecessary-pip-import.patch";
|
||||
url = "https://github.com/balta2ar/brotab/commit/825cd48f255c911aabbfb495f6b8fc73f27d3fe5.patch";
|
||||
hash = "sha256-IN28AOLPKPUc3KkxIGFMpZNNXA1+O12NxS+Hl4KMXbg=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
@@ -34,14 +24,28 @@ python3Packages.buildPythonApplication rec {
|
||||
flask
|
||||
psutil
|
||||
requests
|
||||
werkzeug
|
||||
setuptools
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements/base.txt \
|
||||
--replace-fail "Flask==2.0.2" "Flask>=2.0.2" \
|
||||
--replace-fail "psutil==5.8.0" "psutil>=5.8.0" \
|
||||
--replace-fail "requests==2.24.0" "requests>=2.24.0"
|
||||
pythonRelaxDeps = [
|
||||
"flask"
|
||||
"psutil"
|
||||
"requests"
|
||||
"werkzeug"
|
||||
"setuptools"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/config/*json \
|
||||
--replace-fail '$PWD/brotab_mediator.py' $out/bin/bt_mediator
|
||||
mkdir -p $out/lib/mozilla/native-messaging-hosts
|
||||
mv $out/config/firefox_mediator.json $out/lib/mozilla/native-messaging-hosts
|
||||
mkdir -p $out/etc/chromium/native-messaging-hosts
|
||||
mv $out/config/chromium_mediator.json $out/etc/chromium/native-messaging-hosts
|
||||
mkdir -p $out/lib/albert
|
||||
mv $out/config/Brotab.qss $out/lib/albert
|
||||
rmdir $out/config
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
copyPkgconfigItems,
|
||||
makePkgconfigItem,
|
||||
version ? "2.2.0",
|
||||
version ? "3.0.0",
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
|
||||
rev = "rel-${version}";
|
||||
hash =
|
||||
{
|
||||
"2.2.0" = "sha256-6O0lz0YJzk1eJblQ0/f9PnSYqD8WoendIZioQiGUpCg=";
|
||||
"3.0.0" = "sha256-pymbSC6bwQQ0YCtJd3xWZiC22UEkFiKSLObSOnoQj9I=";
|
||||
"2.2.1" = "sha256-dYRaw9DI63Nqz0IJkfQYU4y00KSfq1Xv0xZuL1G15CY=";
|
||||
"2.1.3" = "sha256-W3kO+6nVzkmJXyHJU+NZWP0oatK3gon4EWF1/03rgL4=";
|
||||
"2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc=";
|
||||
}
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
cadical,
|
||||
version ? "2.2.1",
|
||||
}:
|
||||
|
||||
cadical.override { inherit version; }
|
||||
@@ -0,0 +1,54 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cagent";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "cagent";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-J7IRlSsjXRDvbUKwnV2rrWnEmvqciJw3mN8NerQBtl4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-q7mP9JWJEdDbUO/3MHsJwiySNvN2SbhnhEbJArnCW3M=";
|
||||
|
||||
# Disable tests: Networked model providers and writable cache directories are required.
|
||||
doCheck = false;
|
||||
|
||||
# Skip install checks on macOS: The build sandbox is missing the `/etc/protocols` file, which is required for validation.
|
||||
doInstallCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "version";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X"
|
||||
"github.com/docker/cagent/pkg/version.Version=${finalAttrs.version}"
|
||||
"-X"
|
||||
"github.com/docker/cagent/pkg/version.Commit=${finalAttrs.src.tag}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Agent Builder and Runtime by Docker Engineering";
|
||||
longDescription = ''
|
||||
A powerful, easy-to-use, customizable multi-agent runtime that
|
||||
orchestrates AI agents with specialized capabilities and tools,
|
||||
and the interactions between agents.
|
||||
'';
|
||||
homepage = "https://github.com/docker/cagent";
|
||||
changelog = "https://github.com/docker/cagent/releases/tag/v${finalAttrs.version}";
|
||||
downloadPage = "https://github.com/docker/cagent/releases";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "cagent";
|
||||
maintainers = with lib.maintainers; [ MH0386 ];
|
||||
};
|
||||
})
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tally";
|
||||
version = "1.0.71";
|
||||
version = "1.0.72";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-jJj4aXhGMU5L7Yya65wi022M6lE/nHiyjozptSJcMGg=";
|
||||
hash = "sha256-YkjRCP6VAp2Az0iM5HIG984ScJ3b3iKm34j4YuIs0kQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GC4rYaNwTLfbSAojnhZb0vi6FmNiXL6YJ5TEVtQom6M=";
|
||||
cargoHash = "sha256-SAO1VqlYzySIiBV3j6PCo7gknekmULpG/Two/8R0pv4=";
|
||||
|
||||
meta = {
|
||||
description = "Graph the number of crates that depend on your crate over time";
|
||||
|
||||
@@ -2,23 +2,26 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "catppuccinifier-cli";
|
||||
version = "9.0.0";
|
||||
version = "9.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lighttigerXIV";
|
||||
repo = "catppuccinifier";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-YlHb8gueKyXB2JJeRJmo8oFLOeYcmthup4n4BkEHNTA=";
|
||||
hash = "sha256-e8sLYp+0YhC/vAn4vag9UUaw3VYDRERGnLD1RuW1TXE=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src/catppuccinifier-cli";
|
||||
|
||||
cargoHash = "sha256-mIzRK4rqD8ON8LqkG3QhOseZLM5+Rr1Rhj1uuu+KRMI=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Apply catppuccin flavors to your wallpapers";
|
||||
homepage = "https://github.com/lighttigerXIV/catppuccinifier";
|
||||
|
||||
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ ];
|
||||
# The last successful Darwin Hydra build was in 2023
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
# On linux fails to build on gcc-15, needs porting to c23, but
|
||||
# the upstream code did not update since 2006.
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cdncheck";
|
||||
version = "1.2.19";
|
||||
version = "1.2.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "cdncheck";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gb+M/y1MADwCR9gz1+mSXbvE3sSV8FKTDSz+Y9U2gfU=";
|
||||
hash = "sha256-M+WlXFTw6DMV197aJh7UUIDsRiGeobXR5biEjRtASKE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Tc8qrML7u5qE0zVe7JCL1BM0KbhJSwnjhnd2gX5YUaA=";
|
||||
vendorHash = "sha256-sVCmEMT6Y/9EPCbiUlstAw8FS4y+afeYeWNhT8aBXSE=";
|
||||
|
||||
subPackages = [ "cmd/cdncheck/" ];
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
callPackage,
|
||||
vscode-generic,
|
||||
buildVscode,
|
||||
fetchurl,
|
||||
appimageTools,
|
||||
undmg,
|
||||
@@ -24,7 +23,7 @@ let
|
||||
|
||||
source = sources.${hostPlatform.system};
|
||||
in
|
||||
(callPackage vscode-generic rec {
|
||||
buildVscode rec {
|
||||
inherit useVSCodeRipgrep;
|
||||
inherit (sourcesJson) version vscodeVersion;
|
||||
commandLineArgs = finalCommandLineArgs;
|
||||
@@ -46,6 +45,9 @@ in
|
||||
else
|
||||
source;
|
||||
|
||||
# for unpacking the DMG
|
||||
extraNativeBuildInputs = lib.optionals hostPlatform.isDarwin [ undmg ];
|
||||
|
||||
sourceRoot =
|
||||
if hostPlatform.isLinux then "${pname}-${version}-extracted/usr/share/cursor" else "Cursor.app";
|
||||
|
||||
@@ -66,7 +68,7 @@ in
|
||||
homepage = "https://cursor.com";
|
||||
changelog = "https://cursor.com/changelog";
|
||||
license = lib.licenses.unfree;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [
|
||||
aspauldingcode
|
||||
prince213
|
||||
@@ -79,12 +81,4 @@ in
|
||||
++ lib.platforms.darwin;
|
||||
mainProgram = "cursor";
|
||||
};
|
||||
}).overrideAttrs
|
||||
(oldAttrs: {
|
||||
nativeBuildInputs =
|
||||
(oldAttrs.nativeBuildInputs or [ ]) ++ lib.optionals hostPlatform.isDarwin [ undmg ];
|
||||
|
||||
passthru = (oldAttrs.passthru or { }) // {
|
||||
inherit sources;
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codebook";
|
||||
version = "0.3.28";
|
||||
version = "0.3.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blopker";
|
||||
repo = "codebook";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iYQy0uupRoNkBwlvykicGcRIpZftrpDOQaKzFoG+JgI=";
|
||||
hash = "sha256-jGI0a2rb0ljDorqq+g9PbFO4UfCUrtgX47tVNq3AHhs=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "crates/codebook-lsp";
|
||||
cargoHash = "sha256-jW2HQxoTZ+1x2j+fVHm1K1TU9TB9wGuEm7D9Fn2Xnac=";
|
||||
cargoHash = "sha256-2ZPB5sGFhewiJX70IMVygbyPUV1AYe6pcjmTIK0gvhc=";
|
||||
|
||||
CARGO_PROFILE_RELEASE_LTO = "fat";
|
||||
CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "curv";
|
||||
version = "0.5-unstable-2026-01-17";
|
||||
version = "0.5-unstable-2026-01-23";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "doug-moen";
|
||||
repo = "curv";
|
||||
rev = "1c2eb68e47e3c61a98e39cd3c50f90691c5a268d";
|
||||
hash = "sha256-PuRBnJswrg+PjtU6ize+PjoBpQSSEzO2CeCx9mQF+3w=";
|
||||
rev = "17d03b534c69976ed60936beb8b7cc38e8c12c13";
|
||||
hash = "sha256-qQLcRCha01b6ClUSPO2jMBDJsN28EhqzakTLu1medAQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -97,7 +97,8 @@ stdenv.mkDerivation {
|
||||
homepage = "https://codeberg.org/doug-moen/curv";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.all;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
# aarch64 fails installCheckPhase: https://hydra.nixos.org/build/319705783
|
||||
broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
|
||||
maintainers = with lib.maintainers; [ pbsds ];
|
||||
mainProgram = "curv";
|
||||
};
|
||||
|
||||
@@ -30,14 +30,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "debian-devscripts";
|
||||
version = "2.26.4";
|
||||
version = "2.26.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "debian";
|
||||
repo = "devscripts";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QGveq9PZfy/m+ah4gBvZDMkVWS50oj1f4SJsKcCKGug=";
|
||||
hash = "sha256-Fwl7UGIe0DcqKRWC/rm1Sa1DfxX4I35yJVSmfxERK6k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
autoreconfHook,
|
||||
fetchFromGitHub,
|
||||
fltk,
|
||||
fltk_1_3,
|
||||
libjpeg,
|
||||
libpng,
|
||||
libwebp,
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
fltk
|
||||
fltk_1_3
|
||||
which
|
||||
];
|
||||
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libpng
|
||||
libwebp
|
||||
ssl
|
||||
fltk
|
||||
fltk_1_3
|
||||
];
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
nativefiledialog-extended,
|
||||
nlohmann_json,
|
||||
opencolorio,
|
||||
openexr,
|
||||
openexr_2,
|
||||
openssl,
|
||||
opentimelineio,
|
||||
plutovg,
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativefiledialog-extended
|
||||
nlohmann_json
|
||||
opencolorio
|
||||
openexr
|
||||
openexr_2
|
||||
openssl
|
||||
opentimelineio
|
||||
plutovg
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
wlroots,
|
||||
wlroots_0_18,
|
||||
writeText,
|
||||
xcbutilwm,
|
||||
xwayland,
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pixman
|
||||
wayland
|
||||
wayland-protocols
|
||||
wlroots
|
||||
wlroots_0_18
|
||||
]
|
||||
++ lib.optionals enableXWayland [
|
||||
libX11
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
ocamlPackages,
|
||||
ocaml-ng,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (ocamlPackages) buildDunePackage js_of_ocaml menhir;
|
||||
inherit (ocaml-ng.ocamlPackages_5_2) buildDunePackage js_of_ocaml menhir;
|
||||
in
|
||||
|
||||
buildDunePackage rec {
|
||||
|
||||
@@ -128,7 +128,7 @@ let
|
||||
src = fetchHex {
|
||||
pkg = "p1_pgsql";
|
||||
version = "1.1.38";
|
||||
sha256 = "";
|
||||
sha256 = "sha256-Bs9kQwCBeOujh7ou6STTYgBBuuTaGyyWloAoSgXMdZ4=";
|
||||
};
|
||||
beamDeps = [ xmpp ];
|
||||
};
|
||||
@@ -148,7 +148,7 @@ let
|
||||
src = fetchHex {
|
||||
pkg = "p1_mysql";
|
||||
version = "1.0.27";
|
||||
sha256 = "";
|
||||
sha256 = "sha256-BmBR8kACenZzJUfmnZagl05w3BTe2UU77yYyIYQe2ps=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
@@ -262,6 +262,17 @@ let
|
||||
stun
|
||||
];
|
||||
};
|
||||
erlydtl = builder {
|
||||
name = "erlydtl";
|
||||
version = "git";
|
||||
src = fetchFromGitHub {
|
||||
owner = "erlydtl";
|
||||
repo = "erlydtl";
|
||||
rev = "aae414692b6052e96d890e03bbeeeca0f4dc01c2";
|
||||
sha256 = "00p194jgmvzqza7xr7fdm2n091ymkyy66aj4gc82n0kzdlh03vbm";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
eredis = builder {
|
||||
name = "eredis";
|
||||
version = "1.7.1";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts "rebar3WithPlugins {globalPlugins = [beamPackages.rebar3-nix];}" erlang autoconf automake
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts "rebar3WithPlugins {globalPlugins = [beamPackages.rebar3-nix];}" erlang autoconf automake nixfmt
|
||||
#shellcheck shell=bash
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
@@ -174,7 +174,7 @@ stdenv.mkDerivation (
|
||||
changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
teams = [ lib.teams.matrix ];
|
||||
platforms = electron.meta.platforms ++ lib.platforms.darwin;
|
||||
inherit (electron.meta) platforms;
|
||||
mainProgram = "element-desktop";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,166 @@
|
||||
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
|
||||
index f4bc16e..cae6562 100644
|
||||
--- a/src-tauri/Cargo.lock
|
||||
+++ b/src-tauri/Cargo.lock
|
||||
@@ -545,6 +545,17 @@ dependencies = [
|
||||
"brotli-decompressor",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "brotli"
|
||||
+version = "7.0.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
|
||||
+dependencies = [
|
||||
+ "alloc-no-stdlib",
|
||||
+ "alloc-stdlib",
|
||||
+ "brotli-decompressor",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "brotli-decompressor"
|
||||
version = "4.0.1"
|
||||
@@ -690,16 +701,16 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cargo_metadata"
|
||||
-version = "0.18.1"
|
||||
+version = "0.19.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
|
||||
+checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
|
||||
dependencies = [
|
||||
"camino",
|
||||
"cargo-platform",
|
||||
"semver",
|
||||
"serde",
|
||||
"serde_json",
|
||||
- "thiserror 1.0.63",
|
||||
+ "thiserror 2.0.17",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2661,7 +2672,19 @@ version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc"
|
||||
dependencies = [
|
||||
- "jsonptr",
|
||||
+ "jsonptr 0.4.7",
|
||||
+ "serde",
|
||||
+ "serde_json",
|
||||
+ "thiserror 1.0.63",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "json-patch"
|
||||
+version = "3.0.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08"
|
||||
+dependencies = [
|
||||
+ "jsonptr 0.6.3",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"thiserror 1.0.63",
|
||||
@@ -2678,6 +2701,16 @@ dependencies = [
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "jsonptr"
|
||||
+version = "0.6.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70"
|
||||
+dependencies = [
|
||||
+ "serde",
|
||||
+ "serde_json",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "keyboard-types"
|
||||
version = "0.7.0"
|
||||
@@ -4614,13 +4647,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
-version = "1.0.114"
|
||||
+version = "1.0.149"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
|
||||
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
|
||||
dependencies = [
|
||||
"itoa 1.0.10",
|
||||
- "ryu",
|
||||
+ "memchr",
|
||||
"serde",
|
||||
+ "serde_core",
|
||||
+ "zmij",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -5237,7 +5272,7 @@ dependencies = [
|
||||
"dirs",
|
||||
"glob",
|
||||
"heck 0.5.0",
|
||||
- "json-patch",
|
||||
+ "json-patch 2.0.0",
|
||||
"schemars",
|
||||
"semver",
|
||||
"serde",
|
||||
@@ -5255,9 +5290,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95d7443dd4f0b597704b6a14b964ee2ed16e99928d8e6292ae9825f09fbcd30e"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
- "brotli",
|
||||
+ "brotli 6.0.0",
|
||||
"ico",
|
||||
- "json-patch",
|
||||
+ "json-patch 2.0.0",
|
||||
"plist",
|
||||
"png",
|
||||
"proc-macro2",
|
||||
@@ -5573,18 +5608,19 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tauri-utils"
|
||||
-version = "2.0.1"
|
||||
+version = "2.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c38b0230d6880cf6dd07b6d7dd7789a0869f98ac12146e0d18d1c1049215a045"
|
||||
+checksum = "96fb10e7cc97456b2d5b9c03e335b5de5da982039a303a20d10006885e4523a0"
|
||||
dependencies = [
|
||||
- "brotli",
|
||||
+ "brotli 7.0.0",
|
||||
"cargo_metadata",
|
||||
"ctor",
|
||||
"dunce",
|
||||
"glob",
|
||||
"html5ever",
|
||||
+ "http 1.1.0",
|
||||
"infer",
|
||||
- "json-patch",
|
||||
+ "json-patch 3.0.1",
|
||||
"kuchikiki",
|
||||
"log",
|
||||
"memchr",
|
||||
@@ -5599,7 +5635,7 @@ dependencies = [
|
||||
"serde_json",
|
||||
"serde_with",
|
||||
"swift-rs",
|
||||
- "thiserror 1.0.63",
|
||||
+ "thiserror 2.0.17",
|
||||
"toml 0.8.2",
|
||||
"url",
|
||||
"urlpattern",
|
||||
@@ -7031,6 +7067,12 @@ dependencies = [
|
||||
"zstd",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "zmij"
|
||||
+version = "1.0.12"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "2fc5a66a20078bf1251bde995aa2fdcc4b800c70b5d92dd2c62abc5c60f679f8"
|
||||
+
|
||||
[[package]]
|
||||
name = "zopfli"
|
||||
version = "0.8.1"
|
||||
@@ -3,54 +3,73 @@
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
|
||||
pnpm_9,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
|
||||
nodejs,
|
||||
cargo-tauri_1,
|
||||
pnpm_10,
|
||||
pnpmConfigHook,
|
||||
cargo-tauri,
|
||||
jq,
|
||||
moreutils,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
makeBinaryWrapper,
|
||||
|
||||
openssl,
|
||||
libsoup_2_4,
|
||||
# webkitgtk_4_0,
|
||||
webkitgtk_4_1,
|
||||
gst_all_1,
|
||||
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
||||
let
|
||||
pnpm = pnpm_10;
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "en-croissant";
|
||||
version = "0.11.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "franciscoBSalgueiro";
|
||||
repo = "en-croissant";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EiGML3oFCJR4TZkd+FekUrJwCYe/nGdWD9mAtKKtITQ=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ef6O8C1PPjCmF5lashpBQXWwjsEEKCl5R98QMOFDIBM=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
version
|
||||
src
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-hvWXSegUWJvwCU5NLb2vqnl+FIWpCLxw96s9NUIgJTI=";
|
||||
inherit pnpm;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-p2j886NRBw/8c2UJ94o6w7YtKnOfm7hU9SgEUrzAwco=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# Bump the tauri-utils package to at least 2.1.0, to fix resource path resolution on NixOS.
|
||||
./en-croissant-update-tauri-utils.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
jq '.plugins.updater.endpoints = [ ] | .bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
|
||||
'';
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
|
||||
cargoHash = "sha256-6cBGOdJ7jz+mOl2EEXxoLNeX9meW+ybQxAxnnHAplIc=";
|
||||
cargoHash = "sha256-cTb6nKHlazyOu3cpwAAp20j3QmrDxC507ZRpYT5fgQs=";
|
||||
|
||||
buildAndTestSubdir = cargoRoot;
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pnpmConfigHook
|
||||
pnpm_9
|
||||
nodejs
|
||||
cargo-tauri_1.hook
|
||||
pnpm
|
||||
pnpmConfigHook
|
||||
|
||||
cargo-tauri.hook
|
||||
jq
|
||||
moreutils
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]
|
||||
@@ -58,12 +77,12 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
openssl
|
||||
libsoup_2_4
|
||||
# webkitgtk_4_0
|
||||
webkitgtk_4_1
|
||||
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-bad
|
||||
];
|
||||
|
||||
doCheck = false; # many scoring tests fail
|
||||
@@ -72,14 +91,17 @@ rustPlatform.buildRustPackage rec {
|
||||
makeWrapper "$out"/Applications/en-croissant.app/Contents/MacOS/en-croissant $out/bin/en-croissant
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
# webkitgtk_4_0 was removed
|
||||
broken = true;
|
||||
description = "Ultimate Chess Toolkit";
|
||||
homepage = "https://github.com/franciscoBSalgueiro/en-croissant/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "en-croissant";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
maintainers = with lib.maintainers; [
|
||||
tomasajt
|
||||
snu
|
||||
];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
gperf,
|
||||
kmod,
|
||||
pkg-config,
|
||||
util-linux,
|
||||
util-linuxMinimal,
|
||||
testers,
|
||||
}:
|
||||
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
kmod
|
||||
util-linux
|
||||
util-linuxMinimal
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
nixosTests,
|
||||
fetchFromGitHub,
|
||||
beamPackages,
|
||||
beam27Packages,
|
||||
gitMinimal,
|
||||
pnpm_9,
|
||||
fetchPnpmDeps,
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
mixReleaseName ? "domain", # "domain" "web" or "api"
|
||||
}:
|
||||
beamPackages.mixRelease rec {
|
||||
beam27Packages.mixRelease rec {
|
||||
pname = "firezone-server-${mixReleaseName}";
|
||||
version = "0-unstable-2025-08-31";
|
||||
|
||||
@@ -69,7 +69,7 @@ beamPackages.mixRelease rec {
|
||||
|
||||
inherit mixReleaseName;
|
||||
|
||||
mixFodDeps = beamPackages.fetchMixDeps {
|
||||
mixFodDeps = beam27Packages.fetchMixDeps {
|
||||
pname = "mix-deps-${pname}-${version}";
|
||||
inherit src version;
|
||||
hash = "sha256-h3l7HK9dxNmkHWfJyCOCXmCvFOK+mZtmszhRv0zxqoo=";
|
||||
|
||||
@@ -6,7 +6,8 @@
|
||||
}:
|
||||
|
||||
buildEnv {
|
||||
name = "flare-1.14";
|
||||
pname = "flare";
|
||||
version = "1.14";
|
||||
|
||||
paths = [
|
||||
(callPackage ./engine.nix { })
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flashmq";
|
||||
version = "1.24.0";
|
||||
version = "1.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "halfgaar";
|
||||
repo = "FlashMQ";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aDIUTJVDo00qyAsNuXDptHehngwHm9AkPGgwiRRND/E=";
|
||||
hash = "sha256-+74nTluVpEfbK1pfWnJR5uv51HPkNbwzXUkHb5NeWn8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,25 +6,25 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "newt";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "newt";
|
||||
tag = version;
|
||||
hash = "sha256-ndgigIk/3/cPZaJHfxWh6XvtAJe3S57sEwNTMBH0lSE=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Ya+OVSChGmiZ8JTAfl/im8fOhLCC+r6JKSlH+CnSwP8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5Xr6mwPtsqEliKeKv2rhhp6JC7u3coP4nnhIxGMqccU=";
|
||||
vendorHash = "sha256-Sib6AUCpMgxlMpTc2Esvs+UU0yduVOxWUgT44FHAI+k=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=main.newtVersion=${version}"
|
||||
"-X=main.newtVersion=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
@@ -36,7 +36,7 @@ buildGoModule rec {
|
||||
meta = {
|
||||
description = "Tunneling client for Pangolin";
|
||||
homepage = "https://github.com/fosrl/newt";
|
||||
changelog = "https://github.com/fosrl/newt/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/fosrl/newt/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
fab
|
||||
@@ -45,4 +45,4 @@ buildGoModule rec {
|
||||
];
|
||||
mainProgram = "newt";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -29,7 +29,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freefilesync";
|
||||
version = "14.6";
|
||||
version = "14.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rm -f "$out"
|
||||
tryDownload "$url" "$out"
|
||||
'';
|
||||
hash = "sha256-OST2QIhPhKl9Qh4nHIno5XAJmLPNki0bU5A1ZXcUVTw=";
|
||||
hash = "sha256-WMSaKA3OA63V6Vis83vXa+y0ZRE0YxgXiB8YAyTSTc8=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -2,29 +2,29 @@ diff --git a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/g
|
||||
index a40eea3..23ec896 100644
|
||||
--- a/FreeFileSync/Source/ui/gui_generated.cpp
|
||||
+++ b/FreeFileSync/Source/ui/gui_generated.cpp
|
||||
@@ -5573,8 +5573,6 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
|
||||
wxBoxSizer* bSizer183;
|
||||
bSizer183 = new wxBoxSizer( wxHORIZONTAL );
|
||||
@@ -5553,8 +5553,6 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
|
||||
wxBoxSizer* bSizer183;
|
||||
bSizer183 = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
- m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
- bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
- m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
- bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
|
||||
wxPanel* m_panel39;
|
||||
m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||
@@ -5587,13 +5585,11 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
|
||||
m_staticTextDonate->Wrap( -1 );
|
||||
m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
|
||||
wxPanel* m_panel39;
|
||||
m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||
@@ -5567,13 +5565,11 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
|
||||
m_staticTextDonate->Wrap( -1 );
|
||||
m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
|
||||
|
||||
- bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
|
||||
- bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
|
||||
|
||||
|
||||
m_panel39->SetSizer( bSizer184 );
|
||||
m_panel39->Layout();
|
||||
bSizer184->Fit( m_panel39 );
|
||||
- bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
|
||||
m_panel39->SetSizer( bSizer184 );
|
||||
m_panel39->Layout();
|
||||
bSizer184->Fit( m_panel39 );
|
||||
- bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
|
||||
|
||||
|
||||
m_panelDonate->SetSizer( bSizer183 );
|
||||
m_panelDonate->SetSizer( bSizer183 );
|
||||
diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
|
||||
index 933fe81..734201f 100644
|
||||
--- a/FreeFileSync/Source/ui/small_dlgs.cpp
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
argp-standalone,
|
||||
libgcrypt,
|
||||
readline,
|
||||
libgpg-error,
|
||||
@@ -17,12 +18,22 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-W872u562gOSbSjYjV5kwrOeJn1OSWyBF/p+RrWkEER0=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.cc.isClang ''
|
||||
substituteInPlace man/Makefile.in \
|
||||
--replace-fail \
|
||||
'$(CPP_FOR_BUILD) -nostdinc -w -C -P -I. -I$(top_srcdir)/man $@.pre $@' \
|
||||
'$(CPP_FOR_BUILD) -nostdinc -w -C -P -I. -I$(top_srcdir)/man -o $@ $@.pre'
|
||||
'';
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
buildInputs = [
|
||||
libgcrypt
|
||||
readline
|
||||
libgpg-error
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
argp-standalone
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
@@ -63,6 +74,6 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
||||
maintainers = with lib.maintainers; [ raskin ];
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fzf-make";
|
||||
version = "0.65.0";
|
||||
version = "0.67.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyu08";
|
||||
repo = "fzf-make";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-KL2dRyfwwa365hEMeVixAP9DFx3QObJVeesj95tOUmo=";
|
||||
hash = "sha256-ciUixT+ELBL90rPe1wUyp41ZL2a6YhEDY+n66cOB1xk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QaR0Se8ecNKj7OcngwEOrK63VT200D+/Xm3RaIiLdec=";
|
||||
cargoHash = "sha256-pVkoxMYcPUjzpN3nbyECtLS8wXo78P1ybOdl3P05Zkc=";
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
guile,
|
||||
guile_2_2,
|
||||
guile-lib,
|
||||
libffi,
|
||||
pkg-config,
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
# Note: Glib support is optional, but it's quite useful (e.g., it's used by
|
||||
# Guile-GNOME).
|
||||
buildInputs = [
|
||||
guile
|
||||
guile_2_2
|
||||
glib
|
||||
guile-lib
|
||||
];
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
glslang,
|
||||
hwdata,
|
||||
stb,
|
||||
wlroots,
|
||||
wlroots_0_17,
|
||||
libdecor,
|
||||
lcms,
|
||||
lib,
|
||||
@@ -37,7 +37,7 @@
|
||||
makeBinaryWrapper,
|
||||
nix-update-script,
|
||||
enableExecutable ? true,
|
||||
enableWsi ? true,
|
||||
enableWsi ? false,
|
||||
}:
|
||||
let
|
||||
frogShaders = fetchFromGitHub {
|
||||
@@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
vulkan-headers
|
||||
]
|
||||
++ lib.optionals enableExecutable (
|
||||
wlroots.buildInputs
|
||||
wlroots_0_17.buildInputs
|
||||
++ [
|
||||
# gamescope uses a custom wlroots branch
|
||||
xorg.libXcomposite
|
||||
|
||||
@@ -3,17 +3,11 @@
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
libxkbcommon,
|
||||
openssl,
|
||||
rust-jemalloc-sys-unprefixed,
|
||||
sqlite,
|
||||
vulkan-loader,
|
||||
wayland,
|
||||
iproute2,
|
||||
iptables,
|
||||
libglvnd,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
@@ -24,29 +18,23 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "geph5";
|
||||
version = "0.2.86";
|
||||
version = "0.2.93";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geph-official";
|
||||
repo = "geph5";
|
||||
rev = "geph5-client-v${finalAttrs.version}";
|
||||
hash = "sha256-68b6czefoqLskdqhc9kDIoS8eDCKu56lqvX8Jz47C3k=";
|
||||
hash = "sha256-ZYcGW6Ssauf5BUs75KBV+4Zub2ZCVN29cWTxeNi87cI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CoYnP83Ci5Jp3Hunm2+xdXBu0mlhADf4jyfLSIXZ0jI=";
|
||||
cargoHash = "sha256-0Ml8tgWghxhDJzUMMD+YGwy3fyFjKcNjbV8MDJW8rZk=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace binaries/geph5-client/src/vpn/*.sh \
|
||||
--replace-fail 'PATH=' 'PATH=${binPath}:'
|
||||
|
||||
# This setting is dumped from https://github.com/geph-official/gephgui-wry/blob/a85a632448e548f69f9d1eea3d06a4bdc8be3d57/src/daemon.rs#L230
|
||||
cat ${./settings_default.yaml} | base32 -w 0 | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567' '0123456789ABCDEFGHJKMNPQRSTVWXYZ' | sed 's/=//g' > binaries/geph5-client-gui/src/settings_default.yaml.base32
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
copyDesktopItems
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
@@ -69,39 +57,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"--skip=traffcount::tests::test_traffic_count_basic"
|
||||
# Requires network
|
||||
"--skip=dns::tests::resolve_google"
|
||||
"--skip=tests::test_clib"
|
||||
# Never finish
|
||||
"--skip=tests::test_blind_sign"
|
||||
"--skip=tests::test_generate_secret_key"
|
||||
"--skip=tests::ping_pong"
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "Geph5";
|
||||
desktopName = "Geph5";
|
||||
icon = "geph5";
|
||||
exec = "geph5-client-gui";
|
||||
categories = [ "Network" ];
|
||||
comment = "Modular Internet censorship circumvention system designed specifically to deal with national filtering";
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -m 444 -D binaries/geph5-client-gui/icon.png $out/share/icons/hicolor/512x512/apps/geph5.png
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Add required but not explicitly requested libraries
|
||||
patchelf --add-rpath '${
|
||||
lib.makeLibraryPath [
|
||||
wayland
|
||||
libxkbcommon
|
||||
vulkan-loader
|
||||
libglvnd
|
||||
]
|
||||
}' "$out/bin/geph5-client-gui"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
exit_constraint: auto
|
||||
|
||||
broker:
|
||||
race:
|
||||
- fronted:
|
||||
front: https://www.cdn77.com/
|
||||
host: 1826209743.rsc.cdn77.org
|
||||
- fronted:
|
||||
front: https://www.vuejs.org/
|
||||
host: svitania-naidallszei-2.netlify.app
|
||||
override_dns:
|
||||
- 75.2.60.5:443
|
||||
- fronted:
|
||||
front: https://www.vuejs.org/
|
||||
host: svitania-naidallszei-3.netlify.app
|
||||
override_dns:
|
||||
- 75.2.60.5:443
|
||||
- aws_lambda:
|
||||
function_name: geph-lambda-bouncer
|
||||
region: us-east-1
|
||||
obfs_key: 855MJGAMB58MCPJBB97NADJ36D64WM2T:C4TN2M1H68VNMRVCCH57GDV2C5VN6V3RB8QMWP235D0P4RT2ACV7GVTRCHX3EC37
|
||||
|
||||
spoof_dns: true
|
||||
@@ -0,0 +1,144 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
webkitgtk_4_1,
|
||||
pkg-config,
|
||||
buildNpmPackage,
|
||||
makeDesktopItem,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
perl,
|
||||
stdenv,
|
||||
glib,
|
||||
copyDesktopItems,
|
||||
wrapGAppsHook4,
|
||||
nodejs_22,
|
||||
}:
|
||||
let
|
||||
pac-cmd = stdenv.mkDerivation {
|
||||
pname = "pac-cmd";
|
||||
version = "0-unstable-2020-01-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getlantern";
|
||||
repo = "pac-cmd";
|
||||
rev = "495bad48b8601385daa8205ec4db504166dff18b";
|
||||
hash = "sha256-T4g0FR20sOxJ20H4LTmhrA2EsRe8JYXj6MB2ImkbPsY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rm binaries/*/pac
|
||||
substituteInPlace Makefile --replace-fail 'uname -p' 'uname -m'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ glib ];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 -t $out/bin binaries/*/pac
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Change proxy auto-config settings of operation system";
|
||||
homepage = "https://github.com/getlantern/pac-cmd";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "pac";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gephgui-wry";
|
||||
version = "5.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geph-official";
|
||||
repo = "gephgui-pkg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nlWFiEFraI4sUBTs/ZxiHpaeYHert78oPiyFc6LKV30=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
gephgui = buildNpmPackage {
|
||||
pname = "gephgui";
|
||||
inherit (finalAttrs) version src;
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/gephgui-wry/gephgui";
|
||||
npmDepsHash = "sha256-dGzmdvzKp/JHCgDf3NJb0oolgW4Y/spagzpeVpMF28w=";
|
||||
|
||||
# npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535
|
||||
nodejs = nodejs_22;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -aR dist/* $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/gephgui-wry";
|
||||
cargoHash = "sha256-7EJvcnltKlq94jahnMpvzdFJ8P12HjUGC6AOXirpcg4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
perl
|
||||
copyDesktopItems
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [ webkitgtk_4_1 ];
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${finalAttrs.gephgui}/ gephgui/dist/
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -m 444 -D gephgui/public/gephlogo.png $out/share/icons/hicolor/512x512/apps/geph.png
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--suffix PATH : ${lib.makeBinPath [ pac-cmd ]}
|
||||
)
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "Geph";
|
||||
desktopName = "Geph";
|
||||
icon = "geph";
|
||||
exec = "gephgui-wry";
|
||||
categories = [ "Network" ];
|
||||
comment = "Modular Internet censorship circumvention system designed specifically to deal with national filtering";
|
||||
startupWMClass = "geph";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit pac-cmd;
|
||||
inherit (finalAttrs) gephgui;
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--subpackage=gephgui"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Modular Internet censorship circumvention system designed specifically to deal with national filtering";
|
||||
homepage = "https://github.com/geph-official/gephgui-wry";
|
||||
mainProgram = "gephgui-wry";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
penalty1083
|
||||
MCSeekeri
|
||||
];
|
||||
};
|
||||
})
|
||||
+21
-4
@@ -2,6 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
replaceVars,
|
||||
buildPackages,
|
||||
fetchurl,
|
||||
meson,
|
||||
ninja,
|
||||
@@ -36,15 +37,17 @@
|
||||
tzdata,
|
||||
gcr_4,
|
||||
gnome-session-ctl,
|
||||
udevCheckHook,
|
||||
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-settings-daemon";
|
||||
version = "46.0";
|
||||
version = "48.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c=";
|
||||
hash = "sha256-OGCi6iFNy8tmAK56HjNYpTiSFQh7w+SkfO4/h7ruBi4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -56,17 +59,24 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
buildPackages.stdenv.cc
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
perl
|
||||
gettext
|
||||
glib
|
||||
libxml2
|
||||
libxslt
|
||||
docbook_xsl
|
||||
wrapGAppsHook3
|
||||
python3
|
||||
udevCheckHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -87,14 +97,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
polkit
|
||||
geocode-glib_2
|
||||
geoclue2
|
||||
systemd
|
||||
libgudev
|
||||
libwacom
|
||||
gcr_4
|
||||
]
|
||||
++ lib.optionals withSystemd [
|
||||
systemd
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dudev_dir=${placeholder "out"}/lib/udev"
|
||||
(lib.mesonBool "systemd" withSystemd)
|
||||
]
|
||||
++ lib.optionals withSystemd [
|
||||
"-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl"
|
||||
];
|
||||
|
||||
@@ -103,12 +118,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS";
|
||||
|
||||
postPatch = ''
|
||||
for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do
|
||||
for f in plugins/power/gsd-power-constants-update.pl; do
|
||||
chmod +x $f
|
||||
patchShebangs $f
|
||||
done
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "GNOME Settings Daemon";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/";
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goda";
|
||||
version = "0.7.1";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "loov";
|
||||
repo = "goda";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-byRficALfYADK2lXskAvYeLxwrzOQXACTLlDRrMoHrw=";
|
||||
hash = "sha256-Cwt2tIP8S+76meuUT/GDUcMGKhJKBg3qGFwen2sEG8I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AkO3Ag2FiAC46ZXmG3mVhhWpcaw/Z3oik2cyGmoJFpc=";
|
||||
vendorHash = "sha256-ZDiDAabLUGa/NFs2EQpwWAd8ypxUZ32I8AOeYCm/ntA=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -20,15 +20,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gonic";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sentriz";
|
||||
repo = "gonic";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-la3xBECo4zZfkp5BlXuUzFEUGtxMl8ZAQdwgjFXIuSM=";
|
||||
sha256 = "sha256-llNKCxVrsDmi5a33NoAPEyJu+728gFQcAItPk2IBdwo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HrYS7c0MtiOYRyiSg7eLbiSIUkHeRikJ0Rwf4EoZIsQ=";
|
||||
vendorHash = "sha256-uVZ0Q1nrE7DLurW4fldsr3yyz80J6ONiPjLXHXHDGlg=";
|
||||
|
||||
# TODO(Profpatsch): write a test for transcoding support,
|
||||
# since it is prone to break
|
||||
|
||||
@@ -96,6 +96,9 @@
|
||||
|
||||
# For QT support
|
||||
qt6,
|
||||
|
||||
# Create a symlink at $out/bin/google-chrome
|
||||
withSymlink ? true,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -268,6 +271,10 @@ let
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString withSymlink ''
|
||||
ln -s $out/bin/google-chrome-stable $out/bin/google-chrome
|
||||
'';
|
||||
});
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
@@ -305,6 +312,10 @@ let
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString withSymlink ''
|
||||
ln -s $out/bin/google-chrome-stable $out/bin/google-chrome
|
||||
'';
|
||||
});
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
@@ -315,7 +326,6 @@ let
|
||||
homepage = "https://www.google.com/chrome/browser/";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [
|
||||
johnrtitor
|
||||
mdaniels5757
|
||||
];
|
||||
platforms = lib.platforms.darwin ++ [ "x86_64-linux" ];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "gradle-completion";
|
||||
version = "1.6.0";
|
||||
version = "9.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gradle";
|
||||
repo = "gradle-completion";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HY/woUOzkRVb6ekIaQrY1+5pKxd5+cpG74+xqzpkazs=";
|
||||
hash = "sha256-kmjlEO0MI7+OwZqgwkv5z8iX1iAZDiIpqevoeb1sDUU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,19 +6,19 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "grafana-image-renderer";
|
||||
version = "5.2.3";
|
||||
version = "5.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "grafana-image-renderer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YoJ50PhpxXQLpZpq+fLiN2uYU1C6w8C2UVun/klee4E=";
|
||||
hash = "sha256-rCFdjM5ZBHcfl4/WXM4CPdLlIprJr3HATboBF89sMFA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kGLvstSkucM0tN5l+Vp78IP9EwDx62kukAiOwYD4Vfs=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace go.mod --replace-fail 'go 1.25.5' 'go 1.25.4'
|
||||
substituteInPlace go.mod --replace-fail 'go 1.25.6' 'go 1.25.5'
|
||||
'';
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
guile,
|
||||
guile_2_2,
|
||||
pkg-config,
|
||||
texinfo,
|
||||
}:
|
||||
@@ -24,13 +24,13 @@ stdenv.mkDerivation {
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
guile
|
||||
guile_2_2
|
||||
texinfo
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-guile-site-dir=$(out)/${guile.siteDir}"
|
||||
"--with-guile-site-ccache-dir=$(out)/${guile.siteCcacheDir}"
|
||||
"--with-guile-site-dir=$(out)/${guile_2_2.siteDir}"
|
||||
"--with-guile-site-ccache-dir=$(out)/${guile_2_2.siteCcacheDir}"
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
@@ -42,6 +42,6 @@ stdenv.mkDerivation {
|
||||
description = "XCB bindings for Guile";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
platforms = guile.meta.platforms;
|
||||
platforms = guile_2_2.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,14 +16,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gurobi";
|
||||
version = "13.0.0";
|
||||
version = "13.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_${platform}.tar.gz";
|
||||
hash =
|
||||
{
|
||||
aarch64-linux = "sha256-0wFhMzLK1QViDc0ZLM/oVemtRW0g+FRJRFFOL/eiOFE=";
|
||||
x86_64-linux = "sha256-mEVUVXCeizSzQDLtkNS/EkaxT0MToxL3x3UGb/XB9lI=";
|
||||
aarch64-linux = "sha256-MQDqu95e+fJ00FGtYVw2FlkZ6uhl5eTFefpsA0ti+jI=";
|
||||
x86_64-linux = "sha256-7GIyF6xfoGV3madS7XwCshQfu5wP80Ep1uH4yaj+Ttg=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
lib,
|
||||
appimageTools,
|
||||
fetchurl,
|
||||
version ? "0.9.14.0",
|
||||
hash ? "sha256-ABAGXTszJPdmVuRuJddZ2VgMhiABtAYFuxAteP8S44w=",
|
||||
version ? "0.9.15.1",
|
||||
hash ? "sha256-MvzvTa+05oTBVHgoKyGwsC/Ab02RABL2rcUguNICr2o=",
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "hns";
|
||||
version = "1.0.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "primaprashant";
|
||||
repo = "hns";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-VO9EX8aIudijAyzTH9cXIa1magN+wkIE0lsP+DGl8hw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
python3.pkgs.hatchling
|
||||
];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
click
|
||||
faster-whisper
|
||||
numpy
|
||||
pyperclip
|
||||
requests
|
||||
rich
|
||||
sounddevice
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"hns"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Speech-to-text CLI to transcribe voice from microphone directly to clipboard";
|
||||
homepage = "https://hns-cli.dev";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ afh ];
|
||||
};
|
||||
})
|
||||
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
nydragon
|
||||
bridgesense
|
||||
saadndm
|
||||
];
|
||||
mainProgram = "impala";
|
||||
};
|
||||
|
||||
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
|
||||
libXtst
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
|
||||
makeFlags = [
|
||||
"sysconfdir=/etc"
|
||||
"ETCDIR=/etc"
|
||||
|
||||
@@ -13,13 +13,18 @@ stdenvNoCC.mkDerivation rec {
|
||||
hash = "sha256-xoGMEcGMwDDVX/g/ZLK62P7vSF53QvhPlKYdgRpiWL0=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"doc"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D -m644 ipw2200-bss.fw $out/lib/firmware/ipw2200-bss.fw
|
||||
install -D -m644 ipw2200-ibss.fw $out/lib/firmware/ipw2200-ibss.fw
|
||||
install -D -m644 ipw2200-sniffer.fw $out/lib/firmware/ipw2200-sniffer.fw
|
||||
install -D -m644 LICENSE.ipw2200-fw $out/share/doc/intel2200BGFirmware/LICENSE
|
||||
install -D -m644 LICENSE.ipw2200-fw ''${!outputDoc}/share/doc/intel2200BGFirmware/LICENSE
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
isabelle,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "isabelle-linter";
|
||||
version = "2025-1-1.0.0";
|
||||
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/src/Pure/System/isabelle_system.scala
|
||||
+++ b/src/Pure/System/isabelle_system.scala
|
||||
@@ -214,6 +214,7 @@ object Isabelle_System {
|
||||
Files.copy(src.toPath, target.toPath,
|
||||
StandardCopyOption.COPY_ATTRIBUTES,
|
||||
StandardCopyOption.REPLACE_EXISTING)
|
||||
+ target.setWritable(true)
|
||||
}
|
||||
catch {
|
||||
case ERROR(msg) =>
|
||||
@@ -12,6 +12,8 @@
|
||||
verit,
|
||||
vampire,
|
||||
eprover-ho,
|
||||
cvc5,
|
||||
csdp,
|
||||
rlwrap,
|
||||
perl,
|
||||
procps,
|
||||
@@ -19,6 +21,7 @@
|
||||
isabelle-components,
|
||||
symlinkJoin,
|
||||
fetchhg,
|
||||
electron,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -84,10 +87,20 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
cvc5' = cvc5.overrideAttrs {
|
||||
version = "1.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvc5";
|
||||
repo = "cvc5";
|
||||
tag = "cvc5-1.2.0";
|
||||
hash = "sha256-Um1x+XgQ5yWSoqtx1ZWbVAnNET2C4GVasIbn0eNfico=";
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "isabelle";
|
||||
version = "2025-1";
|
||||
version = "2025-2";
|
||||
|
||||
dirname = "Isabelle${finalAttrs.version}";
|
||||
|
||||
@@ -95,17 +108,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
fetchurl {
|
||||
url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_macos.tar.gz";
|
||||
hash = "sha256-WKlrsXP6oZHy6NTaaQYpddtgE2QGhBZ4uKai61dtQ14=";
|
||||
hash = "sha256-jxh0luKV8WmVLpRHRa+eSuAMnBzS7UytvPfYmOREkT4=";
|
||||
}
|
||||
else if stdenv.hostPlatform.isx86 then
|
||||
fetchurl {
|
||||
url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_linux.tar.gz";
|
||||
hash = "sha256-0SA28X3fIKMV3wZtlJvBxq9MZkI6GevVuSNzgqJ4xQU=";
|
||||
hash = "sha256-ogpQe8fBJw2L6WqfP77AY0U4d4nS3CxNPfYmDUe/szw=";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_linux_arm.tar.gz";
|
||||
hash = "sha256-BUhdK8qhdV2Den+4bbdd9T6MD/BtGpxp+1Axj21NxrI=";
|
||||
hash = "sha256-ZQqWabSgh2da+zQpTYLe0vBwTUfVgN2e1FzdyfF2S90=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ java ];
|
||||
@@ -116,6 +129,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
vampire'
|
||||
eprover-ho
|
||||
net-tools
|
||||
cvc5'
|
||||
csdp
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Make "isabelle build" work when generating documents
|
||||
# See: https://github.com/NixOS/nixpkgs/issues/289529
|
||||
./fix-copied-permissions.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ procps ];
|
||||
@@ -151,6 +172,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
VAMPIRE_EXTRA_OPTIONS="--mode casc"
|
||||
EOF
|
||||
|
||||
cat >contrib/cvc5-*/etc/settings <<EOF
|
||||
CVC5_HOME=${cvc5'}
|
||||
CVC5_VERSION=${cvc5'.version}
|
||||
CVC5_SOLVER=${cvc5'}/bin/cvc5
|
||||
CVC5_INSTALLED=yes
|
||||
EOF
|
||||
|
||||
cat >contrib/csdp-*/etc/settings <<EOF
|
||||
ISABELLE_CSDP=${csdp}/bin/csdp
|
||||
EOF
|
||||
|
||||
cat >contrib/polyml-*/etc/settings <<EOF
|
||||
ML_SYSTEM_64=true
|
||||
ML_SYSTEM=${polyml'.name}
|
||||
@@ -167,7 +199,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings
|
||||
|
||||
for comp in contrib/jdk* contrib/polyml-* contrib/verit-* contrib/vampire-* contrib/e-*; do
|
||||
for comp in contrib/jdk* contrib/polyml-* contrib/verit-* contrib/vampire-* \
|
||||
contrib/e-* contrib/cvc5-* contrib/csdp-*; do
|
||||
rm -rf $comp/${if stdenv.hostPlatform.isx86 then "x86" else "arm"}*
|
||||
done
|
||||
rm -rf contrib/*/src
|
||||
@@ -192,10 +225,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
arch=${
|
||||
if stdenv.hostPlatform.system == "aarch64-linux" then "arm64-linux" else stdenv.hostPlatform.system
|
||||
}
|
||||
for f in contrib/*/$arch/{z3,nunchaku,spass,zipperposition}; do
|
||||
for f in contrib/*/$arch/{z3,nunchaku,SPASS,zipperposition}; do
|
||||
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"${lib.optionalString stdenv.hostPlatform.isAarch64 " || true"}
|
||||
done
|
||||
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/$arch/bash_process
|
||||
|
||||
ln -sf ${electron}/bin/electron contrib/vscodium-*/*/electron
|
||||
rm contrib/vscodium-*/*/*.so{,.*}
|
||||
rm contrib/vscodium-*/*/chrome*
|
||||
|
||||
for d in contrib/kodkodi-*/jni/$arch; do
|
||||
patchelf --set-rpath "${
|
||||
lib.concatStringsSep ":" [
|
||||
@@ -278,36 +316,48 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [
|
||||
lib.maintainers.jvanbruegge
|
||||
lib.maintainers.sempiternal-aurora
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
passthru.withComponents =
|
||||
f:
|
||||
let
|
||||
isabelle = finalAttrs.finalPackage;
|
||||
base = "$out/${isabelle.dirname}";
|
||||
components = f isabelle-components;
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "isabelle-with-components-${isabelle.version}";
|
||||
paths = [ isabelle ] ++ (map (c: c.override { inherit isabelle; }) components);
|
||||
passthru = {
|
||||
vampire = vampire';
|
||||
polyml = polyml';
|
||||
cvc5 = cvc5';
|
||||
sha1 = sha1;
|
||||
withComponents =
|
||||
f:
|
||||
let
|
||||
isabelle = finalAttrs.finalPackage;
|
||||
base = "$out/${isabelle.dirname}";
|
||||
components = f isabelle-components;
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "isabelle-with-components-${isabelle.version}";
|
||||
paths = [ isabelle ] ++ (map (c: c.override { inherit isabelle; }) components);
|
||||
|
||||
postBuild = ''
|
||||
rm $out/bin/*
|
||||
postBuild = ''
|
||||
rm $out/bin/*
|
||||
|
||||
cd ${base}
|
||||
rm bin/*
|
||||
cp ${isabelle}/${isabelle.dirname}/bin/* bin/
|
||||
rm etc/components
|
||||
cat ${isabelle}/${isabelle.dirname}/etc/components > etc/components
|
||||
cd ${base}
|
||||
rm bin/*
|
||||
cp ${isabelle}/${isabelle.dirname}/bin/* bin/
|
||||
rm etc/components
|
||||
cat ${isabelle}/${isabelle.dirname}/etc/components > etc/components
|
||||
|
||||
export HOME=$TMP
|
||||
bin/isabelle install $out/bin
|
||||
patchShebangs $out/bin
|
||||
''
|
||||
+ lib.concatMapStringsSep "\n" (c: ''
|
||||
echo contrib/${c.pname}-${c.version} >> ${base}/etc/components
|
||||
'') components;
|
||||
};
|
||||
export HOME=$TMP
|
||||
bin/isabelle install $out/bin
|
||||
patchShebangs $out/bin
|
||||
''
|
||||
+ lib.concatMapStringsSep "\n" (c: ''
|
||||
echo contrib/${c.pname}-${c.version} >> ${base}/etc/components
|
||||
'') components;
|
||||
};
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
}:
|
||||
|
||||
let
|
||||
timestamp = "202511261751";
|
||||
timestamp = "202601131729";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jdt-language-server";
|
||||
version = "1.54.0";
|
||||
version = "1.55.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz";
|
||||
hash = "sha256-GikaJpvYizxASCGRIpYaUuyAhyr7x6PzQnCyznf3oUw=";
|
||||
hash = "sha256-kGJ8nwNwTbtATzdlFiXQdRwHirdTQkYCPVOtzqFBG5E=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jellyfin-tui";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhonus";
|
||||
repo = "jellyfin-tui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-AzeIoPdFfuzDrSPcAWqYq9sTHpLR222cz7BMHgVpmNA=";
|
||||
hash = "sha256-D3AzGrh04D05+v+t3gVZU68KlHM9HbaAx5dY2utJeFU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-a08yTZAzBSldSJ+TulU10aF+wLYCAxCA4WRMNfZOWFw=";
|
||||
cargoHash = "sha256-u8W67NYHZh798bgGfwpXhQxZ/BZFUCZ+gWAr5Pv/W8M=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
|
||||
@@ -248,6 +248,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
fugi
|
||||
];
|
||||
platforms = electron.meta.platforms ++ lib.platforms.darwin;
|
||||
inherit (electron.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
callPackage,
|
||||
vscode-generic,
|
||||
buildVscode,
|
||||
fetchurl,
|
||||
extraCommandLineArgs ? "",
|
||||
useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin,
|
||||
@@ -11,7 +10,7 @@
|
||||
let
|
||||
sources = (lib.importJSON ./sources.json).${stdenv.hostPlatform.system};
|
||||
in
|
||||
(callPackage vscode-generic {
|
||||
(buildVscode {
|
||||
inherit useVSCodeRipgrep;
|
||||
commandLineArgs = extraCommandLineArgs;
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "kitty-themes";
|
||||
version = "0-unstable-2026-01-10";
|
||||
version = "0-unstable-2026-01-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty-themes";
|
||||
rev = "0da136b4d31ab1c0dc49306bbf2ba8b819dafed8";
|
||||
hash = "sha256-jefF6MzFbKDz6Grsdh5fyi/hrZI72mNkp5iUvelIhDs=";
|
||||
rev = "58a07a8ca50f72f95f6858153a21717416cf3389";
|
||||
hash = "sha256-UIFIe68eb+Xihx+rdeQdp4Nku49m0Ft6G7R0KjRfY8g=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbaseencode";
|
||||
version = "1.0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paolostivanin";
|
||||
repo = "libbaseencode";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WiE+ZMX4oZieER1pu43aSWytkxfkQdX+S3JI98XPpL4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = {
|
||||
description = "Library written in C for encoding and decoding data using base32 or base64 (RFC-4648)";
|
||||
homepage = "https://github.com/paolostivanin/libbaseencode";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ alexbakker ];
|
||||
};
|
||||
}
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "2.38.0";
|
||||
version = "2.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chatmail";
|
||||
repo = "core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XDxmX0tucNUmJAgDgRtD9sYG1/URWWUOTx7PQ1PBTYY=";
|
||||
hash = "sha256-gVRm0bMGmKap4k4g6h+TvdJlK3VBj7HKyABTNrjd7rw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "chatmail-core";
|
||||
inherit version src;
|
||||
hash = "sha256-I13Us7H3DqbAfdEsmHgMBVgvsBZP9Sh21eqYGF7VoSw=";
|
||||
hash = "sha256-hcyOhefNOt6YyLqFM1ZJWwohmcOJo/NjW6rLSlWUDnU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
cryptopp,
|
||||
immer,
|
||||
lager,
|
||||
libcpr,
|
||||
libcpr_1_10_5,
|
||||
libhttpserver,
|
||||
libmicrohttpd,
|
||||
nlohmann_json,
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cryptopp
|
||||
immer
|
||||
lager
|
||||
libcpr
|
||||
libcpr_1_10_5
|
||||
libhttpserver
|
||||
libmicrohttpd
|
||||
olm
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libpulseaudio,
|
||||
openssl,
|
||||
qt6,
|
||||
cmake,
|
||||
pkg-config,
|
||||
lib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "librepods";
|
||||
version = "0.1.0-unstable-2025-12-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kavishdevar";
|
||||
repo = "librepods";
|
||||
rev = "0e1f784737122913c21b429810d059aadfb4479e";
|
||||
hash = "sha256-nXEMIyQWEDMjyKGPAleqqSttznNmrdSHKT4Kr2tLHBY=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/linux";
|
||||
|
||||
buildInputs = [
|
||||
libpulseaudio
|
||||
openssl
|
||||
qt6.qtbase
|
||||
qt6.qtconnectivity
|
||||
qt6.qtquick3d
|
||||
qt6.qttools
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/kavishdevar/librepods";
|
||||
description = "AirPods liberated from Apple's ecosystem";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.thefossguy ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,398 @@
|
||||
From 9228741450f627da1dba800b44da03db8df44b32 Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Tam <samuel.tam@expressvpn.com>
|
||||
Date: Fri, 9 Jan 2026 18:12:12 +0800
|
||||
Subject: [PATCH] ARM64 ASM: Darwin specific address calc fix
|
||||
|
||||
Don't use ':lo12:' in Darwin specific address calculation code.
|
||||
@PAGEOFF is indicating this.
|
||||
---
|
||||
wolfcrypt/src/port/arm/armv8-mlkem-asm.S | 74 +++++++++++------------
|
||||
wolfcrypt/src/port/arm/armv8-sha3-asm.S | 4 +-
|
||||
wolfcrypt/src/port/arm/armv8-sha512-asm.S | 8 +--
|
||||
3 files changed, 43 insertions(+), 43 deletions(-)
|
||||
|
||||
diff --git a/wolfcrypt/src/port/arm/armv8-mlkem-asm.S b/wolfcrypt/src/port/arm/armv8-mlkem-asm.S
|
||||
index a45475c..1ded4af 100644
|
||||
--- a/wolfcrypt/src/port/arm/armv8-mlkem-asm.S
|
||||
+++ b/wolfcrypt/src/port/arm/armv8-mlkem-asm.S
|
||||
@@ -168,21 +168,21 @@ _mlkem_ntt:
|
||||
add x2, x2, :lo12:L_mlkem_aarch64_zetas
|
||||
#else
|
||||
adrp x2, L_mlkem_aarch64_zetas@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_aarch64_zetas@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_aarch64_zetas@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x3, L_mlkem_aarch64_zetas_qinv
|
||||
add x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv
|
||||
#else
|
||||
adrp x3, L_mlkem_aarch64_zetas_qinv@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_aarch64_zetas_qinv@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x4, L_mlkem_aarch64_consts
|
||||
add x4, x4, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x4, L_mlkem_aarch64_consts@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
add x1, x0, #0x100
|
||||
ldr q4, [x4]
|
||||
@@ -1562,21 +1562,21 @@ _mlkem_invntt:
|
||||
add x2, x2, :lo12:L_mlkem_aarch64_zetas_inv
|
||||
#else
|
||||
adrp x2, L_mlkem_aarch64_zetas_inv@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_aarch64_zetas_inv@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_aarch64_zetas_inv@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x3, L_mlkem_aarch64_zetas_inv_qinv
|
||||
add x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv
|
||||
#else
|
||||
adrp x3, L_mlkem_aarch64_zetas_inv_qinv@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x4, L_mlkem_aarch64_consts
|
||||
add x4, x4, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x4, L_mlkem_aarch64_consts@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
add x1, x0, #0x100
|
||||
ldr q8, [x4]
|
||||
@@ -3013,21 +3013,21 @@ _mlkem_ntt_sqrdmlsh:
|
||||
add x2, x2, :lo12:L_mlkem_aarch64_zetas
|
||||
#else
|
||||
adrp x2, L_mlkem_aarch64_zetas@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_aarch64_zetas@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_aarch64_zetas@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x3, L_mlkem_aarch64_zetas_qinv
|
||||
add x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv
|
||||
#else
|
||||
adrp x3, L_mlkem_aarch64_zetas_qinv@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_qinv@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_aarch64_zetas_qinv@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x4, L_mlkem_aarch64_consts
|
||||
add x4, x4, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x4, L_mlkem_aarch64_consts@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
add x1, x0, #0x100
|
||||
ldr q4, [x4]
|
||||
@@ -4195,21 +4195,21 @@ _mlkem_invntt_sqrdmlsh:
|
||||
add x2, x2, :lo12:L_mlkem_aarch64_zetas_inv
|
||||
#else
|
||||
adrp x2, L_mlkem_aarch64_zetas_inv@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_aarch64_zetas_inv@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_aarch64_zetas_inv@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x3, L_mlkem_aarch64_zetas_inv_qinv
|
||||
add x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv
|
||||
#else
|
||||
adrp x3, L_mlkem_aarch64_zetas_inv_qinv@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_aarch64_zetas_inv_qinv@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x4, L_mlkem_aarch64_consts
|
||||
add x4, x4, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x4, L_mlkem_aarch64_consts@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
add x1, x0, #0x100
|
||||
ldr q8, [x4]
|
||||
@@ -5532,14 +5532,14 @@ _mlkem_basemul_mont:
|
||||
add x3, x3, :lo12:L_mlkem_aarch64_zetas_mul
|
||||
#else
|
||||
adrp x3, L_mlkem_aarch64_zetas_mul@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_mul@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_aarch64_zetas_mul@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x4, L_mlkem_aarch64_consts
|
||||
add x4, x4, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x4, L_mlkem_aarch64_consts@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q1, [x4]
|
||||
ldp q2, q3, [x1]
|
||||
@@ -6230,14 +6230,14 @@ _mlkem_basemul_mont_add:
|
||||
add x3, x3, :lo12:L_mlkem_aarch64_zetas_mul
|
||||
#else
|
||||
adrp x3, L_mlkem_aarch64_zetas_mul@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_aarch64_zetas_mul@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_aarch64_zetas_mul@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x4, L_mlkem_aarch64_consts
|
||||
add x4, x4, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x4, L_mlkem_aarch64_consts@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q1, [x4]
|
||||
ldp q2, q3, [x1]
|
||||
@@ -6991,7 +6991,7 @@ _mlkem_csubq_neon:
|
||||
add x1, x1, :lo12:L_mlkem_aarch64_q
|
||||
#else
|
||||
adrp x1, L_mlkem_aarch64_q@PAGE
|
||||
- add x1, x1, :lo12:L_mlkem_aarch64_q@PAGEOFF
|
||||
+ add x1, x1, L_mlkem_aarch64_q@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q20, [x1]
|
||||
ld4 {v0.8h, v1.8h, v2.8h, v3.8h}, [x0], #0x40
|
||||
@@ -7172,7 +7172,7 @@ _mlkem_add_reduce:
|
||||
add x2, x2, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x2, L_mlkem_aarch64_consts@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q0, [x2]
|
||||
ld4 {v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
|
||||
@@ -7363,7 +7363,7 @@ _mlkem_add3_reduce:
|
||||
add x3, x3, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x3, L_mlkem_aarch64_consts@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q0, [x3]
|
||||
ld4 {v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
|
||||
@@ -7594,7 +7594,7 @@ _mlkem_rsub_reduce:
|
||||
add x2, x2, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x2, L_mlkem_aarch64_consts@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q0, [x2]
|
||||
ld4 {v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
|
||||
@@ -7785,7 +7785,7 @@ _mlkem_to_mont:
|
||||
add x1, x1, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x1, L_mlkem_aarch64_consts@PAGE
|
||||
- add x1, x1, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x1, x1, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q0, [x1]
|
||||
ld4 {v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
|
||||
@@ -7999,7 +7999,7 @@ _mlkem_to_mont_sqrdmlsh:
|
||||
add x1, x1, :lo12:L_mlkem_aarch64_consts
|
||||
#else
|
||||
adrp x1, L_mlkem_aarch64_consts@PAGE
|
||||
- add x1, x1, :lo12:L_mlkem_aarch64_consts@PAGEOFF
|
||||
+ add x1, x1, L_mlkem_aarch64_consts@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q0, [x1]
|
||||
ld4 {v1.8h, v2.8h, v3.8h, v4.8h}, [x0], #0x40
|
||||
@@ -8226,21 +8226,21 @@ _mlkem_to_msg_neon:
|
||||
add x2, x2, :lo12:L_mlkem_to_msg_low
|
||||
#else
|
||||
adrp x2, L_mlkem_to_msg_low@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_to_msg_low@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_to_msg_low@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x3, L_mlkem_to_msg_high
|
||||
add x3, x3, :lo12:L_mlkem_to_msg_high
|
||||
#else
|
||||
adrp x3, L_mlkem_to_msg_high@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_to_msg_high@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_to_msg_high@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x4, L_mlkem_to_msg_bits
|
||||
add x4, x4, :lo12:L_mlkem_to_msg_bits
|
||||
#else
|
||||
adrp x4, L_mlkem_to_msg_bits@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_to_msg_bits@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_to_msg_bits@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldr q0, [x2]
|
||||
ldr q1, [x3]
|
||||
@@ -8506,14 +8506,14 @@ _mlkem_from_msg_neon:
|
||||
add x2, x2, :lo12:L_mlkem_from_msg_q1half
|
||||
#else
|
||||
adrp x2, L_mlkem_from_msg_q1half@PAGE
|
||||
- add x2, x2, :lo12:L_mlkem_from_msg_q1half@PAGEOFF
|
||||
+ add x2, x2, L_mlkem_from_msg_q1half@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x3, L_mlkem_from_msg_bits
|
||||
add x3, x3, :lo12:L_mlkem_from_msg_bits
|
||||
#else
|
||||
adrp x3, L_mlkem_from_msg_bits@PAGE
|
||||
- add x3, x3, :lo12:L_mlkem_from_msg_bits@PAGEOFF
|
||||
+ add x3, x3, L_mlkem_from_msg_bits@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ld1 {v2.16b, v3.16b}, [x1]
|
||||
ldr q1, [x2]
|
||||
@@ -9517,28 +9517,28 @@ _mlkem_rej_uniform_neon:
|
||||
add x4, x4, :lo12:L_mlkem_rej_uniform_mask
|
||||
#else
|
||||
adrp x4, L_mlkem_rej_uniform_mask@PAGE
|
||||
- add x4, x4, :lo12:L_mlkem_rej_uniform_mask@PAGEOFF
|
||||
+ add x4, x4, L_mlkem_rej_uniform_mask@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x5, L_mlkem_aarch64_q
|
||||
add x5, x5, :lo12:L_mlkem_aarch64_q
|
||||
#else
|
||||
adrp x5, L_mlkem_aarch64_q@PAGE
|
||||
- add x5, x5, :lo12:L_mlkem_aarch64_q@PAGEOFF
|
||||
+ add x5, x5, L_mlkem_aarch64_q@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x6, L_mlkem_rej_uniform_bits
|
||||
add x6, x6, :lo12:L_mlkem_rej_uniform_bits
|
||||
#else
|
||||
adrp x6, L_mlkem_rej_uniform_bits@PAGE
|
||||
- add x6, x6, :lo12:L_mlkem_rej_uniform_bits@PAGEOFF
|
||||
+ add x6, x6, L_mlkem_rej_uniform_bits@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x7, L_mlkem_rej_uniform_indices
|
||||
add x7, x7, :lo12:L_mlkem_rej_uniform_indices
|
||||
#else
|
||||
adrp x7, L_mlkem_rej_uniform_indices@PAGE
|
||||
- add x7, x7, :lo12:L_mlkem_rej_uniform_indices@PAGEOFF
|
||||
+ add x7, x7, L_mlkem_rej_uniform_indices@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
eor v1.16b, v1.16b, v1.16b
|
||||
eor v12.16b, v12.16b, v12.16b
|
||||
@@ -9754,7 +9754,7 @@ _mlkem_sha3_blocksx3_neon:
|
||||
add x27, x27, :lo12:L_sha3_aarch64_r
|
||||
#else
|
||||
adrp x27, L_sha3_aarch64_r@PAGE
|
||||
- add x27, x27, :lo12:L_sha3_aarch64_r@PAGEOFF
|
||||
+ add x27, x27, L_sha3_aarch64_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
str x0, [x29, #40]
|
||||
ld4 {v0.d, v1.d, v2.d, v3.d}[0], [x0], #32
|
||||
@@ -10079,7 +10079,7 @@ _mlkem_shake128_blocksx3_seed_neon:
|
||||
add x28, x28, :lo12:L_sha3_aarch64_r
|
||||
#else
|
||||
adrp x28, L_sha3_aarch64_r@PAGE
|
||||
- add x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
|
||||
+ add x28, x28, L_sha3_aarch64_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
str x0, [x29, #40]
|
||||
add x0, x0, #32
|
||||
@@ -10426,7 +10426,7 @@ _mlkem_shake256_blocksx3_seed_neon:
|
||||
add x28, x28, :lo12:L_sha3_aarch64_r
|
||||
#else
|
||||
adrp x28, L_sha3_aarch64_r@PAGE
|
||||
- add x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
|
||||
+ add x28, x28, L_sha3_aarch64_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
str x0, [x29, #40]
|
||||
add x0, x0, #32
|
||||
@@ -10774,7 +10774,7 @@ _mlkem_sha3_blocksx3_neon:
|
||||
add x27, x27, :lo12:L_sha3_aarch64_r
|
||||
#else
|
||||
adrp x27, L_sha3_aarch64_r@PAGE
|
||||
- add x27, x27, :lo12:L_sha3_aarch64_r@PAGEOFF
|
||||
+ add x27, x27, L_sha3_aarch64_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
str x0, [x29, #40]
|
||||
ld4 {v0.d, v1.d, v2.d, v3.d}[0], [x0], #32
|
||||
@@ -11184,7 +11184,7 @@ _mlkem_shake128_blocksx3_seed_neon:
|
||||
add x28, x28, :lo12:L_sha3_aarch64_r
|
||||
#else
|
||||
adrp x28, L_sha3_aarch64_r@PAGE
|
||||
- add x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
|
||||
+ add x28, x28, L_sha3_aarch64_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
str x0, [x29, #40]
|
||||
add x0, x0, #32
|
||||
@@ -11616,7 +11616,7 @@ _mlkem_shake256_blocksx3_seed_neon:
|
||||
add x28, x28, :lo12:L_sha3_aarch64_r
|
||||
#else
|
||||
adrp x28, L_sha3_aarch64_r@PAGE
|
||||
- add x28, x28, :lo12:L_sha3_aarch64_r@PAGEOFF
|
||||
+ add x28, x28, L_sha3_aarch64_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
str x0, [x29, #40]
|
||||
add x0, x0, #32
|
||||
diff --git a/wolfcrypt/src/port/arm/armv8-sha3-asm.S b/wolfcrypt/src/port/arm/armv8-sha3-asm.S
|
||||
index 411349f..6089f8c 100644
|
||||
--- a/wolfcrypt/src/port/arm/armv8-sha3-asm.S
|
||||
+++ b/wolfcrypt/src/port/arm/armv8-sha3-asm.S
|
||||
@@ -95,7 +95,7 @@ _BlockSha3_crypto:
|
||||
add x1, x1, :lo12:L_SHA3_transform_crypto_r
|
||||
#else
|
||||
adrp x1, L_SHA3_transform_crypto_r@PAGE
|
||||
- add x1, x1, :lo12:L_SHA3_transform_crypto_r@PAGEOFF
|
||||
+ add x1, x1, L_SHA3_transform_crypto_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ld4 {v0.d, v1.d, v2.d, v3.d}[0], [x0], #32
|
||||
ld4 {v4.d, v5.d, v6.d, v7.d}[0], [x0], #32
|
||||
@@ -268,7 +268,7 @@ _BlockSha3_base:
|
||||
add x27, x27, :lo12:L_SHA3_transform_base_r
|
||||
#else
|
||||
adrp x27, L_SHA3_transform_base_r@PAGE
|
||||
- add x27, x27, :lo12:L_SHA3_transform_base_r@PAGEOFF
|
||||
+ add x27, x27, L_SHA3_transform_base_r@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ldp x1, x2, [x0]
|
||||
ldp x3, x4, [x0, #16]
|
||||
diff --git a/wolfcrypt/src/port/arm/armv8-sha512-asm.S b/wolfcrypt/src/port/arm/armv8-sha512-asm.S
|
||||
index 514e5de..ee64e6e 100644
|
||||
--- a/wolfcrypt/src/port/arm/armv8-sha512-asm.S
|
||||
+++ b/wolfcrypt/src/port/arm/armv8-sha512-asm.S
|
||||
@@ -165,14 +165,14 @@ _Transform_Sha512_Len_neon:
|
||||
add x3, x3, :lo12:L_SHA512_transform_neon_len_k
|
||||
#else
|
||||
adrp x3, L_SHA512_transform_neon_len_k@PAGE
|
||||
- add x3, x3, :lo12:L_SHA512_transform_neon_len_k@PAGEOFF
|
||||
+ add x3, x3, L_SHA512_transform_neon_len_k@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
#ifndef __APPLE__
|
||||
adrp x27, L_SHA512_transform_neon_len_r8
|
||||
add x27, x27, :lo12:L_SHA512_transform_neon_len_r8
|
||||
#else
|
||||
adrp x27, L_SHA512_transform_neon_len_r8@PAGE
|
||||
- add x27, x27, :lo12:L_SHA512_transform_neon_len_r8@PAGEOFF
|
||||
+ add x27, x27, L_SHA512_transform_neon_len_r8@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
ld1 {v11.16b}, [x27]
|
||||
# Load digest into working vars
|
||||
@@ -1070,7 +1070,7 @@ L_sha512_len_neon_start:
|
||||
add x3, x3, :lo12:L_SHA512_transform_neon_len_k
|
||||
#else
|
||||
adrp x3, L_SHA512_transform_neon_len_k@PAGE
|
||||
- add x3, x3, :lo12:L_SHA512_transform_neon_len_k@PAGEOFF
|
||||
+ add x3, x3, L_SHA512_transform_neon_len_k@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
subs w2, w2, #0x80
|
||||
bne L_sha512_len_neon_begin
|
||||
@@ -1211,7 +1211,7 @@ _Transform_Sha512_Len_crypto:
|
||||
add x4, x4, :lo12:L_SHA512_trans_crypto_len_k
|
||||
#else
|
||||
adrp x4, L_SHA512_trans_crypto_len_k@PAGE
|
||||
- add x4, x4, :lo12:L_SHA512_trans_crypto_len_k@PAGEOFF
|
||||
+ add x4, x4, L_SHA512_trans_crypto_len_k@PAGEOFF
|
||||
#endif /* __APPLE__ */
|
||||
# Load first 16 64-bit words of K permanently
|
||||
ld1 {v8.2d, v9.2d, v10.2d, v11.2d}, [x4], #0x40
|
||||
--
|
||||
2.51.2
|
||||
|
||||
@@ -10,16 +10,25 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "lightway";
|
||||
version = "0-unstable-2025-09-19";
|
||||
version = "0-unstable-2026-01-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "expressvpn";
|
||||
repo = "lightway";
|
||||
rev = "dac72eb8af0994de020d71d24114717ecfb9804d";
|
||||
hash = "sha256-oHxHJ4D/Xg/zAFiI0bMX3Dc05HXIjk+ZHuGY03cwY+c=";
|
||||
rev = "8e21da7ab3a97ab75235264e85fa8615f7b0f33b";
|
||||
hash = "sha256-1YpXaxPm1BMALhRU25FH5PLJ1IIRfcYA3W6e4c8Si+w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-RFlac10XFJXT3Giayy31kZ3Nn1Q+YsPt/zCdkSV0Atk=";
|
||||
cargoHash = "sha256-4SIE/kGRd2I3sqO+IgItO1PBQHeFv9N4erfVe/9re7A=";
|
||||
|
||||
# Backport fix for Darwin address calculation to vendored wolfSSL 5.8.2.
|
||||
# https://github.com/wolfSSL/wolfssl/pull/9537
|
||||
# Drop when Lightway bumps wolfSSL past commit 5c2c459, or > 5.8.4.
|
||||
postPatch = ''
|
||||
patch -Np1 \
|
||||
-d $cargoDepsCopy/wolfssl-sys-2.0.0/wolfssl-src \
|
||||
-i ${./backport-darwin-address-calc-fix.patch}
|
||||
'';
|
||||
|
||||
cargoBuildFlags = lib.cli.toCommandLineGNU { } {
|
||||
package = [
|
||||
|
||||
@@ -74,13 +74,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "7815";
|
||||
version = "7823";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-KeLi/DsbSbTNK7EwDOugsJaYEAU3JLOYno59hgJgXhc=";
|
||||
hash = "sha256-3NLIX2bAxaxkpPRMzxWfcEhJDke2q4TWAyWjXIa/Wpk=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lua-language-server";
|
||||
version = "3.17.0";
|
||||
version = "3.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luals";
|
||||
repo = "lua-language-server";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-jeO01VvukzpVPP/ob/p/br51uy6eVdAFqRTIo/DttR0=";
|
||||
hash = "sha256-NfxBiXiGF4+meXTwp6We9+bmHW7Z9ZcxvRXAGwWAULo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -162,11 +162,11 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "microsoft-edge";
|
||||
version = "144.0.3719.82";
|
||||
version = "144.0.3719.92";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-W7wT+1aNF7ZuhYPQ2VAvVgJ+5GWsopEnDM9FhdpxBIg=";
|
||||
hash = "sha256-fi1vQIc069HS7t/pF+bC/QBbyZbpQvggUyt9pjKZUBo=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "minigalaxy";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkwouter";
|
||||
repo = "minigalaxy";
|
||||
tag = version;
|
||||
hash = "sha256-ZHTjppdLxKDURceonbH7dJz+krBhu3lr2P7QPVDxRZw=";
|
||||
hash = "sha256-YZhgVeWdVaNiTj7hvYuHbaVtoKN6EFoOANWdkrlj4dU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "mpls";
|
||||
version = "0.16.1";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhersson";
|
||||
repo = "mpls";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-O//9AeJ9x8WF+0ub6KK91efPr9Hdbx1Ab4X0oaUhwss=";
|
||||
hash = "sha256-DDvjTbACn9qCmfJR6rcGQxVNik9wUCiNYxiYMsEkMXc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QtNQnJtYLmSTTLwKKQ8P6O6wyctgwN8OcGZkMXa+Ark=";
|
||||
|
||||
@@ -31,7 +31,7 @@ assert gpgmeSupport -> sslSupport;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutt";
|
||||
version = "2.2.16";
|
||||
version = "2.3.0";
|
||||
outputs = [
|
||||
"out"
|
||||
"doc"
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-HTEJp0OtiyXu+XEJsr20Zdt4N9Co0hHNOIvhtvqsPzI=";
|
||||
hash = "sha256-XV68QIQ/cVbV7eMOUAFnmKxzNkZ/etNH5xZRBRbMITA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,13 +8,16 @@
|
||||
gobject-introspection,
|
||||
cairo,
|
||||
colord,
|
||||
docutils,
|
||||
lcms2,
|
||||
pango,
|
||||
libstartup_notification,
|
||||
libcanberra,
|
||||
ninja,
|
||||
xvfb-run,
|
||||
libadwaita,
|
||||
libxcvt,
|
||||
libGL,
|
||||
libICE,
|
||||
libX11,
|
||||
libXcomposite,
|
||||
@@ -27,7 +30,6 @@
|
||||
libxkbfile,
|
||||
xkeyboard_config,
|
||||
libxkbcommon,
|
||||
libXrender,
|
||||
libxcb,
|
||||
libXrandr,
|
||||
libXinerama,
|
||||
@@ -69,7 +71,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "46.8";
|
||||
version = "48.7";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -80,13 +82,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-+8CDVEr7O4Vn18pobCF/g3sG+UeNbiV0FZ/5ocjhyWI=";
|
||||
hash = "sha256-7BAqo8uw45ABIGYnrKMFUxRVX3BgneXmwrfvzR+pDyA=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
"-Degl_device=true"
|
||||
"-Dinstalled_tests=false" # TODO: enable these
|
||||
"-Dtests=false"
|
||||
"-Dtests=disabled"
|
||||
# For NVIDIA proprietary driver up to 470.
|
||||
# https://src.fedoraproject.org/rpms/mutter/pull-request/49
|
||||
"-Dwayland_eglstream=true"
|
||||
"-Dprofiler=true"
|
||||
"-Dxwayland_path=${lib.getExe xwayland}"
|
||||
@@ -104,13 +108,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
docutils # for rst2man
|
||||
gettext
|
||||
glib
|
||||
libxcvt
|
||||
meson
|
||||
ninja
|
||||
xvfb-run
|
||||
pkg-config
|
||||
python3
|
||||
python3.pkgs.argcomplete # for register-python-argcomplete
|
||||
wayland-scanner
|
||||
wrapGAppsHook4
|
||||
gi-docgen
|
||||
@@ -134,6 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libgbm
|
||||
libei
|
||||
libdisplay-info
|
||||
libGL
|
||||
libgudev
|
||||
libinput
|
||||
libstartup_notification
|
||||
@@ -162,36 +170,43 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libxkbfile
|
||||
xkeyboard_config
|
||||
libxkbcommon
|
||||
libXrender
|
||||
libxcb
|
||||
libXrandr
|
||||
libXinerama
|
||||
libXau
|
||||
|
||||
# for gdctl shebang
|
||||
(python3.withPackages (pp: [
|
||||
pp.pygobject3
|
||||
pp.argcomplete
|
||||
]))
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs src/backends/native/gen-default-modes.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas"
|
||||
# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3981
|
||||
substituteInPlace src/frames/main.c \
|
||||
--replace-fail "libadwaita-1.so.0" "${libadwaita}/lib/libadwaita-1.so.0"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
# TODO: Move this into a directory devhelp can find.
|
||||
moveToOutput "share/mutter-14/doc" "$devdoc"
|
||||
moveToOutput "share/mutter-${finalAttrs.passthru.libmutter_api_version}/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
# Install udev files into our own tree.
|
||||
env.PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
|
||||
|
||||
separateDebugInfo = true;
|
||||
strictDeps = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
libdir = "${finalAttrs.finalPackage}/lib/mutter-14";
|
||||
libmutter_api_version = "16"; # bumped each dev cycle
|
||||
libdir = "${finalAttrs.finalPackage}/lib/mutter-${finalAttrs.passthru.libmutter_api_version}";
|
||||
|
||||
tests = {
|
||||
libdirExists = runCommand "mutter-libdir-exists" { } ''
|
||||
@@ -208,6 +223,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Window manager for GNOME";
|
||||
mainProgram = "mutter";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/mutter";
|
||||
changelog = "https://gitlab.gnome.org/GNOME/mutter/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
teams = [ lib.teams.pantheon ];
|
||||
platforms = lib.platforms.linux;
|
||||
@@ -51,6 +51,12 @@ stdenv.mkDerivation rec {
|
||||
find . -name .libs -exec rm -rf -- {} +
|
||||
'';
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
"dev"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "NILFS utilities";
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user