Merge master into staging-next
This commit is contained in:
@@ -12,17 +12,12 @@ on:
|
||||
mergedSha:
|
||||
required: true
|
||||
type: string
|
||||
ownersCanFail:
|
||||
required: true
|
||||
type: boolean
|
||||
targetSha:
|
||||
required: true
|
||||
type: string
|
||||
secrets:
|
||||
CACHIX_AUTH_TOKEN:
|
||||
required: true
|
||||
OWNER_RO_APP_PRIVATE_KEY:
|
||||
required: true
|
||||
|
||||
permissions: {}
|
||||
|
||||
@@ -72,19 +67,8 @@ jobs:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: gh api /rate_limit | jq
|
||||
|
||||
# For checking code owners, this job depends on a GitHub App with the following permissions:
|
||||
# - Permissions:
|
||||
# - Repository > Administration: read-only
|
||||
# - Organization > Members: read-only
|
||||
# - Install App on this repository, setting these variables:
|
||||
# - OWNER_RO_APP_ID (variable)
|
||||
# - OWNER_RO_APP_PRIVATE_KEY (secret)
|
||||
#
|
||||
# This should not use the same app as the job to request reviewers, because this job requires
|
||||
# handling untrusted PR input.
|
||||
owners:
|
||||
runs-on: ubuntu-24.04-arm
|
||||
continue-on-error: ${{ inputs.ownersCanFail }}
|
||||
timeout-minutes: 5
|
||||
steps:
|
||||
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
|
||||
@@ -94,7 +78,6 @@ jobs:
|
||||
uses: ./.github/actions/checkout
|
||||
with:
|
||||
merged-as-untrusted-at: ${{ inputs.mergedSha }}
|
||||
target-as-trusted-at: ${{ inputs.targetSha }}
|
||||
|
||||
- uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31
|
||||
|
||||
@@ -107,36 +90,15 @@ jobs:
|
||||
pushFilter: -source$
|
||||
|
||||
- name: Build codeowners validator
|
||||
run: nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A codeownersValidator
|
||||
|
||||
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
|
||||
if: github.event_name == 'pull_request_target' && vars.OWNER_RO_APP_ID
|
||||
id: app-token
|
||||
with:
|
||||
app-id: ${{ vars.OWNER_RO_APP_ID }}
|
||||
private-key: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }}
|
||||
permission-administration: read
|
||||
permission-members: read
|
||||
|
||||
- name: Log current API rate limits
|
||||
if: steps.app-token.outputs.token
|
||||
env:
|
||||
GH_TOKEN: ${{ steps.app-token.outputs.token }}
|
||||
run: gh api /rate_limit | jq
|
||||
run: nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A codeownersValidator
|
||||
|
||||
- name: Validate codeowners
|
||||
if: steps.app-token.outputs.token
|
||||
env:
|
||||
OWNERS_FILE: nixpkgs/untrusted/ci/OWNERS
|
||||
GITHUB_ACCESS_TOKEN: ${{ steps.app-token.outputs.token }}
|
||||
REPOSITORY_PATH: nixpkgs/untrusted
|
||||
OWNER_CHECKER_REPOSITORY: ${{ github.repository }}
|
||||
# Omits "owners", which checks whether GitHub handles exist, but fails with nested team
|
||||
# structures.
|
||||
CHECKS: "duppatterns,files,syntax"
|
||||
# Set this to "notowned,avoid-shadowing" to check that all files are owned by somebody
|
||||
EXPERIMENTAL_CHECKS: "avoid-shadowing"
|
||||
run: result/bin/codeowners-validator
|
||||
|
||||
- name: Log current API rate limits
|
||||
if: steps.app-token.outputs.token
|
||||
env:
|
||||
GH_TOKEN: ${{ steps.app-token.outputs.token }}
|
||||
run: gh api /rate_limit | jq
|
||||
|
||||
@@ -11,8 +11,6 @@ on:
|
||||
OWNER_APP_PRIVATE_KEY:
|
||||
# The Test workflow should not actually request reviews from owners.
|
||||
required: false
|
||||
OWNER_RO_APP_PRIVATE_KEY:
|
||||
required: true
|
||||
|
||||
concurrency:
|
||||
group: pr-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
|
||||
@@ -59,13 +57,11 @@ jobs:
|
||||
pull-requests: write
|
||||
secrets:
|
||||
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
|
||||
OWNER_RO_APP_PRIVATE_KEY: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }}
|
||||
with:
|
||||
baseBranch: ${{ needs.prepare.outputs.baseBranch }}
|
||||
headBranch: ${{ needs.prepare.outputs.headBranch }}
|
||||
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
|
||||
targetSha: ${{ needs.prepare.outputs.targetSha }}
|
||||
ownersCanFail: ${{ !contains(fromJSON(needs.prepare.outputs.touched), 'owners') }}
|
||||
|
||||
lint:
|
||||
name: Lint
|
||||
|
||||
@@ -98,7 +98,6 @@ jobs:
|
||||
secrets:
|
||||
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
|
||||
NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
|
||||
OWNER_RO_APP_PRIVATE_KEY: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }}
|
||||
|
||||
push:
|
||||
if: needs.prepare.outputs.push
|
||||
|
||||
@@ -221,7 +221,6 @@ module.exports = async ({ github, context, core, dry }) => {
|
||||
|
||||
const touched = []
|
||||
if (files.includes('ci/pinned.json')) touched.push('pinned')
|
||||
if (files.includes('ci/OWNERS')) touched.push('owners')
|
||||
core.setOutput('touched', touched)
|
||||
|
||||
return
|
||||
|
||||
@@ -155,8 +155,15 @@ When reviewing changes to a team, read the team's scope and the context around t
|
||||
In any case, request reviews from the existing team members.
|
||||
If the team lists no specific membership policy, feel free to merge changes to the team after giving the existing members a few days to respond.
|
||||
|
||||
*Important:* If a team says it is a closed group, do not merge additions to the team without an approval by at least one existing member.
|
||||
> [!IMPORTANT]
|
||||
> If a team says it is a closed group, do not merge additions to the team without an approval by at least one existing member.
|
||||
|
||||
A corresponding GitHub team can be created by any org member.
|
||||
When creating the team it should be created with the `nixpkgs-maintainers` team as parent.
|
||||
Once approved, the team will have the right privileges to be pinged and requested for review in Nixpkgs.
|
||||
|
||||
> [!TIP]
|
||||
> The team name should be as short as possible; because it is nested under the maintainers group, no -maintainers suffix is needed.
|
||||
|
||||
# Maintainer scripts
|
||||
|
||||
|
||||
@@ -18098,12 +18098,6 @@
|
||||
githubId = 50854675;
|
||||
name = "Nelson Jeppesen";
|
||||
};
|
||||
neonfuz = {
|
||||
email = "neonfuz@gmail.com";
|
||||
github = "neonfuz";
|
||||
githubId = 2590830;
|
||||
name = "Sage Raflik";
|
||||
};
|
||||
neosimsim = {
|
||||
email = "me@abn.sh";
|
||||
github = "neosimsim";
|
||||
@@ -19975,12 +19969,6 @@
|
||||
githubId = 63069986;
|
||||
name = "Per Stark";
|
||||
};
|
||||
petee = {
|
||||
name = "Pete Erickson";
|
||||
email = "pete.perickson@gmail.com";
|
||||
github = "petee";
|
||||
githubId = 89916;
|
||||
};
|
||||
Peter3579 = {
|
||||
github = "Peter3579";
|
||||
githubId = 170885528;
|
||||
|
||||
@@ -198,6 +198,8 @@
|
||||
|
||||
- The `services.postgresql` module now sets up a systemd unit `postgresql.target`. Depending on `postgresql.target` guarantees that postgres is in read-write mode and initial/ensure scripts were executed. Depending on `postgresql.service` only guarantees a read-only connection.
|
||||
|
||||
- The `services.mysql` module now restarts the database `on-abnormal`, which means that it now will be restarted in certain situations, it wasn't before. For example an OOM-kill.
|
||||
|
||||
- The `services.siproxd` module has been removed as `siproxd` is unmaintained and broken with libosip 5.x.
|
||||
|
||||
- `services.tor.torsocks.enable` no longer defaults to true if Tor and Tor client functionality is enabled.
|
||||
|
||||
@@ -53,18 +53,16 @@ in
|
||||
|
||||
boot.blacklistedKernelModules = cfg.blacklistedKernelModules;
|
||||
|
||||
systemd.user.services.opentabletdriver =
|
||||
with pkgs;
|
||||
lib.mkIf cfg.daemon.enable {
|
||||
description = "Open source, cross-platform, user-mode tablet driver";
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
partOf = [ "graphical-session.target" ];
|
||||
systemd.user.services.opentabletdriver = lib.mkIf cfg.daemon.enable {
|
||||
description = "Open source, cross-platform, user-mode tablet driver";
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
partOf = [ "graphical-session.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${cfg.package}/bin/otd-daemon";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = lib.getExe' cfg.package "otd-daemon";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -691,7 +691,7 @@ in
|
||||
serviceConfig = lib.mkMerge [
|
||||
{
|
||||
Type = if hasNotify then "notify" else "simple";
|
||||
Restart = "on-abort";
|
||||
Restart = "on-abnormal";
|
||||
RestartSec = "5s";
|
||||
|
||||
# User and group
|
||||
|
||||
@@ -16,7 +16,7 @@ let
|
||||
{
|
||||
"--servers" = lib.concatStringsSep "," fe.servers;
|
||||
"--domain" = fe.domain;
|
||||
"--listen" = fe.listenAddress;
|
||||
"--listen" = stringOrConcat "," fe.listenAddresses;
|
||||
"--proxy-port" = fe.proxyPort;
|
||||
"--whois" = fe.whois;
|
||||
"--dns-interface" = fe.dnsInterface;
|
||||
@@ -37,7 +37,7 @@ let
|
||||
{
|
||||
"--allowed" = lib.concatStringsSep "," px.allowedIPs;
|
||||
"--bird" = px.birdSocket;
|
||||
"--listen" = px.listenAddress;
|
||||
"--listen" = stringOrConcat "," px.listenAddresses;
|
||||
"--traceroute_bin" = px.traceroute.binary;
|
||||
"--traceroute_flags" = lib.concatStringsSep " " px.traceroute.flags;
|
||||
"--traceroute_raw" = px.traceroute.rawOutput;
|
||||
@@ -58,6 +58,17 @@ let
|
||||
args: lib.mapAttrsToList (name: value: "${name} " + mkArgValue value) (filterNull args);
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "bird-lg" "frontend" "listenAddress" ]
|
||||
[ "services" "bird-lg" "frontend" "listenAddresses" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "bird-lg" "proxy" "listenAddress" ]
|
||||
[ "services" "bird-lg" "proxy" "listenAddresses" ]
|
||||
)
|
||||
];
|
||||
|
||||
options = {
|
||||
services.bird-lg = {
|
||||
package = lib.mkPackageOption pkgs "bird-lg" { };
|
||||
@@ -77,8 +88,8 @@ in
|
||||
frontend = {
|
||||
enable = lib.mkEnableOption "Bird Looking Glass Frontend Webserver";
|
||||
|
||||
listenAddress = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
listenAddresses = lib.mkOption {
|
||||
type = with lib.types; either str (listOf str);
|
||||
default = "127.0.0.1:5000";
|
||||
description = "Address to listen on.";
|
||||
};
|
||||
@@ -202,8 +213,8 @@ in
|
||||
proxy = {
|
||||
enable = lib.mkEnableOption "Bird Looking Glass Proxy";
|
||||
|
||||
listenAddress = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
listenAddresses = lib.mkOption {
|
||||
type = with lib.types; either str (listOf str);
|
||||
default = "127.0.0.1:8000";
|
||||
description = "Address to listen on.";
|
||||
};
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "1.0.127";
|
||||
hash = "sha256-wR8iBlHUSb0/vEWDqDSzHpbZPHr2Nfzw/xXGccDi+28=";
|
||||
version = "2.0.0";
|
||||
hash = "sha256-vd3ZT8iwmbUCeaHgiDGLzWehOj4j/hMinHiXQytwVz4=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "calva";
|
||||
publisher = "betterthantomorrow";
|
||||
version = "2.0.528";
|
||||
hash = "sha256-YnY15/I0bJ14J4KDU7AI6Y2lE7SWug/yoH0X+upqKzA=";
|
||||
version = "2.0.536";
|
||||
hash = "sha256-Q6T8Ab8kwOjdFM63SjTNEOgd+a6fL1PRGRredHzwg7U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -82,14 +82,14 @@ let
|
||||
];
|
||||
in
|
||||
mkDerivation rec {
|
||||
version = "3.40.10";
|
||||
version = "3.40.11";
|
||||
pname = "qgis-ltr-unwrapped";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-3FvHAoVeTwBvFNUxSCSumjiPg1hK3oRS1zMzWLXoSTc=";
|
||||
hash = "sha256-HjdOLG/x8qXTDlMKW6+jBuwi+36rBkBFM1OCe3BcjWY=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -82,14 +82,14 @@ let
|
||||
];
|
||||
in
|
||||
mkDerivation rec {
|
||||
version = "3.44.2";
|
||||
version = "3.44.3";
|
||||
pname = "qgis-unwrapped";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-ERaox5jqB7E/W0W6NnipHx1qfY2+FTHYf3r2l1KRkC0=";
|
||||
hash = "sha256-g7ZdNLal16b0Fbq492mPpOiNkYc3Bm4c7INWX+2e7H8=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
curl,
|
||||
xorg,
|
||||
avahi,
|
||||
qtbase,
|
||||
mkDerivation,
|
||||
openssl,
|
||||
wrapGAppsHook3,
|
||||
avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; },
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "barrier";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "debauchee";
|
||||
repo = "barrier";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2tHqLF3zS3C4UnOVIZfpcuzaemC9++nC7lXgFnFSfKU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch can be removed when a new version of barrier (greater than 2.4.0)
|
||||
# is released, which will contain this commit.
|
||||
(fetchpatch {
|
||||
name = "add-missing-cstddef-header.patch";
|
||||
url = "https://github.com/debauchee/barrier/commit/4b12265ae5d324b942698a3177e1d8b1749414d7.patch";
|
||||
sha256 = "sha256-ajMxP7szBFi4h8cMT3qswfa3k/QiJ1FGI3q9fkCFQQk=";
|
||||
})
|
||||
];
|
||||
|
||||
CXXFLAGS = [
|
||||
# error: 'uint8_t' is not a member of 'std'; did you mean 'wint_t'?
|
||||
"-include cstdint"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
xorg.libX11
|
||||
xorg.libXext
|
||||
xorg.libXtst
|
||||
avahiWithLibdnssdCompat
|
||||
qtbase
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier"
|
||||
'';
|
||||
|
||||
qtWrapperArgs = [
|
||||
''--prefix PATH : ${lib.makeBinPath [ openssl ]}''
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Open-source KVM software";
|
||||
longDescription = ''
|
||||
Barrier is KVM software forked from Symless's synergy 1.9 codebase.
|
||||
Synergy was a commercialized reimplementation of the original
|
||||
CosmoSynergy written by Chris Schoeneman.
|
||||
'';
|
||||
homepage = "https://github.com/debauchee/barrier";
|
||||
downloadPage = "https://github.com/debauchee/barrier/releases";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.phryneas ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "barrier";
|
||||
};
|
||||
}
|
||||
@@ -831,13 +831,13 @@
|
||||
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
|
||||
},
|
||||
"migadu": {
|
||||
"hash": "sha256-G9/xg4wpqPesRg3+iJU6j71eP8iiFBuQNbSOBpvRR50=",
|
||||
"hash": "sha256-XXtDXByaSnnUGLPiwUNTPTHqDOED7IJQsf8b9x0/R8E=",
|
||||
"homepage": "https://registry.terraform.io/providers/metio/migadu",
|
||||
"owner": "metio",
|
||||
"repo": "terraform-provider-migadu",
|
||||
"rev": "2025.9.18",
|
||||
"rev": "2025.9.25",
|
||||
"spdx": "0BSD",
|
||||
"vendorHash": "sha256-cmmTZNYnUebEUiRYZ300VqMz0AiuiTYLZyVOozqC8wo="
|
||||
"vendorHash": "sha256-1kequbTeMoCkLGlnr1TtXDj2agMGMugO2+czrt91ZHE="
|
||||
},
|
||||
"minio": {
|
||||
"hash": "sha256-+I1nTNxLVny0pgdMF7vXPC3WxkInSXnbeHcqgrWG55s=",
|
||||
@@ -1219,11 +1219,11 @@
|
||||
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
|
||||
},
|
||||
"signalfx": {
|
||||
"hash": "sha256-cZnG8WohzR4OPBoX9PHdbvsziPfcsR75apXZX8EwtEQ=",
|
||||
"hash": "sha256-Lx7L9S6uw++51LehLJSESJXXjLUhpMP4LRVGme85y6k=",
|
||||
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
|
||||
"owner": "splunk-terraform",
|
||||
"repo": "terraform-provider-signalfx",
|
||||
"rev": "v9.21.1",
|
||||
"rev": "v9.21.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-TMoZ1uR7G9oC7/9CiwC9rIJazqB9g6Xb+vxvYX2T9RY="
|
||||
},
|
||||
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
|
||||
if (builtins.elem system platforms) then
|
||||
sources.${system}
|
||||
else
|
||||
throw "Source for ${pname} is not available for ${system}";
|
||||
throw "Source for 1password-cli is not available for ${system}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@@ -63,23 +63,23 @@ stdenv.mkDerivation {
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D ${mainProgram} $out/bin/${mainProgram}
|
||||
install -D op $out/bin/op
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
HOME=$TMPDIR
|
||||
installShellCompletion --cmd ${mainProgram} \
|
||||
--bash <($out/bin/${mainProgram} completion bash) \
|
||||
--fish <($out/bin/${mainProgram} completion fish) \
|
||||
--zsh <($out/bin/${mainProgram} completion zsh)
|
||||
installShellCompletion --cmd op \
|
||||
--bash <($out/bin/op completion bash) \
|
||||
--fish <($out/bin/op completion fish) \
|
||||
--zsh <($out/bin/op completion zsh)
|
||||
'';
|
||||
|
||||
dontStrip = stdenv.hostPlatform.isDarwin;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
versionCheckProgram = "${builtins.placeholder "out"}/bin/${mainProgram}";
|
||||
versionCheckProgram = "${builtins.placeholder "out"}/bin/op";
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -109,9 +109,9 @@ stdenv.mkDerivation {
|
||||
cp -a * $out/share/1password
|
||||
|
||||
# Desktop file
|
||||
install -Dt $out/share/applications resources/${pname}.desktop
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace-fail 'Exec=/opt/1Password/${pname}' 'Exec=${pname}'
|
||||
install -Dt $out/share/applications resources/1password.desktop
|
||||
substituteInPlace $out/share/applications/1password.desktop \
|
||||
--replace-fail 'Exec=/opt/1Password/1password' 'Exec=1password'
|
||||
|
||||
''
|
||||
+ (lib.optionalString (polkitPolicyOwners != [ ]) ''
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
llvmPackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "aaphoto";
|
||||
version = "0.45";
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 NEWS README REMARKS TODO -t $out/share/doc/${pname}
|
||||
install -Dm644 NEWS README REMARKS TODO -t $out/share/doc/aaphoto
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
fetchurl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "acpi";
|
||||
version = "1.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/acpiclient/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-5kxuALU815dCfqMqFgUTQlsD7U8HdzP3Hx8J/zQPIws=";
|
||||
url = "mirror://sourceforge/acpiclient/${finalAttrs.version}/acpi-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-5kxuALU815dCfqMqFgUTQlsD7U8HdzP3Hx8J/zQPIws=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -27,4 +27,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -70,7 +70,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [
|
||||
Br1ght0ne
|
||||
neonfuz
|
||||
];
|
||||
teams = [ teams.pantheon ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@@ -9,13 +9,13 @@ let
|
||||
{ modRoot, vendorHash }:
|
||||
buildGoModule rec {
|
||||
pname = "bird-lg-${modRoot}";
|
||||
version = "1.3.8";
|
||||
version = "1.3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xddxdd";
|
||||
repo = "bird-lg-go";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-j81cfHqXNsTM93ofxXz+smkjN8OdJXxtm9z5LdzC+r8=";
|
||||
hash = "sha256-C0JC8vLLEk+d6vlrtuW7tHj06K7A3HBjKXZ5Nt+2i4I=";
|
||||
};
|
||||
|
||||
doDist = false;
|
||||
@@ -41,12 +41,12 @@ let
|
||||
|
||||
bird-lg-frontend = generic {
|
||||
modRoot = "frontend";
|
||||
vendorHash = "sha256-luJuIZ0xN8mdtWwTlfEDnAwMgt+Tzxlk2ZIDPIwHpcY=";
|
||||
vendorHash = "sha256-kNysGHtOUtYGHDFDlYNzdkCXGUll105Triy4UR7UP0M=";
|
||||
};
|
||||
|
||||
bird-lg-proxy = generic {
|
||||
modRoot = "proxy";
|
||||
vendorHash = "sha256-OVyfPmLTHV5RFdLgRHEH/GqxuG5MnGt9Koz0DxpSg+4=";
|
||||
vendorHash = "sha256-iosWHHeJyqMPF+Y01+mj70HDKWw0FAZKDpEESAwS/i4=";
|
||||
};
|
||||
in
|
||||
symlinkJoin {
|
||||
|
||||
@@ -24,8 +24,8 @@ mkDerivation {
|
||||
pname = "bruijn";
|
||||
version = "0.1.0.0";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/marvinborner/bruijn/archive/7d37a689cebcfa81821455ea7779a8052f7e1ab1.tar.gz";
|
||||
sha256 = "06rjlvwfyc2czc09r5sw9xiajlgpd1cma8qqj7v5af8dc1x1jxx5";
|
||||
url = "https://github.com/marvinborner/bruijn/archive/31ba54046e33618905fc99e0b079bd3aa2594284.tar.gz";
|
||||
sha256 = "11b3i32y36i29haym4agn1pgik20byldihgs2qsi5p7vy17z0a78";
|
||||
};
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
|
||||
@@ -1 +1 @@
|
||||
0-unstable-2025-09-24
|
||||
0-unstable-2025-09-28
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "1.0.128",
|
||||
"version": "2.0.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "1.0.128",
|
||||
"version": "2.0.1",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -2,23 +2,19 @@
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchzip,
|
||||
nodejs_20,
|
||||
writableTmpDirAsHomeHook,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "1.0.128";
|
||||
|
||||
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-dzLGcCgje3FMMS+Ptmxd2JK08y7z9rI0ak5l3Bv1MUk=";
|
||||
hash = "sha256-LUbDPFa0lY74MBU4hvmYVntt6hVZy6UUZFN0iB4Eno8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Ynoj85a/F9Jv4w2vRDnGqn/G6zkaPesNQNEdqAE5zOo=";
|
||||
npmDepsHash = "sha256-DehkeMZvzn+hvcCDzJfd4p9oYc1GSZm8gu8vKS4Uncw=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
Gliczy
|
||||
keenanweaver
|
||||
neonfuz
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "databricks-cli";
|
||||
version = "0.269.0";
|
||||
version = "0.270.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databricks";
|
||||
repo = "cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-E9wxDwWBLJYh1DKREfxxJ2kts6Gd52mxjCxjelI9NaM=";
|
||||
hash = "sha256-DCgj2IXGidWET8jCmmmuz9viOjdO89UqloZ5yvnXluk=";
|
||||
};
|
||||
|
||||
# Otherwise these tests fail asserting that the version is 0.0.0-dev
|
||||
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
|
||||
--replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}"
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-1XQ88nSziZ2+iWrHk4P0wGJo3jR9dGKMsdRZLqG+ouQ=";
|
||||
vendorHash = "sha256-U5H20Csk8EhIqmUBN8DVYA5jta2LoGLs/EYiZbGo6Tc=";
|
||||
|
||||
excludedPackages = [
|
||||
"bundle/internal"
|
||||
|
||||
@@ -1,15 +1,18 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dcw-gmt";
|
||||
version = "2.1.2";
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-S7hA0HXIuj4UrrQc8XwkI2v/eHVmMU+f91irmXd0XZk=";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GenericMappingTools";
|
||||
repo = "dcw-gmt";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-OgFonNbhvzRfQZksnwIbgASbMGnL0bmD4wkXZBl3kIU=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -18,16 +21,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.soest.hawaii.edu/pwessel/dcw/";
|
||||
homepage = "https://github.com/GenericMappingTools/dcw-gmt";
|
||||
description = "Vector basemap of the world, for use with GMT";
|
||||
longDescription = ''
|
||||
DCW-GMT is an enhancement to the original 1:1,000,000 scale vector basemap
|
||||
of the world, available from the Princeton University Digital Map and
|
||||
Geospatial Information Center. It contains more state boundaries (the
|
||||
largest 8 countries are now represented) than the original data
|
||||
source. Information about DCW can be found on Wikipedia
|
||||
(https://en.wikipedia.org/wiki/Digital_Chart_of_the_World). This data is
|
||||
for use by GMT, the Generic Mapping Tools.
|
||||
The Digital Chart of the World is a comprehensive 1:1,000,000 scale vector
|
||||
basemap of the world. The charts were designed to meet the needs of pilots
|
||||
and air crews in medium- and low-altitude en route navigation and to
|
||||
support military operational planning, intelligence briefings, and other
|
||||
needs. For basic background information about DCW, see the [Wikipedia
|
||||
entry](http://en.wikipedia.org/wiki/Digital_Chart_of_the_World).
|
||||
|
||||
DCW-GMT is an enhancement to DCW in a few ways:
|
||||
|
||||
- It contains more state boundaries (the largest 8 countries, Great Britain and Norway are now represented).
|
||||
- The data have been reformatted to save space and are distributed as a single deflated netCDF-4 file.
|
||||
'';
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ tviti ];
|
||||
|
||||
@@ -72,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tags.
|
||||
'';
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ neonfuz ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "dwm";
|
||||
};
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "eigenwallet";
|
||||
version = "3.0.1";
|
||||
version = "3.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-/yVx/FW+sVYPtpQNl03A3JNe4CbxRbo4OkvY/Kxnw8Y=";
|
||||
hash = "sha256-2BC6ii4mS3lGowqNl5VEAjUXYjXXnQQDNcfAytCTi7M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -49,6 +49,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
badPlatforms = platforms.darwin;
|
||||
maintainers = with maintainers; [ neonfuz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "golds";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go101";
|
||||
repo = "golds";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RM9ltqkOByOg1ZUF7ZXZcWTivlUKrNbZYgcFpwRwNUk=";
|
||||
hash = "sha256-6jtBwET3JSSh2DQq9MtLn2YokfK9ODYtYrcfI0W8m5I=";
|
||||
};
|
||||
|
||||
# nixpkgs is not using the go distpack archive and missing a VERSION file in the source
|
||||
|
||||
@@ -170,11 +170,11 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "140.0.7339.185";
|
||||
version = "140.0.7339.207";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-cPAbDVevr/vtBwLn+bcPmQHNfLrh+Ogw3rDKV5pwB2M=";
|
||||
hash = "sha256-5g0t+EEJJeItjqKiTpp5qE/bkGKkxvOvLaxh5jCDPss=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@@ -275,11 +275,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "140.0.7339.186";
|
||||
version = "140.0.7339.214";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/acyk4e3hewde2niid4gmhjus7t7q_140.0.7339.186/GoogleChrome-140.0.7339.186.dmg";
|
||||
hash = "sha256-ygXHbTJ4z7knRzTQG9uEgas7360wHgV9vaYYm0iyGOg=";
|
||||
url = "http://dl.google.com/release2/chrome/mfmmq5vcqbb2jdp3e77lsymylu_140.0.7339.214/GoogleChrome-140.0.7339.214.dmg";
|
||||
hash = "sha256-oTyyTHMs3VhGRXWoVlGXvNvwnOWb1eF7iswfJkl8Pe0=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -12,18 +12,19 @@
|
||||
libjxl,
|
||||
libspng,
|
||||
libwebp,
|
||||
pango,
|
||||
pixman,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprgraphics";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprgraphics";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A=";
|
||||
hash = "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libjxl
|
||||
libspng
|
||||
libwebp
|
||||
pango
|
||||
pixman
|
||||
];
|
||||
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "icoextract";
|
||||
version = "0.1.5";
|
||||
version = "0.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jlu5";
|
||||
repo = "icoextract";
|
||||
rev = version;
|
||||
hash = "sha256-McVG8966NCEpzc9biawLvUgbQUtterkIud/9GwOeltI=";
|
||||
hash = "sha256-GJCe7oFUidJt21F4NmOXspxZGRQXIjQvFjFhMYsHLjk=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
@@ -29,9 +29,6 @@ python3Packages.buildPythonApplication rec {
|
||||
pythonImportsCheck = [ "icoextract" ];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace exe-thumbnailer.thumbnailer \
|
||||
--replace Exec=exe-thumbnailer Exec=$out/bin/exe-thumbnailer
|
||||
|
||||
install -Dm644 exe-thumbnailer.thumbnailer -t $out/share/thumbnailers
|
||||
'';
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "immich-go";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simulot";
|
||||
repo = "immich-go";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TvvoFe7uyuollKTsioIkdcXTDOZqE+hPkZTPk+PNEqQ=";
|
||||
hash = "sha256-H/ch6W9PrVg7MnQ6/QcMhadihjWx5oHlC7z4oZmjyvQ=";
|
||||
|
||||
# Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32
|
||||
# The intention here is to write the information into files in the `src`'s
|
||||
@@ -32,7 +32,7 @@ buildGoModule rec {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qJdxpOUB5OPKIz39cqELJorstsagwrJ0W5AKBDlIxzs=";
|
||||
vendorHash = "sha256-EAlslQsLuOp1yrSi0wsNoSqyHnGvLHrf8np4rKrn9yY=";
|
||||
|
||||
# options used by upstream:
|
||||
# https://github.com/simulot/immich-go/blob/v0.25.0/.goreleaser.yaml
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "komodo";
|
||||
version = "1.19.4";
|
||||
version = "1.19.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moghtech";
|
||||
repo = "komodo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zUfCcd5ptHQZmg6L5M23d7YuLjjFjutNCtxziXMpF/Q=";
|
||||
hash = "sha256-dLBgdcrIp5QM2TVIa86qX7m1c5n+qOIQJtqJPGvIZ+0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9bNbTk9kHLgHoYMRU4Le7WtEbrqQKjJVnetsoe0YTqE=";
|
||||
cargoHash = "sha256-jf/Jp28g3inGn5jQp3cACdhl//tbXTMc1vP1K3g/CyQ=";
|
||||
|
||||
# disable for check. document generation is fail
|
||||
# > error: doctest failed, to rerun pass `-p komodo_client --doc`
|
||||
|
||||
@@ -73,7 +73,7 @@ buildNpmPackage {
|
||||
type = "Application";
|
||||
desktopName = "KopiaUI";
|
||||
comment = "Fast and secure open source backup.";
|
||||
icon = "kopia-ui";
|
||||
icon = "kopia";
|
||||
exec = "kopia-ui";
|
||||
categories = [ "Utility" ];
|
||||
})
|
||||
|
||||
@@ -138,7 +138,6 @@ stdenv.mkDerivation {
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
contrun
|
||||
neonfuz
|
||||
liberodark
|
||||
];
|
||||
};
|
||||
|
||||
@@ -39,16 +39,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "liana";
|
||||
version = "12.0"; # keep in sync with lianad
|
||||
version = "13.0"; # keep in sync with lianad
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wizardsardine";
|
||||
repo = "liana";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TZUNYr7p4P/++eX9ZNU/d1IurPrkZn/PJmJOsB01VMY=";
|
||||
hash = "sha256-zr9FZZSLPMk2d5vyZqrj12RG4UCdmkyKLjTU7XpgedE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Hb5icOKgQiDzFLWwUfkwXcr1vn80QcAr+fKwG37PkYc=";
|
||||
cargoHash = "sha256-uLSlx1WWCcngL1WSP3jOvwFJd/gbz/g9AT6Of9rwEMw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libnspsl";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.netsurf-browser.org/libs/releases/libnspsl-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs=";
|
||||
hash = "sha256-NoTOwy9VXa7UMZk+C/bL2TdPbJCERiN+CJ8LYdaUrIA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -27,11 +27,14 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
validatePkgConfig
|
||||
geos # for geos-config
|
||||
];
|
||||
|
||||
buildInputs = [ geos ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-geosconfig=${lib.getExe' (lib.getDev geos) "geos-config"}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -45,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
validatePkgConfig
|
||||
geos # for geos-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -62,6 +61,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libiconv
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-geosconfig=${lib.getExe' (lib.getDev geos) "geos-config"}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
|
||||
@@ -7,10 +7,10 @@
|
||||
let
|
||||
pname = "lmstudio";
|
||||
|
||||
version_aarch64-darwin = "0.3.26-6";
|
||||
hash_aarch64-darwin = "sha256-2ss6lMU4vb3m23v1qQWFn4U1p+fZ2mSGVVkKw3ETgXc=";
|
||||
version_x86_64-linux = "0.3.26-6";
|
||||
hash_x86_64-linux = "sha256-UKdopw/sMuXY460KA9Oj8ckANdFDt2VApEsSZ1Gh1Wo=";
|
||||
version_aarch64-darwin = "0.3.27-4";
|
||||
hash_aarch64-darwin = "sha256-KEgUgfYG6yHZzTaKpGiSkyhZcb3W2KTlIhnbQdKpYm0=";
|
||||
version_x86_64-linux = "0.3.27-4";
|
||||
hash_x86_64-linux = "sha256-CU7kfcyo054UvjSar5QB2aGrCPAdh1EMqEJyZkv7Mdk=";
|
||||
|
||||
meta = {
|
||||
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
#
|
||||
# Ensure you also check ../mattermostLatest/package.nix.
|
||||
regex = "^v(10\\.5\\.[0-9]+)$";
|
||||
version = "10.5.10";
|
||||
srcHash = "sha256-fQqUoSo8saERRfgx4OT26VQktejzYPPqBIL2OA0PQy0=";
|
||||
version = "10.5.11";
|
||||
srcHash = "sha256-2XX6SNWlu+2Kh0rJodp0Ipzu8/gdjygCxeD2BVYDcTc=";
|
||||
vendorHash = "sha256-uryErnXPVd/gmiAk0F2DVaqz368H6j97nBn0eNW7DFk=";
|
||||
npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0=";
|
||||
lockfileOverlay = ''
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
--- a/ports/unix/Makefile
|
||||
+++ b/ports/unix/Makefile
|
||||
@@ -31,7 +31,7 @@
|
||||
QSTR_GLOBAL_DEPENDENCIES += $(VARIANT_DIR)/mpconfigvariant.h
|
||||
|
||||
# OS name, for simple autoconfig
|
||||
-UNAME_S := $(shell uname -s)
|
||||
+UNAME_S := @UNAME_S@
|
||||
|
||||
# include py core make definitions
|
||||
include $(TOP)/py/py.mk
|
||||
@@ -151,7 +151,7 @@
|
||||
# If the variant enables it, enable modbluetooth.
|
||||
ifeq ($(MICROPY_PY_BLUETOOTH),1)
|
||||
ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
|
||||
-HAVE_LIBUSB := $(shell (which pkg-config > /dev/null && pkg-config --exists libusb-1.0) 2>/dev/null && echo '1')
|
||||
+HAVE_LIBUSB := $(shell (which @PKG_CONFIG@ > /dev/null && @PKG_CONFIG@ --exists libusb-1.0) 2>/dev/null && echo '1')
|
||||
|
||||
# Figure out which BTstack transport to use.
|
||||
ifeq ($(HAVE_LIBUSB),1)
|
||||
@@ -180,8 +180,8 @@
|
||||
endif
|
||||
else
|
||||
# Use system version of libffi.
|
||||
-LIBFFI_CFLAGS := $(shell pkg-config --cflags libffi)
|
||||
-LIBFFI_LDFLAGS := $(shell pkg-config --libs libffi)
|
||||
+LIBFFI_CFLAGS := $(shell @PKG_CONFIG@ --cflags libffi)
|
||||
+LIBFFI_LDFLAGS := $(shell @PKG_CONFIG@ --libs libffi)
|
||||
endif
|
||||
|
||||
ifeq ($(UNAME_S),Linux)
|
||||
@@ -0,0 +1,13 @@
|
||||
--- a/mpy-cross/mpy_cross/__init__.py
|
||||
+++ b/mpy-cross/mpy_cross/__init__.py
|
||||
@@ -61,6 +61,10 @@
|
||||
def _find_mpy_cross_binary(mpy_cross):
|
||||
if mpy_cross:
|
||||
return mpy_cross
|
||||
+ # Check for MPY_CROSS environment variable first (for cross-compilation)
|
||||
+ env_mpy_cross = os.environ.get("MPY_CROSS")
|
||||
+ if env_mpy_cross:
|
||||
+ return env_mpy_cross
|
||||
return os.path.abspath(os.path.join(os.path.dirname(__file__), "../build/mpy-cross"))
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
python3,
|
||||
libffi,
|
||||
readline,
|
||||
buildPackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -43,6 +44,33 @@ stdenv.mkDerivation rec {
|
||||
extraPrefix = "lib/mbedtls/";
|
||||
hash = "sha256-Sllp/iWWEhykMJ3HALw5KzR4ta22120Jcl51JZCkZE0=";
|
||||
})
|
||||
./fix-cross-compilation.patch
|
||||
./fix-mpy-cross-path.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix cross-compilation by replacing uname and pkg-config
|
||||
substituteInPlace ports/unix/Makefile \
|
||||
--subst-var-by UNAME_S "${
|
||||
{
|
||||
"x86_64-linux" = "Linux";
|
||||
"i686-linux" = "Linux";
|
||||
"aarch64-linux" = "Linux";
|
||||
"armv7l-linux" = "Linux";
|
||||
"armv6l-linux" = "Linux";
|
||||
"riscv64-linux" = "Linux";
|
||||
"powerpc64le-linux" = "Linux";
|
||||
"x86_64-darwin" = "Darwin";
|
||||
"aarch64-darwin" = "Darwin";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or stdenv.hostPlatform.parsed.kernel.name
|
||||
}" \
|
||||
--subst-var-by PKG_CONFIG "${stdenv.cc.targetPrefix}pkg-config"
|
||||
'';
|
||||
|
||||
depsBuildBuild = [
|
||||
buildPackages.stdenv.cc
|
||||
buildPackages.python3
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -58,8 +86,25 @@ stdenv.mkDerivation rec {
|
||||
makeFlags = [
|
||||
"-C"
|
||||
"ports/unix"
|
||||
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
|
||||
# Workaround for false positive gcc warning in mbedtls on aarch64
|
||||
"CFLAGS_EXTRA=-Wno-array-bounds"
|
||||
]; # also builds mpy-cross
|
||||
|
||||
# Build mpy-cross for the build platform first when cross-compiling
|
||||
preBuild = ''
|
||||
# Build mpy-cross for the build platform
|
||||
make -C mpy-cross \
|
||||
CC="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" \
|
||||
CROSS_COMPILE=""
|
||||
''
|
||||
+ lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
# Set MPY_CROSS environment variable for cross-compilation
|
||||
export MPY_CROSS="$PWD/mpy-cross/build/mpy-cross"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
@@ -87,7 +132,6 @@ stdenv.mkDerivation rec {
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -Dm755 ports/unix/build-standard/micropython -t $out/bin
|
||||
install -Dm755 mpy-cross/build/mpy-cross -t $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "models-dev";
|
||||
version = "0-unstable-2025-09-26";
|
||||
version = "0-unstable-2025-09-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sst";
|
||||
repo = "models.dev";
|
||||
rev = "ac659a30024a3d2d9729ec4b8572985a78f0d4aa";
|
||||
hash = "sha256-GZ1fIoSp/1gFGbOyuzOY1ufjWfz7py4tLzrpBkRV50Q=";
|
||||
rev = "47a71d06c57055a7c347ff04b3c7cfcaf1fa9462";
|
||||
hash = "sha256-fv6u/Hpmt5KUGSN/P7mrqbWAx7kHsMeIjiLaRUQqG90=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "msbuild-structured-log-viewer";
|
||||
version = "2.3.42";
|
||||
version = "2.3.60";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KirillOsenkov";
|
||||
repo = "MSBuildStructuredLog";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-C6fArtGQd6XugbzI2TjTKQj0O6JGFz+kjsBF5pVJpPY=";
|
||||
hash = "sha256-IjiZfsrkaTgqNBPD4Zw9t6DzAlMjnXZgkpFk7pwgsWI=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nsgenbind";
|
||||
version = "0.8";
|
||||
version = "0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.netsurf-browser.org/libs/releases/nsgenbind-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-TY1TrQAK2nEncjZeanPrj8XOl1hK+chlrFsmohh/HLM=";
|
||||
hash = "sha256-Iyzg9my8LD7tYoiuJt4sVnu/u8Adiw9vxsHBZJ1LOF0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -29,20 +29,21 @@
|
||||
assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
assert (blas.isILP64 == arpack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "octopus";
|
||||
version = "16.0";
|
||||
version = "16.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "octopus-code";
|
||||
repo = "octopus";
|
||||
rev = version;
|
||||
hash = "sha256-sByiRTgAntJtSeL4h+49Mi9Rcxw2wK/BvXvsePa77HE=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-L97igB+bdZ19zpbffHi8DVSJXKtUyDqauUB+l5zzFwQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Discover all MPI languages components to avoid scalpack discovery failure
|
||||
./scalapack-mpi-alias.patch
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"testsuite"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -78,11 +79,11 @@ stdenv.mkDerivation rec {
|
||||
(lib.cmakeBool "OCTOPUS_MPI" enableMpi)
|
||||
(lib.cmakeBool "OCTOPUS_ScaLAPACK" enableMpi)
|
||||
(lib.cmakeBool "OCTOPUS_OpenMP" true)
|
||||
(lib.cmakeBool "OCTOPUS_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||
];
|
||||
|
||||
nativeCheckInputs = lib.optional.enableMpi mpi;
|
||||
doCheck = false;
|
||||
checkTarget = "check-short";
|
||||
nativeCheckInputs = lib.optional enableMpi mpi;
|
||||
doCheck = false; # requires installed data
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./
|
||||
@@ -92,15 +93,20 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs testsuite/oct-run_testsuite.sh
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $testsuite
|
||||
moveToOutput share/octopus/testsuite $testsuite
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = lib.attrsets.optionalAttrs enableMpi { inherit mpi; };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Real-space time dependent density-functional theory code";
|
||||
homepage = "https://octopus-code.org";
|
||||
maintainers = with maintainers; [ markuskowa ];
|
||||
license = with licenses; [
|
||||
maintainers = with lib.maintainers; [ markuskowa ];
|
||||
license = with lib.licenses; [
|
||||
gpl2Only
|
||||
asl20
|
||||
lgpl3Plus
|
||||
@@ -108,4 +114,4 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 70d89efb5e..47ba750d7a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -131,7 +131,7 @@ set(Octopus_ext_libs)
|
||||
find_package(GSL)
|
||||
if (OCTOPUS_MPI)
|
||||
set(MPI_DETERMINE_LIBRARY_VERSION ON)
|
||||
- find_package(MPI 3 COMPONENTS Fortran)
|
||||
+ find_package(MPI 3)
|
||||
# Further set MKL variables
|
||||
if (MPI_Fortran_LIBRARY_VERSION_STRING MATCHES Intel)
|
||||
set(MKL_MPI intelmpi CACHE STRING "Octopus: Overloaded")
|
||||
@@ -14,13 +14,13 @@ assert
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "opa-envoy-plugin";
|
||||
version = "1.8.0-envoy";
|
||||
version = "1.9.0-envoy";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "opa-envoy-plugin";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tPPF/zCwPShejBZZO1Kw7+jd4BpTU81DeIUxxz9b0RY=";
|
||||
hash = "sha256-Arc0aVDcGZqCrrUrAB9yVXSXzdtOlXEFGZ8pJ578oKk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
Generated
+145
@@ -0,0 +1,145 @@
|
||||
{
|
||||
"!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
|
||||
"!version": 1,
|
||||
"https://download.eclipse.org": {
|
||||
"eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355": {
|
||||
"jar": "sha256-Q048o4oWnZ9Y33AxXiSxbxEeayfbWOf1HoxtoLS4SIs="
|
||||
},
|
||||
"eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.aarch64_3.124.200.v20231113-1355": {
|
||||
"jar": "sha256-j98ySq5bTxFHbDJKzWMZP+kfUqekWU1jYUJNDyNg9js="
|
||||
}
|
||||
},
|
||||
"https://github.com": {
|
||||
"unicode-org/icu/releases/download/release-74-2/icu4c-74_2-data-bin-l": {
|
||||
"zip": "sha256-Ks2xuYIigECWPRg7LdnTISUsYT4PTbIT1LvBBBfN5Wk="
|
||||
}
|
||||
},
|
||||
"https://repo.maven.apache.org/maven2": {
|
||||
"com/ibm/icu#icu4j/61.1": {
|
||||
"jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=",
|
||||
"pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs="
|
||||
},
|
||||
"net/java#jvnet-parent/3": {
|
||||
"pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
|
||||
},
|
||||
"org/abego/treelayout#org.abego.treelayout.core/1.0.3": {
|
||||
"jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=",
|
||||
"pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw="
|
||||
},
|
||||
"org/antlr#ST4/4.1": {
|
||||
"jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=",
|
||||
"pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw="
|
||||
},
|
||||
"org/antlr#antlr-master/3.5.2": {
|
||||
"pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y="
|
||||
},
|
||||
"org/antlr#antlr-runtime/3.5.2": {
|
||||
"jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=",
|
||||
"pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU="
|
||||
},
|
||||
"org/antlr#antlr4-master/4.7.2": {
|
||||
"pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE="
|
||||
},
|
||||
"org/antlr#antlr4-runtime/4.7.2": {
|
||||
"jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=",
|
||||
"pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs="
|
||||
},
|
||||
"org/antlr#antlr4/4.7.2": {
|
||||
"pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E="
|
||||
},
|
||||
"org/antlr#antlr4/4.7.2/complete": {
|
||||
"jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ="
|
||||
},
|
||||
"org/apache#apache/13": {
|
||||
"pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
|
||||
},
|
||||
"org/apache/lucene#lucene-core/7.7.3": {
|
||||
"jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=",
|
||||
"pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo="
|
||||
},
|
||||
"org/apache/lucene#lucene-grouping/7.7.3": {
|
||||
"jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=",
|
||||
"pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU="
|
||||
},
|
||||
"org/apache/lucene#lucene-parent/7.7.3": {
|
||||
"pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU="
|
||||
},
|
||||
"org/apache/lucene#lucene-queries/7.7.3": {
|
||||
"jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=",
|
||||
"pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA="
|
||||
},
|
||||
"org/apache/lucene#lucene-queryparser/7.7.3": {
|
||||
"jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=",
|
||||
"pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI="
|
||||
},
|
||||
"org/apache/lucene#lucene-sandbox/7.7.3": {
|
||||
"jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=",
|
||||
"pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI="
|
||||
},
|
||||
"org/apache/lucene#lucene-solr-grandparent/7.7.3": {
|
||||
"pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4="
|
||||
},
|
||||
"org/apiguardian#apiguardian-api/1.1.2": {
|
||||
"jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
|
||||
"module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
|
||||
"pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
|
||||
},
|
||||
"org/glassfish#javax.json/1.0.4": {
|
||||
"jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=",
|
||||
"pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ="
|
||||
},
|
||||
"org/glassfish#json/1.0.4": {
|
||||
"pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY="
|
||||
},
|
||||
"org/junit#junit-bom/5.12.2": {
|
||||
"module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=",
|
||||
"pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc="
|
||||
},
|
||||
"org/junit/jupiter#junit-jupiter-api/5.12.2": {
|
||||
"jar": "sha256-C5ynKOS82a3FfyneuVVv+e1eCLTohDuHWrpOTj4E8JI=",
|
||||
"module": "sha256-VFfyRO3hjRFzbwfrnF8wklrrCW5Cw1m2oEqaDgOyKes=",
|
||||
"pom": "sha256-VmKCFmSJvUCxLDUHuZXkj44CXgmgXn0W3SuY3GQs994="
|
||||
},
|
||||
"org/junit/jupiter#junit-jupiter-engine/5.12.2": {
|
||||
"jar": "sha256-9XbAa4rM3pmFBjuLyAUmy5gO7CTe4LciH8jd16zmWAA=",
|
||||
"module": "sha256-0W0wjmqiWjCz75JNnf5PiJqb/ybqvXLvMO6oH864SBU=",
|
||||
"pom": "sha256-PHGRdFCb6dsfqBesY7eLIfH2fQaL5HHaPQR4G9RAKqM="
|
||||
},
|
||||
"org/junit/jupiter#junit-jupiter-params/5.12.2": {
|
||||
"jar": "sha256-shn/qUm5CnGqO2wrYGRWuCvKCyCJt0Wcj/RhFW/1mw8=",
|
||||
"module": "sha256-x3KP8z0SJgBzLq09DW+K3XRd4+lEFRmHE5WuiZymFHQ=",
|
||||
"pom": "sha256-pcfvF8refV90q2IHK7xrxxy9AWgGJGvOQl/LvBEISTw="
|
||||
},
|
||||
"org/junit/jupiter#junit-jupiter/5.12.2": {
|
||||
"jar": "sha256-OFSzrUNJBrgn/sR0qg2NqLVunlbV/H8uIPw/EuxL6JQ=",
|
||||
"module": "sha256-ioIpqKD4Se/BzD/9XPlN4W6sgAYcX5M5eoXAk8nX6nA=",
|
||||
"pom": "sha256-ka2OSkvzBCMslByQFKyRNnvroTHx21jVv+SZx5DUbxc="
|
||||
},
|
||||
"org/junit/platform#junit-platform-commons/1.12.2": {
|
||||
"jar": "sha256-5oOgHoXfq+pSDAVqxgFaYWJ1bmAuxlPA2oXiM/CvvBg=",
|
||||
"module": "sha256-ZMeQwnpztFz8b4TMtotI92SQNIZ+Fo1iJ1TUlmkrwic=",
|
||||
"pom": "sha256-TyuKkGXJCcaJLYYi1VO2qwpwMhYkSZ47acEon1nswHc="
|
||||
},
|
||||
"org/junit/platform#junit-platform-engine/1.12.2": {
|
||||
"jar": "sha256-zvDvy1vS4F4rgI04urXGVQicDDABUnN250y2BqeRHsg=",
|
||||
"module": "sha256-+Xsxk2wRnAgtTQOM3resDmVvRR2eXX6Jg9IqJONvoQM=",
|
||||
"pom": "sha256-lICxinlldp0Ag8LLcRBUI/UwKo8Ea7IEfm2/8J84NJA="
|
||||
},
|
||||
"org/junit/platform#junit-platform-launcher/1.12.2": {
|
||||
"jar": "sha256-3M8sH6Cpd8U60JSthZv93dUk2XWUt2MHrXh95xmFdX8=",
|
||||
"module": "sha256-UKBqBDdOMA57hhWIxdwNAhQh4Z8ToL2ymwYX/y/ehdE=",
|
||||
"pom": "sha256-YZFFzSFdMiJTcr5iW7ooaD10FC/uGl39scZLUv6cC1E="
|
||||
},
|
||||
"org/opentest4j#opentest4j/1.3.0": {
|
||||
"jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
|
||||
"module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
|
||||
"pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
|
||||
},
|
||||
"org/sonatype/oss#oss-parent/7": {
|
||||
"pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
|
||||
},
|
||||
"org/sonatype/oss#oss-parent/9": {
|
||||
"pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"hash": "sha256-O8ogDcM/YYYwFmYqglc48m11lcbjqxeYbjsB6crY1bU=",
|
||||
"owner": "openjdk",
|
||||
"repo": "jfx25u",
|
||||
"rev": "refs/tags/25+29"
|
||||
}
|
||||
@@ -37,12 +37,14 @@
|
||||
jdk21_headless,
|
||||
jdk23_headless,
|
||||
jdk24_headless,
|
||||
jdk25_headless,
|
||||
jdk-bootstrap ?
|
||||
{
|
||||
"17" = jdk17_headless;
|
||||
"21" = jdk21_headless;
|
||||
"23" = jdk23_headless;
|
||||
"24" = jdk24_headless;
|
||||
"25" = jdk25_headless;
|
||||
}
|
||||
.${featureVersion},
|
||||
}:
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "OpenTabletDriver";
|
||||
version = "0.6.5.1";
|
||||
version = "0.6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenTabletDriver";
|
||||
repo = "OpenTabletDriver";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PpgqmeQRGZew0+HD4xtbimc25XPEfgW69VfJf+TlYC4=";
|
||||
hash = "sha256-NS/r4FU3dT7UT+R7NryRnU5RfLEN0E6pSqtNDpKMS7U=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
@@ -83,9 +83,6 @@ buildDotnetModule (finalAttrs: {
|
||||
"OpenTabletDriver.Tests.UpdaterTests.Install_Copies_AppDataFiles"
|
||||
# Depends on processor load
|
||||
"OpenTabletDriver.Tests.TimerTests.TimerAccuracy"
|
||||
# Can't find Configurations directory, remove after https://github.com/OpenTabletDriver/OpenTabletDriver/pull/3796
|
||||
"OpenTabletDriver.Tests.ConfigurationTest.Configurations_Verify_Configs_With_Schema"
|
||||
"OpenTabletDriver.Tests.ConfigurationTest.Configurations_Are_Linted"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -22,6 +22,5 @@ rustPlatform.buildRustPackage rec {
|
||||
mainProgram = "pinyin-tool";
|
||||
homepage = "https://github.com/briankung/pinyin-tool";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ neonfuz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
autoreconfHook,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
lib,
|
||||
libtraceevent,
|
||||
nix-update-script,
|
||||
@@ -16,15 +17,24 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rasdaemon";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mchehab";
|
||||
repo = "rasdaemon";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-veaqAbSJvoUzkn1OLYY3t3y9Bh8dzuenpLGO2yz/yaM=";
|
||||
hash = "sha256-SpMNkeJkjaWteWsIScRnzNILf+PtVu1sX9e6ctwm3G0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/mchehab/rasdaemon/pull/212
|
||||
(fetchpatch {
|
||||
name = "fix_buffer_overflow_in_add_event_handler_read.patch";
|
||||
url = "https://github.com/mchehab/rasdaemon/commit/46bed1b6845bcb560d760b4cacea7df67cd6d1fd.patch";
|
||||
hash = "sha256-5T5U2i0i/7MpHzqpPq6mn2ghSUj9O6BzY11VcySgCMo=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "reindeer";
|
||||
version = "2025.09.15.00";
|
||||
version = "2025.09.29.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookincubator";
|
||||
repo = "reindeer";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fWfN+x3QuXHX/+0UQ1FW6I1bLIZ1s+McXUEesBtc6wQ=";
|
||||
hash = "sha256-vZ4yKyvGvQOiUDV+i6c1pWURYoXBSjGZqTjAB0yDFDw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VcB2WxEjn/XbjnZdQE6D6xKuoGMH1SCITU+C4tVnZHw=";
|
||||
cargoHash = "sha256-kNLspdJiJGcl4epqJzemqjP44aXfkzJs1EX9cZwAhE8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -154,7 +154,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "PS3 emulator/debugger";
|
||||
homepage = "https://rpcs3.net/";
|
||||
maintainers = with maintainers; [
|
||||
neonfuz
|
||||
ilian
|
||||
];
|
||||
license = licenses.gpl2Only;
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sentry-native";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-native";
|
||||
tag = version;
|
||||
hash = "sha256-PEm6Vu5MTT+T28jNnsRkHQo2k3o1ZbHQV8hOo7VKNbQ=";
|
||||
hash = "sha256-1BZtlGeSnop0ti/XhrmDxzZOFwzS6bagcZ4+7tM5zEk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -35,20 +35,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "siyuan";
|
||||
version = "3.3.2";
|
||||
version = "3.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siyuan-note";
|
||||
repo = "siyuan";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-haZwGJKRRAguCbY7C+kBIOq5Cr0lymGbRH90oarYUpE=";
|
||||
hash = "sha256-J3IWPWa4L16kaapMifViFOVRP8OrWIN1F+v4CfPm3y8=";
|
||||
};
|
||||
|
||||
kernel = buildGoModule {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "${finalAttrs.src.name}/kernel";
|
||||
vendorHash = "sha256-joLfVa6xi03JmQBIj08dTyDMPn0q2LqwJtfUJRYW+4c=";
|
||||
vendorHash = "sha256-/mB0aQtTOTmaTEEkOIgwIcDDi4quxe5/ttvJJr3cnlQ=";
|
||||
|
||||
patches = [
|
||||
(replaceVars ./set-pandoc-path.patch {
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "smfh";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "feel-co";
|
||||
repo = "smfh";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-/9Ww10kYopxfCNNnNDwENTubs7Wzqlw+O6PJAHNOYQw=";
|
||||
hash = "sha256-LxLu578DRp1l3ekybZ+g6zNbvt27rOx7wORP9ch5O2c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MpqbmhjNsE1krs7g3zWSXGxzb4G/A+cz/zxD2Jk2HC8=";
|
||||
cargoHash = "sha256-DOE0Bs09TRP7fUqzB0mdylFc1vYsRjcz9chrQG79ajg=";
|
||||
|
||||
meta = {
|
||||
description = "Sleek Manifest File Handler";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "smtp4dev";
|
||||
version = "3.10.2";
|
||||
version = "3.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rnwood";
|
||||
repo = "smtp4dev";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-0j5r5YO1wHg3N/OX81UE2YCqhqIaQuSGZa2uh2y+zqs=";
|
||||
hash = "sha256-bbo4kke0deZQoD08dbUKsLUhjg/z7TaIr5qmU4SETNg=";
|
||||
};
|
||||
|
||||
patches = [ ./smtp4dev-npm-packages.patch ];
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
coin3d,
|
||||
qt6,
|
||||
testers,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "soqt";
|
||||
version = "1.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin3d";
|
||||
repo = "soqt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-H904mFfrELjB6ZVhypaKJd+pu5y+aVV4foryrsN7IqE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
coin3d
|
||||
qt6.qtbase
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
cmake-config = testers.hasCmakeConfigModules {
|
||||
moduleNames = [ "soqt" ];
|
||||
package = finalAttrs.finalPackage;
|
||||
nativeBuildInputs = [ qt6.wrapQtAppsHook ];
|
||||
};
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/coin3d/soqt";
|
||||
license = lib.licenses.bsd3;
|
||||
description = "Glue between Coin high-level 3D visualization library and Qt";
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
let
|
||||
pname = "trilium-desktop";
|
||||
version = "0.98.1";
|
||||
version = "0.99.0";
|
||||
|
||||
triliumSource = os: arch: hash: {
|
||||
url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip";
|
||||
@@ -26,10 +26,10 @@ let
|
||||
darwinSource = triliumSource "macos";
|
||||
|
||||
# exposed like this for update.sh
|
||||
x86_64-linux.hash = "sha256-e8duXDIODrU3eYuZvUcOoT8pAquRIOQ1aUtceY49s+s=";
|
||||
aarch64-linux.hash = "sha256-HtNzzlnqApwt04R9W6cby8J/0xuYdUX2kMN4vBNKeiQ=";
|
||||
x86_64-darwin.hash = "sha256-guM1FmDD+J0oBEH+hCzXBkrF0bzvyp5yvCeIO7mGcJg=";
|
||||
aarch64-darwin.hash = "sha256-fHgPbJS4ZraqowkjPdDg0BbPiI+4dk9JpMSDKASl8wE=";
|
||||
x86_64-linux.hash = "sha256-ywZBKjUf0h7D3uRf3POJnaC9DtSJ3b8ucdxarHOzIg8=";
|
||||
aarch64-linux.hash = "sha256-/fXACEZqz0Z8XPPwhQgaUN/23sbBcXmGFA9R1+/Md3E=";
|
||||
x86_64-darwin.hash = "sha256-39Hwwg9l/HNfCAMwPYp/i/i6LbEoByKb5C+51jifz8U=";
|
||||
aarch64-darwin.hash = "sha256-J+1NDd1ZL6/w2ObDDLcIp/MDX6lVAHxJOaOC3BIOoqM=";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = linuxSource "x64" x86_64-linux.hash;
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.98.1";
|
||||
version = "0.99.0";
|
||||
|
||||
serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz";
|
||||
serverSource_x64.hash = "sha256-Ipl9mEDj6Wgzl31WonH4nouCoYs1lLgdxRAJr6I8l9c=";
|
||||
serverSource_x64.hash = "sha256-o3c8j6oi5+Oxo6dUdP6a7Czroc5JpKvdexMEE7BaPC4=";
|
||||
serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz";
|
||||
serverSource_arm64.hash = "sha256-XssGT2F1Idv7ICuTjJTAUYyors8ml50EXiOTHeA8KOw=";
|
||||
serverSource_arm64.hash = "sha256-QFK5XYdPon3J2lp3k23KNf1dbi213JRILrqq8WT359A=";
|
||||
|
||||
serverSource =
|
||||
if stdenv.hostPlatform.isx86_64 then
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
rec {
|
||||
version = "0.17.0";
|
||||
version = "0.17.1";
|
||||
tag = version;
|
||||
hash = "sha256-mLtWU7eJxDAyUuwsiwLqa9LgJXnTtYHwcnXQOBsmugw=";
|
||||
cargoHash = "sha256-h8HmBfxRKrtARFQ0vll09uEMcYUhW4+8M/Q90EVw3Io=";
|
||||
hash = "sha256-bRazhDhqXnY+nDDWg/unqVuOg9ib3AND0HivFL68Iko=";
|
||||
cargoHash = "sha256-llg/BoiGiD9AT8UTDyTpzrSvEinXbLdT1rQECH2ftdE=";
|
||||
updateScript = ./update-stable.sh;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
rec {
|
||||
version = "0.17.0";
|
||||
version = "0.17.1";
|
||||
tag = version;
|
||||
hash = "sha256-mLtWU7eJxDAyUuwsiwLqa9LgJXnTtYHwcnXQOBsmugw=";
|
||||
cargoHash = "sha256-h8HmBfxRKrtARFQ0vll09uEMcYUhW4+8M/Q90EVw3Io=";
|
||||
hash = "sha256-bRazhDhqXnY+nDDWg/unqVuOg9ib3AND0HivFL68Iko=";
|
||||
cargoHash = "sha256-llg/BoiGiD9AT8UTDyTpzrSvEinXbLdT1rQECH2ftdE=";
|
||||
updateScript = ./update-unstable.sh;
|
||||
}
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "VictoriaLogs";
|
||||
version = "1.34.0";
|
||||
version = "1.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VictoriaMetrics";
|
||||
repo = "VictoriaLogs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NUfFXssgNtlb8p9B32aMVSzRJxafMrsuxsR38oHAm2M=";
|
||||
hash = "sha256-9g23rtLi/tHIXpfZSHgaIHIGHwQ0eYW5kLtMHqrIlMk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
|
||||
postPatch = ''
|
||||
# Allow older go versions
|
||||
substituteInPlace go.mod \
|
||||
--replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}"
|
||||
--replace-fail "go 1.25.1" "go ${finalAttrs.passthru.go.version}"
|
||||
|
||||
substituteInPlace vendor/modules.txt \
|
||||
--replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}"
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"darwin": {
|
||||
"hash": "sha256-EPtPjDsSTGsJFRVDM8HtpmcLaPFzbQsph7pyNdXllAU=",
|
||||
"version": "0.2025.09.17.08.11.stable_02"
|
||||
"hash": "sha256-5lSv9/RLHVu9rusUO2MEGDKCEjteNNOiOfhk9f35a78=",
|
||||
"version": "0.2025.09.24.08.11.stable_01"
|
||||
},
|
||||
"linux_x86_64": {
|
||||
"hash": "sha256-5av17Bcg8ri7+y4H8ZJeUuOkpcNbag+VH6OYVF0JrCQ=",
|
||||
"version": "0.2025.09.17.08.11.stable_02"
|
||||
"hash": "sha256-Ho8xOs9hke5jiM0y4QVsaE9pUfbEc6rjbipxtGRp6Ec=",
|
||||
"version": "0.2025.09.24.08.11.stable_01"
|
||||
},
|
||||
"linux_aarch64": {
|
||||
"hash": "sha256-QM5abg5hbwvOBioLOdYN1IGCP1y5manRGsnmj+23EmQ=",
|
||||
"version": "0.2025.09.17.08.11.stable_02"
|
||||
"hash": "sha256-rdCKoIf6CFltrkaCfGu1X644mhtPC9Z2u+w4msj6Jr4=",
|
||||
"version": "0.2025.09.24.08.11.stable_01"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Menu utility for X";
|
||||
homepage = "https://github.com/phillbush/xmenu";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ neonfuz ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "xmenu";
|
||||
};
|
||||
|
||||
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ neonfuz ];
|
||||
mainProgram = "yaxg";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ buildGoModule rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "maximbaz";
|
||||
repo = "yubikey-touch-detector";
|
||||
rev = version;
|
||||
tag = version;
|
||||
hash = "sha256-aHR/y8rAKS+dMvRdB3oAmOiI7hTA6qlF4Z05OjwYOO4=";
|
||||
};
|
||||
vendorHash = "sha256-oHEcpu3QvcVC/YCtGtP7nNT9++BSU8BPT5pf8NdLrOo=";
|
||||
@@ -33,9 +33,9 @@ buildGoModule rec {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 -t $out/share/doc/${pname} *.{md,example}
|
||||
install -Dm444 -t $out/share/doc/yubikey-touch-detector *.{md,example}
|
||||
|
||||
install -Dm444 -t $out/share/licenses/${pname} LICENSE
|
||||
install -Dm444 -t $out/share/licenses/yubikey-touch-detector LICENSE
|
||||
|
||||
install -Dm444 -t $out/share/icons/hicolor/128x128/apps yubikey-touch-detector.png
|
||||
|
||||
@@ -48,12 +48,12 @@ buildGoModule rec {
|
||||
installManPage yubikey-touch-detector.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Tool to detect when your YubiKey is waiting for a touch";
|
||||
homepage = "https://github.com/maximbaz/yubikey-touch-detector";
|
||||
maintainers = with maintainers; [ sumnerevans ];
|
||||
license = licenses.isc;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ sumnerevans ];
|
||||
license = lib.licenses.isc;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "yubikey-touch-detector";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
jre,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "yuicompressor";
|
||||
version = "2.4.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar";
|
||||
url = "https://github.com/yui/yuicompressor/releases/download/v${finalAttrs.version}/yuicompressor-${finalAttrs.version}.jar";
|
||||
sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh";
|
||||
};
|
||||
|
||||
@@ -25,13 +25,13 @@ stdenv.mkDerivation rec {
|
||||
"-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "JavaScript and CSS minifier";
|
||||
mainProgram = "yuicompressor";
|
||||
homepage = "http://yui.github.io/yuicompressor/";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ jwiegley ];
|
||||
platforms = platforms.all;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ jwiegley ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -37,7 +37,7 @@ let
|
||||
};
|
||||
|
||||
rubyEnv = bundlerEnv {
|
||||
name = "${pname}-gems-${version}";
|
||||
name = "zammad-gems-${version}";
|
||||
inherit version;
|
||||
|
||||
# Which ruby version to select:
|
||||
@@ -127,15 +127,15 @@ stdenvNoCC.mkDerivation {
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Web-based, open source user support/ticketing solution";
|
||||
homepage = "https://zammad.org";
|
||||
license = licenses.agpl3Plus;
|
||||
license = lib.licenses.agpl3Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
maintainers = with maintainers; [
|
||||
maintainers = with lib.maintainers; [
|
||||
taeer
|
||||
netali
|
||||
];
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
runtimeShell,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zap";
|
||||
version = "2.16.1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz";
|
||||
sha256 = "sha256-Wy64MZsIUSGm6K1Q1p1n2++MhnFm9xqTe/yIjSR6KsE=";
|
||||
url = "https://github.com/zaproxy/zaproxy/releases/download/v${finalAttrs.version}/ZAP_${finalAttrs.version}_Linux.tar.gz";
|
||||
hash = "sha256-Wy64MZsIUSGm6K1Q1p1n2++MhnFm9xqTe/yIjSR6KsE=";
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
@@ -44,35 +44,35 @@ stdenv.mkDerivation rec {
|
||||
|
||||
mkdir -p $out/{bin,share}
|
||||
|
||||
cp -pR . "$out/share/${pname}/"
|
||||
cp -pR . "$out/share/zap/"
|
||||
|
||||
cat >> "$out/bin/${pname}" << EOF
|
||||
cat >> "$out/bin/zap" << EOF
|
||||
#!${runtimeShell}
|
||||
export PATH="${lib.makeBinPath [ jre ]}:\$PATH"
|
||||
export JAVA_HOME='${jre}'
|
||||
if ! [ -f "\$HOME/.ZAP/config.xml" ];then
|
||||
mkdir -p "\$HOME/.ZAP"
|
||||
head -n 2 $out/share/${pname}/xml/config.xml > "\$HOME/.ZAP/config.xml"
|
||||
echo "<version>${version_tag}</version>" >> "\$HOME/.ZAP/config.xml"
|
||||
tail -n +3 $out/share/${pname}/xml/config.xml >> "\$HOME/.ZAP/config.xml"
|
||||
head -n 2 $out/share/zap/xml/config.xml > "\$HOME/.ZAP/config.xml"
|
||||
echo "<version>${finalAttrs.version_tag}</version>" >> "\$HOME/.ZAP/config.xml"
|
||||
tail -n +3 $out/share/zap/xml/config.xml >> "\$HOME/.ZAP/config.xml"
|
||||
fi
|
||||
exec "$out/share/${pname}/zap.sh" "\$@"
|
||||
exec "$out/share/zap/zap.sh" "\$@"
|
||||
EOF
|
||||
|
||||
chmod u+x "$out/bin/${pname}"
|
||||
chmod u+x "$out/bin/zap"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://www.zaproxy.org/";
|
||||
description = "Java application for web penetration testing";
|
||||
maintainers = with maintainers; [
|
||||
maintainers = with lib.maintainers; [
|
||||
mog
|
||||
rafael
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.asl20;
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "zap";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
vala,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zile";
|
||||
version = "2.6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/zile/${pname}-${version}.tar.gz";
|
||||
url = "mirror://gnu/zile/zile-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-1dRLhctJBkPQcH4aIYbzoymYwvbquqlIFHm2XK7uV8A=";
|
||||
};
|
||||
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.gnu.org/software/zile/";
|
||||
changelog = "https://git.savannah.gnu.org/cgit/zile.git/plain/NEWS?h=v${version}";
|
||||
changelog = "https://git.savannah.gnu.org/cgit/zile.git/plain/NEWS?h=v${finalAttrs.version}";
|
||||
description = "Implements Lua Editors";
|
||||
longDescription = ''
|
||||
GNU Zile is a text editor development kit, so that you can (relatively)
|
||||
@@ -82,4 +82,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "zile";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
zita-resampler,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zita-ajbridge";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0g5v0l0zmqh049mhv62n8s5bpm0yrlby7mkxxhs5qwadp8v4w9mw";
|
||||
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-ajbridge-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-vCZONrpNcVw07H3W4xfNHtS7ikZWmA1rIgDi+gEFuzw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Connect additional ALSA devices to JACK";
|
||||
homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ orivej ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -15,7 +15,7 @@ let
|
||||
pname = "Mojo-Log-Clearable";
|
||||
version = "1.001";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/D/DB/DBOOK/${pname}-${version}.tar.gz";
|
||||
url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-Log-Clearable-${version}.tar.gz";
|
||||
hash = "sha256-guBqKdWemc4mC/xp77Wd7qeV2iRqY4wrQ5NRsHtsCnI=";
|
||||
};
|
||||
buildInputs = with perl.pkgs; [ ModuleBuildTiny ];
|
||||
@@ -70,14 +70,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
$out/bin/znapzend --version
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "High performance open source ZFS backup with mbuffer and ssh support";
|
||||
homepage = "https://www.znapzend.org";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
otwieracz
|
||||
ma27
|
||||
];
|
||||
platforms = platforms.all;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -21,7 +21,7 @@ let
|
||||
version = "2011-09-06";
|
||||
src = fetchzip {
|
||||
url = "mirror://sourceforge/zod/linux_releases/zod_linux-${version}.tar.gz";
|
||||
sha256 = "017v96aflrv07g8j8zk9mq8f8rqxl5228rjff5blq8dxpsv1sx7h";
|
||||
hash = "sha256-8HQdtr69IUxXcU5mJEShHWfkEK5pfiTRO2Bn6pRJ+wQ=";
|
||||
};
|
||||
postPatch = ''
|
||||
sed '1i#include <ctime>' -i zod_src/common.cpp # gcc12
|
||||
@@ -50,7 +50,7 @@ let
|
||||
hardeningDisable
|
||||
NIX_LDFLAGS
|
||||
;
|
||||
pname = "${pname}-engine";
|
||||
pname = "zod-engine-engine";
|
||||
enableParallelBuilding = true;
|
||||
preBuild = "cd zod_src";
|
||||
installPhase = ''
|
||||
@@ -69,7 +69,7 @@ let
|
||||
hardeningDisable
|
||||
NIX_LDFLAGS
|
||||
;
|
||||
pname = "${pname}-map_editor";
|
||||
pname = "zod-engine-map_editor";
|
||||
enableParallelBuilding = true;
|
||||
preBuild = "cd zod_src";
|
||||
makeFlags = [ "map_editor" ];
|
||||
@@ -88,7 +88,7 @@ let
|
||||
zod_engine
|
||||
zod_map_editor
|
||||
;
|
||||
pname = "${pname}-launcher";
|
||||
pname = "zod-engine-launcher";
|
||||
# This is necessary because the zod_launcher has terrible fixed-width window
|
||||
# the Idea is to apply the scalingFactor to all positions and sizes and I tested 1,2,3 and 4
|
||||
# 2,3,4 look acceptable on my 4k monitor and 1 is unreadable.
|
||||
@@ -109,7 +109,7 @@ let
|
||||
install -m755 zod_launcher $out/bin
|
||||
'';
|
||||
};
|
||||
zod_assets = runCommandLocal "${pname}-assets" { } ''
|
||||
zod_assets = runCommandLocal "zod-engine-assets" { } ''
|
||||
mkdir -p $out/usr/lib/commander-zod{,blank_maps}
|
||||
cp -r ${src}/assets $out/usr/lib/commander-zod/assets
|
||||
for i in ${src}/*.map ${src}/*.txt; do
|
||||
@@ -128,11 +128,11 @@ symlinkJoin {
|
||||
zod_map_editor
|
||||
zod_assets
|
||||
];
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Multiplayer remake of ZED";
|
||||
homepage = "https://zod.sourceforge.net/";
|
||||
maintainers = with maintainers; [ zeri ];
|
||||
license = licenses.gpl3Plus; # Says the website
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ zeri ];
|
||||
license = lib.licenses.gpl3Plus; # Says the website
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,12 +13,12 @@ let
|
||||
# https://zookeeper.apache.org/doc/r3.9.2/zookeeperAdmin.html#sc_requiredSoftware
|
||||
jre = jdk11_headless;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zookeeper";
|
||||
version = "3.9.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz";
|
||||
url = "mirror://apache/zookeeper/zookeeper-${finalAttrs.version}/apache-zookeeper-${finalAttrs.version}-bin.tar.gz";
|
||||
hash = "sha512-1E2HDBaRZi778ai68YWckBuCDcX/Fjs26BvrJ7b7880xtfHwdWl+2q9tPnpMsMyS+STc/2SylO8T1TVYm9rxQw==";
|
||||
};
|
||||
|
||||
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = "https://zookeeper.apache.org";
|
||||
description = "Apache Zookeeper";
|
||||
changelog = "https://zookeeper.apache.org/doc/r${version}/releasenotes.html";
|
||||
changelog = "https://zookeeper.apache.org/doc/r${finalAttrs.version}/releasenotes.html";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
nathan-gs
|
||||
@@ -62,4 +62,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.unix;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
diff --git a/make/PreInit.gmk b/make/PreInit.gmk
|
||||
index 3df44308dd..490d7c24e9 100644
|
||||
--- a/make/PreInit.gmk
|
||||
+++ b/make/PreInit.gmk
|
||||
@@ -60,13 +60,19 @@
|
||||
# Extract non-global targets that require a spec file.
|
||||
CALLED_SPEC_TARGETS := $(filter-out $(ALL_GLOBAL_TARGETS), $(CALLED_TARGETS))
|
||||
|
||||
+# GNU make-4.4 (and later) include not just single-letter form of the
|
||||
+# options MAKEFILES but also long for and even some of the arguments.
|
||||
+# Skip long form and use only short form:
|
||||
+# MAKEFLAGS=' --debug=basic -- LOG=trace ...'
|
||||
+MAKEFLAGS_SINGLE_LETTER := $(firstword -$(MAKEFLAGS))
|
||||
+
|
||||
# If we have only global targets, or if we are called with -qp (assuming an
|
||||
# external part, e.g. bash completion, is trying to understand our targets),
|
||||
# we will skip SPEC location and the sanity checks.
|
||||
ifeq ($(CALLED_SPEC_TARGETS), )
|
||||
SKIP_SPEC := true
|
||||
endif
|
||||
-ifeq ($(findstring p, $(MAKEFLAGS))$(findstring q, $(MAKEFLAGS)), pq)
|
||||
+ifeq ($(findstring p, $(MAKEFLAGS_SINGLE_LETTER))$(findstring q, $(MAKEFLAGS_SINGLE_LETTER)), pq)
|
||||
SKIP_SPEC := true
|
||||
endif
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"hash": "sha256-5kQ7xPyWGk/weVYVVNEFPUF1HspfisqcPHA+DM6Q35c=",
|
||||
"owner": "openjdk",
|
||||
"repo": "jdk25u",
|
||||
"rev": "refs/tags/jdk-25+36"
|
||||
}
|
||||
@@ -60,12 +60,14 @@
|
||||
openjfx21,
|
||||
openjfx23,
|
||||
openjfx24,
|
||||
openjfx25,
|
||||
openjfx_jdk ?
|
||||
{
|
||||
"17" = openjfx17;
|
||||
"21" = openjfx21;
|
||||
"23" = openjfx23;
|
||||
"24" = openjfx24;
|
||||
"25" = openjfx25;
|
||||
}
|
||||
.${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"),
|
||||
|
||||
@@ -80,6 +82,7 @@
|
||||
temurin-bin-21,
|
||||
temurin-bin-23,
|
||||
temurin-bin-24,
|
||||
temurin-bin-25,
|
||||
jdk-bootstrap ?
|
||||
{
|
||||
"8" = temurin-bin-8.__spliced.buildBuild or temurin-bin-8;
|
||||
@@ -88,6 +91,7 @@
|
||||
"21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21;
|
||||
"23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23;
|
||||
"24" = temurin-bin-24.__spliced.buildBuild or temurin-bin-24;
|
||||
"25" = temurin-bin-25.__spliced.buildBuild or temurin-bin-25;
|
||||
}
|
||||
.${featureVersion},
|
||||
}:
|
||||
@@ -104,6 +108,7 @@ let
|
||||
atLeast21 = lib.versionAtLeast featureVersion "21";
|
||||
atLeast23 = lib.versionAtLeast featureVersion "23";
|
||||
atLeast24 = lib.versionAtLeast featureVersion "24";
|
||||
atLeast25 = lib.versionAtLeast featureVersion "25";
|
||||
|
||||
tagPrefix = if atLeast11 then "jdk-" else "jdk";
|
||||
version = lib.removePrefix "refs/tags/${tagPrefix}" source.src.rev;
|
||||
@@ -217,7 +222,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals atLeast11 [
|
||||
++ lib.optionals (atLeast11 && !atLeast25) [
|
||||
# Fix build for gnumake-4.4.1:
|
||||
# https://github.com/openjdk/jdk/pull/12992
|
||||
(fetchpatch {
|
||||
@@ -226,6 +231,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals atLeast25 [
|
||||
./25/patches/make-4.4.1.patch
|
||||
]
|
||||
++ lib.optionals (!headless && enableGtk) [
|
||||
(
|
||||
if atLeast17 then
|
||||
|
||||
@@ -432,4 +432,11 @@ in
|
||||
hash = "sha256-48Gauej0GzcjEk+8ARTN58v1XmWqnFjBKs2J7JwN0bk=";
|
||||
cargoHash = "sha256-5Tp8Kth0yO89/LIcU8K01z6DdZRr8MAA0DPKqDEjIt0=";
|
||||
};
|
||||
|
||||
ruby_3_5 = generic {
|
||||
version = rubyVersion "3" "5" "0" "preview1";
|
||||
hash = "sha256-7PCcfrkC6Rza+cxVPNAMypuEiz/A4UKXhQ+asIzdRvA=";
|
||||
cargoHash = "sha256-z7NwWc4TaR042hNx0xgRkh/BQEpEJtE53cfrN0qNiE0=";
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -41,6 +41,7 @@
|
||||
wayland-protocols,
|
||||
libxkbcommon,
|
||||
wayland-scanner,
|
||||
libdecor,
|
||||
|
||||
withExamples ? (stdenv.buildPlatform == stdenv.hostPlatform),
|
||||
|
||||
@@ -118,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wayland
|
||||
wayland-protocols
|
||||
libxkbcommon
|
||||
libdecor
|
||||
]
|
||||
++ lib.optionals withCairo [
|
||||
cairo
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
stdenv,
|
||||
coin3d,
|
||||
qtbase,
|
||||
cmake,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "soqt";
|
||||
version = "2020-12-05-unstable";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin3d";
|
||||
repo = "soqt";
|
||||
# rev = "SoQt-${version}";
|
||||
rev = "fb8f655632bb9c9c60e0ff9fa69a5ba22d3ff99d";
|
||||
hash = "sha256-YoBq8P3Tag2Sepqxf/qIcJDBhH/gladBmDUj78aacZs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
coin3d
|
||||
qtbase
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/coin3d/soqt";
|
||||
license = licenses.bsd3;
|
||||
description = "Glue between Coin high-level 3D visualization library and Qt";
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
async-interrupt,
|
||||
async-timeout,
|
||||
bleak,
|
||||
bleak-retry-connector,
|
||||
buildPythonPackage,
|
||||
@@ -10,21 +9,18 @@
|
||||
poetry-core,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "airthings-ble";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vincegio";
|
||||
repo = "airthings-ble";
|
||||
tag = version;
|
||||
hash = "sha256-eZjMRely3UxcnjPB6DQDBOKdP+2kFCe/5fchiX+rcEM=";
|
||||
hash = "sha256-fZvmgRQuSrgraj6e3BtsoKyFX38BedqVh6cHsliT9ns=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
@@ -46,7 +42,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library for Airthings BLE devices";
|
||||
homepage = "https://github.com/vincegio/airthings-ble";
|
||||
changelog = "https://github.com/vincegio/airthings-ble/releases/tag/${version}";
|
||||
changelog = "https://github.com/vincegio/airthings-ble/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
docutils,
|
||||
pyparsing,
|
||||
python-dateutil,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "catkin-pkg";
|
||||
version = "1.1.0";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ros-infrastructure";
|
||||
repo = "catkin_pkg";
|
||||
tag = version;
|
||||
hash = "sha256-V4iurFt1WmY2jXy0A4Qa2eKMCWmR+Hs3d9pru0/zUSM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
docutils
|
||||
pyparsing
|
||||
python-dateutil
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "catkin_pkg" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTestPaths = [ "test/test_flake8.py" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/ros-infrastructure/catkin_pkg/blob/${src.tag}/CHANGELOG.rst";
|
||||
description = "Library for retrieving information about catkin packages";
|
||||
homepage = "http://wiki.ros.org/catkin_pkg";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
wentasah
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
hatchling,
|
||||
flit-core,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
hash = "sha256-Cw6Eiey501mzeigfdwnMuZH28abG4rcoACUGlmkzECA=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
build-system = [ flit-core ];
|
||||
|
||||
# Tests are not published to pypi
|
||||
doCheck = false;
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
requests-cache,
|
||||
requests-toolbelt,
|
||||
requests,
|
||||
resolvelib,
|
||||
setuptools,
|
||||
stevedore,
|
||||
tqdm,
|
||||
@@ -45,6 +46,7 @@ buildPythonPackage rec {
|
||||
requests
|
||||
requests-cache
|
||||
requests-toolbelt
|
||||
resolvelib
|
||||
stevedore
|
||||
tqdm
|
||||
]
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dataproc";
|
||||
version = "5.21.0";
|
||||
version = "5.22.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "google_cloud_dataproc";
|
||||
inherit version;
|
||||
hash = "sha256-LSoMxquZrJVB9z0uIRqFH6TQp18btRsjwk3vyGzWxPo=";
|
||||
hash = "sha256-zkGy0LLTnTqvLckUCRMtNP4n+KpdKtat3fQqz78rW/A=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
{
|
||||
aiohttp,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
freezegun,
|
||||
lib,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
svgwrite,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "irm-kmi-api";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdejaegh";
|
||||
repo = "irm-kmi-api";
|
||||
tag = version;
|
||||
hash = "sha256-E8lf2TpeA91mRbxXYCsuum0mJdE5XLXX0l8CKEl5SFw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
svgwrite
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "irm_kmi_api" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
freezegun
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/jdejaegh/irm-kmi-api/releases/tag/${src.tag}";
|
||||
description = "Retrieve data from the Belgian Royal Meteorological Institute";
|
||||
homepage = "https://github.com/jdejaegh/irm-kmi-api";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.dotlambda ];
|
||||
};
|
||||
}
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph-runtime-inmem";
|
||||
version = "0.12.0";
|
||||
version = "0.14.1";
|
||||
pyproject = true;
|
||||
|
||||
# Not available in any repository
|
||||
src = fetchPypi {
|
||||
pname = "langgraph_runtime_inmem";
|
||||
inherit version;
|
||||
hash = "sha256-h1YFV8lqb929MjzOIHPI8hahjDCkShr83kevjUWFF8A=";
|
||||
hash = "sha256-OIgTFwx0f8W/oRpF12jtaENWcripe1Tr/6Mx0k+nnLw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -2,17 +2,19 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
pkgs,
|
||||
qtbase,
|
||||
qmake,
|
||||
python,
|
||||
pythonRecompileBytecodeHook,
|
||||
swig,
|
||||
cmake,
|
||||
coin3d,
|
||||
soqt,
|
||||
libGLU,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pivy";
|
||||
version = "0.6.10";
|
||||
pyproject = true;
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin3d";
|
||||
@@ -21,54 +23,31 @@ buildPythonPackage rec {
|
||||
hash = "sha256-DRA4NTAHg2iB/D1CU9pJEpsZwX9GW3X5gpxbIwP54Ko=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
nativeBuildInputs = with pkgs; [
|
||||
nativeBuildInputs = [
|
||||
swig
|
||||
qmake
|
||||
cmake
|
||||
pythonRecompileBytecodeHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
with pkgs;
|
||||
with xorg;
|
||||
[
|
||||
coin3d
|
||||
soqt
|
||||
qtbase
|
||||
libGLU
|
||||
libGL
|
||||
libXi
|
||||
libXext
|
||||
libSM
|
||||
libICE
|
||||
libX11
|
||||
];
|
||||
buildInputs = [
|
||||
coin3d
|
||||
soqt
|
||||
libGLU # dummy buildInput that provides missing header <GL/glu.h>
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-I${qtbase.dev}/include/QtCore"
|
||||
"-I${qtbase.dev}/include/QtGui"
|
||||
"-I${qtbase.dev}/include/QtOpenGL"
|
||||
"-I${qtbase.dev}/include/QtWidgets"
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "PIVY_USE_QT6" true)
|
||||
(lib.cmakeFeature "PIVY_Python_SITEARCH" "${placeholder "out"}/${python.sitePackages}")
|
||||
];
|
||||
|
||||
dontUseQmakeConfigure = true;
|
||||
dontWrapQtApps = true;
|
||||
doCheck = false;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace distutils_cmake/CMakeLists.txt --replace \$'{SoQt_INCLUDE_DIRS}' \
|
||||
\$'{Coin_INCLUDE_DIR}'\;\$'{SoQt_INCLUDE_DIRS}'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pivy" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/coin3d/pivy/";
|
||||
description = "Python binding for Coin";
|
||||
license = licenses.bsd0;
|
||||
maintainers = with maintainers; [ ];
|
||||
license = lib.licenses.bsd0;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pykka";
|
||||
version = "4.3.0";
|
||||
version = "4.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jodal";
|
||||
repo = "pykka";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-xCvWqWThsi78S9DW4ssz0gezb0RFGlqW2W8oMxkNc+E=";
|
||||
hash = "sha256-OwY8EKCRuc9Tli7Q+rHieqEAYxb7KNBHiPUuycNO8J4=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user