Merge master into staging-next
This commit is contained in:
@@ -5,7 +5,8 @@
|
||||
"ghcr.io/devcontainers/features/nix:1": {
|
||||
// fails in the devcontainer sandbox, enable sandbox via config instead
|
||||
"multiUser": false,
|
||||
"packages": "nixd,nixfmt-unstable",
|
||||
"packages": "nixpkgs.nixd,nixpkgs.nixfmt-rfc-style",
|
||||
"useAttributePath": true,
|
||||
"extraNixConfig": "experimental-features = nix-command flakes,sandbox = true"
|
||||
}
|
||||
},
|
||||
@@ -15,7 +16,9 @@
|
||||
"jnoortheen.nix-ide"
|
||||
],
|
||||
"settings": {
|
||||
"nix.formatterPath": "nixfmt-rfc-style",
|
||||
"[nix]": {
|
||||
"editor.formatOnSave": true
|
||||
},
|
||||
"nix.enableLanguageServer": true,
|
||||
"nix.serverPath": "nixd"
|
||||
}
|
||||
|
||||
@@ -111,6 +111,20 @@ in
|
||||
internal = true;
|
||||
};
|
||||
|
||||
logout = lib.mkOption {
|
||||
# Reset the title bar when logging out. This protects against a remote
|
||||
# NixOS system clobbering your local terminal's title bar when you SSH
|
||||
# into the remote NixOS system and then log out.
|
||||
#
|
||||
# For more details, see: https://superuser.com/a/339946
|
||||
default = ''
|
||||
printf '\e]0;\a'
|
||||
'';
|
||||
description = ''
|
||||
Shell script code called during login bash shell logout.
|
||||
'';
|
||||
type = lib.types.lines;
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
@@ -197,6 +211,21 @@ in
|
||||
fi
|
||||
'';
|
||||
|
||||
environment.etc.bash_logout.text = ''
|
||||
# /etc/bash_logout: DO NOT EDIT -- this file has been generated automatically.
|
||||
|
||||
# Only execute this file once per shell.
|
||||
if [ -n "$__ETC_BASHLOGOUT_SOURCED" ] || [ -n "$NOSYSBASHLOGOUT" ]; then return; fi
|
||||
__ETC_BASHLOGOUT_SOURCED=1
|
||||
|
||||
${cfg.logout}
|
||||
|
||||
# Read system-wide modifications.
|
||||
if test -f /etc/bash_logout.local; then
|
||||
. /etc/bash_logout.local
|
||||
fi
|
||||
'';
|
||||
|
||||
# Configuration for readline in bash. We use "option default"
|
||||
# priority to allow user override using both .text and .source.
|
||||
environment.etc.inputrc.source = lib.mkOptionDefault ./inputrc;
|
||||
|
||||
@@ -122,6 +122,6 @@ in
|
||||
usshAuth = true;
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ azahi ];
|
||||
meta.maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -23,7 +23,8 @@ in
|
||||
defaultText = lib.literalExpression ''
|
||||
{
|
||||
HBOX_STORAGE_DATA = "/var/lib/homebox/data";
|
||||
HBOX_STORAGE_SQLITE_URL = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1";
|
||||
HBOX_DATABASE_DRIVER = "sqlite3";
|
||||
HBOX_DATABASE_SQLITE_PATH = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1";
|
||||
HBOX_OPTIONS_ALLOW_REGISTRATION = "false";
|
||||
HBOX_OPTIONS_CHECK_GITHUB_RELEASE = "false";
|
||||
HBOX_MODE = "production";
|
||||
@@ -44,7 +45,8 @@ in
|
||||
users.groups.homebox = { };
|
||||
services.homebox.settings = {
|
||||
HBOX_STORAGE_DATA = mkDefault "/var/lib/homebox/data";
|
||||
HBOX_STORAGE_SQLITE_URL = mkDefault "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1";
|
||||
HBOX_DATABASE_DRIVER = mkDefault "sqlite3";
|
||||
HBOX_DATABASE_SQLITE_PATH = mkDefault "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1";
|
||||
HBOX_OPTIONS_ALLOW_REGISTRATION = mkDefault "false";
|
||||
HBOX_OPTIONS_CHECK_GITHUB_RELEASE = mkDefault "false";
|
||||
HBOX_MODE = mkDefault "production";
|
||||
|
||||
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "please";
|
||||
meta.maintainers = with lib.maintainers; [ azahi ];
|
||||
meta.maintainers = [ ];
|
||||
|
||||
nodes.machine =
|
||||
{ ... }:
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qsynth";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-SHMPmZMAlC9L5EAecaZNB0pWnq0heeD8bcbhKeI+YOo=";
|
||||
hash = "sha256-z4l+Ku3oEQV3NunkogyxzaSKhFJuYhIxlExJsACcumY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,12 +20,12 @@ let
|
||||
sha256Hash = "sha256-VNXErfb4PhljcJwGq863ldh/3i8fMdJirlwolEIk+fI=";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2024.3.2.9"; # "Android Studio Meerkat Feature Drop | 2024.3.2 Beta 1"
|
||||
sha256Hash = "sha256-yDxDctlZsUmye+XgWwWIHPnrfI3BCj5wYLQG9l8t6mA=";
|
||||
version = "2024.3.2.10"; # "Android Studio Meerkat Feature Drop | 2024.3.2 RC 1"
|
||||
sha256Hash = "sha256-r5YBpACLzfmChY9ORyvDUNl4j8r32dsqj3W7fbSWZU8=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2025.1.1.2"; # "Android Studio Narwhal | 2025.1.1 Canary 2"
|
||||
sha256Hash = "sha256-elWCY/QwBeGIsC4xtQrSV6low5oLH3q1WW2InqQItFM=";
|
||||
version = "2025.1.1.4"; # "Android Studio Narwhal | 2025.1.1 Canary 4"
|
||||
sha256Hash = "sha256-PQe9JEi9Ogoo1hUgPVnCustFgg10v89gTMF7QGi4s1I=";
|
||||
};
|
||||
in
|
||||
{
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "rednotebook";
|
||||
version = "2.38";
|
||||
version = "2.39";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jendrikseipp";
|
||||
repo = "rednotebook";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-7PUBWJhxE4K9GqAAFGrkelynheuALiDRZXM5acZF7uQ=";
|
||||
sha256 = "sha256-H7Ub4dCJQa4Y3DNBzeIYWlNkpYftezY2MNWokw8ocoA=";
|
||||
};
|
||||
|
||||
# We have not packaged tests.
|
||||
|
||||
@@ -90,15 +90,15 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "42Crunch";
|
||||
name = "vscode-openapi";
|
||||
version = "4.27.0";
|
||||
hash = "sha256-urXGyHpIDWQ0Bc+8LODC0DcEo6jQ5tA/QptyxCej9yU=";
|
||||
version = "4.33.1";
|
||||
hash = "sha256-iq0UpVaZMOzh4NIRPLk49ciFuO4A6PDSEMe1KKhfSxA=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog";
|
||||
description = "Visual Studio Code extension with rich support for the OpenAPI Specification (OAS)";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=42Crunch.vscode-openapi";
|
||||
homepage = "https://github.com/42Crunch/vscode-openapi";
|
||||
license = lib.licenses.gpl3;
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = [ lib.maintainers.benhiemer ];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -36,22 +36,22 @@ let
|
||||
|
||||
sha256 =
|
||||
{
|
||||
x86_64-linux = "0pmjpjjafq36dr5dlf64bbkr6p697d2yc1z7l876i0vnw10g6731";
|
||||
x86_64-darwin = "1y32szp9asmchl64wfwz4jvhkr4441aykvy64qc8f4y51wxxxcnv";
|
||||
aarch64-linux = "0zbgbhnlg7wcgz8v34rknvblmdrac0l7qy5qfp2rn7jcdrm5qa53";
|
||||
aarch64-darwin = "00y6rz2cfz193n3svvsdknk6g38vg1w92yiqk5n14lyv2g8av2dc";
|
||||
armv7l-linux = "19q4rip33ma7krwpymp396ip5kwd5g8hp2n6jqcmljv59lw10c9h";
|
||||
x86_64-linux = "1fds83amgkzp9nz7cvs432ilr602lr45h916vkq8qhpbb84ildd2";
|
||||
x86_64-darwin = "1pmda39jz05d0g3k6rgavhwmgxkldmarbj59fd9i0b5dcspzybxf";
|
||||
aarch64-linux = "148cpbhz14aldqklnma9mpakylkx2qk86k5ppij0zlqb5m6mgnaz";
|
||||
aarch64-darwin = "10v37bcl8wg4j5snd7n3l7zwqf51vkx4cs2abf33ysazmafvnfpd";
|
||||
armv7l-linux = "10vfnk87g4agwp0phh7l9k7hg727n1l4fcvqn1bxbrix9hbq7bbc";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.98.2";
|
||||
version = "1.99.0";
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "ddc367ed5c8936efe395cffeec279b04ffd7db78";
|
||||
rev = "4437686ffebaf200fa4a6e6e67f735f3edf24ada";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
sha256 = "19dc6smiyi8qv79gr95wgx2fjzfjkrv4x3zfvdskms4bw1kn6xck";
|
||||
sha256 = "11705fdsb7hc25awkiknjc7pb93x2w74yxkf3351c6n2sf3i2755";
|
||||
};
|
||||
stdenv = stdenvNoCC;
|
||||
};
|
||||
|
||||
@@ -24,13 +24,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seamly2d";
|
||||
version = "2025.3.17.207";
|
||||
version = "2025.3.25.1924";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FashionFreedom";
|
||||
repo = "Seamly2D";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5Bi+SycUZFOxmP0bWbqSnKRZ+UW6b48Cn4YUVfHi4Js=";
|
||||
hash = "sha256-hBXdf/r3hXSjy6Vp5SjfOcefxj/aP0La4LTiyOESzmQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -38,12 +38,12 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "bikeshed";
|
||||
version = "5.1.1";
|
||||
version = "5.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ck3Ucv39w+EL1r+IzMbnqVfBqtqBVq4kxdpZVDWpM3U=";
|
||||
hash = "sha256-QIADVcxgJreH2pvXRVIBE5p6nEEYZtTiSo00RrpFT+E=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -36,6 +36,6 @@ buildPythonApplication {
|
||||
homepage = "https://github.com/xueyuanl/cambrinary";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
}:
|
||||
let
|
||||
pname = "protonup-qt";
|
||||
version = "2.11.1";
|
||||
version = "2.12.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage";
|
||||
hash = "sha256-xHkeAqveXF8YLFvKHTZtSvINIIoiqhNbwVuKfnaHcQI=";
|
||||
hash = "sha256-8MeHSy3XW1oXAD2xrDSIB0ZLJxtk5UBIMpDRTPF9ksU=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xca";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chris2511";
|
||||
repo = "xca";
|
||||
rev = "RELEASE.${finalAttrs.version}";
|
||||
hash = "sha256-2TqqHTutG+5YU2mJNTS3pvtEqV7qKVB+j/dipdmEkIk=";
|
||||
hash = "sha256-28K6luMuYcDuNKd/aQG9HX9VN5YkKArl/GQn5spQ+Sg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -49,7 +49,7 @@ let
|
||||
wmClass ? applicationName,
|
||||
nativeMessagingHosts ? [ ],
|
||||
pkcs11Modules ? [ ],
|
||||
useGlvnd ? true,
|
||||
useGlvnd ? (!isDarwin),
|
||||
cfg ? config.${applicationName} or { },
|
||||
|
||||
## Following options are needed for extra prefs & policies
|
||||
@@ -109,13 +109,13 @@ let
|
||||
zlib
|
||||
]
|
||||
)
|
||||
++ lib.optional (config.pulseaudio or true) libpulseaudio
|
||||
++ lib.optional (config.pulseaudio or (!isDarwin)) libpulseaudio
|
||||
++ lib.optional alsaSupport alsa-lib
|
||||
++ lib.optional sndioSupport sndio
|
||||
++ lib.optional jackSupport libjack2
|
||||
++ lib.optional smartcardSupport opensc
|
||||
++ pkcs11Modules
|
||||
++ gtk_modules;
|
||||
++ lib.optionals (!isDarwin) gtk_modules;
|
||||
gtk_modules = [ libcanberra-gtk3 ];
|
||||
|
||||
# Darwin does not rename bundled binaries
|
||||
@@ -289,7 +289,7 @@ let
|
||||
lndir
|
||||
jq
|
||||
];
|
||||
buildInputs = [ browser.gtk3 ];
|
||||
buildInputs = lib.optionals (!isDarwin) [ browser.gtk3 ];
|
||||
|
||||
makeWrapperArgs =
|
||||
[
|
||||
@@ -298,11 +298,6 @@ let
|
||||
":"
|
||||
"${finalAttrs.libs}"
|
||||
|
||||
"--suffix"
|
||||
"GTK_PATH"
|
||||
":"
|
||||
"${lib.concatStringsSep ":" finalAttrs.gtk_modules}"
|
||||
|
||||
"--suffix"
|
||||
"PATH"
|
||||
":"
|
||||
@@ -319,6 +314,12 @@ let
|
||||
"--set"
|
||||
"MOZ_ALLOW_DOWNGRADE"
|
||||
"1"
|
||||
]
|
||||
++ lib.optionals (!isDarwin) [
|
||||
"--suffix"
|
||||
"GTK_PATH"
|
||||
":"
|
||||
"${lib.concatStringsSep ":" finalAttrs.gtk_modules}"
|
||||
|
||||
"--suffix"
|
||||
"XDG_DATA_DIRS"
|
||||
@@ -330,7 +331,7 @@ let
|
||||
"1"
|
||||
|
||||
]
|
||||
++ lib.optionals (!xdg-utils.meta.broken) [
|
||||
++ lib.optionals (!xdg-utils.meta.broken && !isDarwin) [
|
||||
# make xdg-open overridable at runtime
|
||||
"--suffix"
|
||||
"PATH"
|
||||
@@ -457,8 +458,11 @@ let
|
||||
oldExe="$executablePrefix/.${applicationName}"-old
|
||||
mv "$executablePath" "$oldExe"
|
||||
fi
|
||||
|
||||
''
|
||||
+ lib.optionalString (!isDarwin) ''
|
||||
appendToVar makeWrapperArgs --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
||||
''
|
||||
+ ''
|
||||
concatTo makeWrapperArgs oldWrapperArgs
|
||||
|
||||
makeWrapper "$oldExe" "$out/${finalBinaryPath}" "''${makeWrapperArgs[@]}"
|
||||
|
||||
@@ -7,31 +7,15 @@
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
let
|
||||
# https://github.com/cloudflare/cloudflared/issues/1151#issuecomment-1888819250
|
||||
# buildGoModule = buildGoModule.override {
|
||||
# go = buildPackages.go_1_22.overrideAttrs {
|
||||
# pname = "cloudflare-go";
|
||||
# version = "1.22.2-devel-cf";
|
||||
# src = fetchFromGitHub {
|
||||
# owner = "cloudflare";
|
||||
# repo = "go";
|
||||
# rev = "ec0a014545f180b0c74dfd687698657a9e86e310";
|
||||
# sha256 = "sha256-oQQ9Jyh8TphZSCaHqaugTL7v0aeZjyOdVACz86I2KvU=";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
in
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2025.2.1";
|
||||
version = "2025.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
tag = version;
|
||||
hash = "sha256-RiHEUs1I9ErYBQF28la6kqU3BW968PVT+K7uGUVr6Ec=";
|
||||
hash = "sha256-PKF7wP/ueLLhV8k3nMUm/c5fkg+7CwRf1oLnx0qbcA0=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@@ -105,10 +89,8 @@ buildGoModule rec {
|
||||
thoughtpolice
|
||||
piperswe
|
||||
qjoly
|
||||
wrbbz
|
||||
];
|
||||
mainProgram = "cloudflared";
|
||||
# cloudflared requires a fork of go 1.22 to build (see override above),
|
||||
# but go 1.22 is EOL and the toolchain has been removed from nixpkgs.
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -43,6 +43,6 @@ buildGoModule rec {
|
||||
description = "Helm plugin to push chart package to ChartMuseum";
|
||||
homepage = "https://github.com/chartmuseum/helm-push";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "edge";
|
||||
version = "25.3.2";
|
||||
sha256 = "1l0sww0h3s1x9262rj801jk965p1c8bl92lns53yhkarv80cy03y";
|
||||
vendorHash = "sha256-9b98kz4jlkL6S4g/naOIiSazjo8twkk+PL4aXSWubfQ=";
|
||||
version = "25.4.1";
|
||||
sha256 = "18hv0lfh1ldy7chjs2ssn62crn71a0mvvn1g8b35l91g8mqyh4ry";
|
||||
vendorHash = "sha256-vKehadl94okOd1YfaETgdQwWr8F2gOPGyjzzTjxKyLA=";
|
||||
}
|
||||
|
||||
@@ -750,13 +750,13 @@
|
||||
"vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE="
|
||||
},
|
||||
"linode": {
|
||||
"hash": "sha256-ExAB9/27gdDP7SV5UXAaVO/aJ2LYtZYPr9Ur1ftxdCc=",
|
||||
"hash": "sha256-7CGut0z0NEu4yeJOCbqgL9CH7uDwGQbUKTnPK62Xbp0=",
|
||||
"homepage": "https://registry.terraform.io/providers/linode/linode",
|
||||
"owner": "linode",
|
||||
"repo": "terraform-provider-linode",
|
||||
"rev": "v2.35.1",
|
||||
"rev": "v2.36.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-WRM/2mtu/U4Tgxc3nhptNRbscS9uhqa9v66nY2QXXig="
|
||||
"vendorHash": "sha256-nrZNJZHb1FJ7csM/C3mR+RUYy/2TeUzQ1sDmQ8Q4F/s="
|
||||
},
|
||||
"linuxbox": {
|
||||
"hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=",
|
||||
@@ -831,13 +831,13 @@
|
||||
"vendorHash": "sha256-1nm2Y4T9/mCWMXMjXEzBz3w08AYHjQJeb9mYPQeWPs0="
|
||||
},
|
||||
"mongodbatlas": {
|
||||
"hash": "sha256-nuamsevz6ME0WlnnWGFKkLiD5wrihq1EML68rvRiu7Q=",
|
||||
"hash": "sha256-hsm5a6rHVy/m+nc77vwogQx4xnerwpkYKQF9FagbK9c=",
|
||||
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
|
||||
"owner": "mongodb",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v1.29.0",
|
||||
"rev": "v1.31.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-WMExn+d3G0zpATJ2LYaJ9R4SDpQbngQE2YW3p8x3Scc="
|
||||
"vendorHash": "sha256-ml6bduGjFy6cN4zwMMQnw6Ie73Ucx3H1en7viQksGBk="
|
||||
},
|
||||
"namecheap": {
|
||||
"hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "discordo";
|
||||
version = "0-unstable-2025-03-19";
|
||||
version = "0-unstable-2025-03-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayn2op";
|
||||
repo = pname;
|
||||
rev = "aa58ee2a8a177f01d39bde7368f017fe0fcf425a";
|
||||
hash = "sha256-H+m5HqHGC1DzWgTQ0cyD5uwGLiRrKU3eJZ5M/InNmBg=";
|
||||
rev = "9e95b18ab7ba021a71f94e7520c1b9e3b73d3c0f";
|
||||
hash = "sha256-XxjhLVs87npwuys5FmfMba6dg4NcgRPIieTDgI6UXyk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tKY/8JUWNnHXtl305k/azAVsVihjC7TBYpopf/Ocqac=";
|
||||
vendorHash = "sha256-NKGsY/5FqLGbwyW6fVSxictDVhju0+jOJSBXQp3ZhFY=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "anilibria-winmaclinux";
|
||||
version = "2.2.25";
|
||||
version = "2.2.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anilibria";
|
||||
repo = "anilibria-winmaclinux";
|
||||
rev = version;
|
||||
hash = "sha256-9jlGENJVgzQi5oEspM6JHIgYt9np8WNKPJzoW2kSgQs=";
|
||||
hash = "sha256-F+5R1nSmZuHKUe9bAEVwOru07SVs8tIQlbDC6Ip+zy4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "jellyfin-mpv-shim";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-EANaNmvD8hcdGB2aoGemKvA9syS1VvIqGsP1jk0b+lE=";
|
||||
hash = "sha256-YrwMvP66LAWKgx/yWBkWIkZtJ4a0YnhCiL7xB6fGm0E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "inputstream-ffmpegdirect";
|
||||
namespace = "inputstream.ffmpegdirect";
|
||||
version = "21.3.5";
|
||||
version = "21.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "inputstream.ffmpegdirect";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-pPufkDPHq5EsvC6YTsRX9TjqjIczOL/6Vc5HGDIe9Gk=";
|
||||
sha256 = "sha256-s1Owbj95DT+RR8eBRwMuUHrJwr6JR05efx5M11vH8cQ=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "inputstream-rtmp";
|
||||
namespace = "inputstream.rtmp";
|
||||
version = "21.1.0";
|
||||
version = "21.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "inputstream.rtmp";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-M6LFokWQRzBZ7inzRsMxyWzkV0XsGHh4d0CPhv1NCfI=";
|
||||
sha256 = "sha256-AkpRbYOe30dWDcflCGXxJz8Y+9bQw9ZmZF88ra2c+fc=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "pvr-hts";
|
||||
namespace = "pvr.hts";
|
||||
version = "21.2.5";
|
||||
version = "21.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.hts";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-BG5mGD674gvjUSdydu4g3F/4GH53gkJoKMDuvaFNi6k=";
|
||||
sha256 = "sha256-opxNgin+Sz/Nb9IGZ+OFrCzbDc4FXl2LaNKUu5LAgFM=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "pvr-iptvsimple";
|
||||
namespace = "pvr.iptvsimple";
|
||||
version = "21.8.5";
|
||||
version = "21.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.iptvsimple";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-UFEZZr7Z6GqnN8ZSA+JkdsiAlf7p5xPwDOcwLzJc9v8=";
|
||||
sha256 = "sha256-bw0rAEn8R44n5Nzc9ni6IGaG/Bxry6GSyWcT6BdgLz8=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "pvr-vdr-vnsi";
|
||||
namespace = "pvr.vdr.vnsi";
|
||||
version = "21.1.2";
|
||||
version = "21.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.vdr.vnsi";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-o7WVO/TvSK6bZEnUeNQhapXOVQbDlpJDObC93/9XpJo=";
|
||||
sha256 = "sha256-V/ICEK006Zs4mipywAbRl8ZdezsprCgdC2WYtc/cAAY=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [ libGL ];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "obs-color-monitor";
|
||||
version = "0.8.2";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "norihiro";
|
||||
repo = "obs-color-monitor";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-cVMpmkcw8GzNGyd80g1oKmyiEYGMcRtWtDj9MC7RYf8=";
|
||||
hash = "sha256-EIp1GQ5dKN43D7xodX/ucYcJm994eKsnidFlbLKWHuI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@@ -39,6 +39,5 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ hlad ];
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -13,18 +13,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "010editor";
|
||||
version = "15.0.1";
|
||||
version = "15.0.2";
|
||||
|
||||
src =
|
||||
if stdenv.hostPlatform.isLinux then
|
||||
fetchzip {
|
||||
url = "https://download.sweetscape.com/010EditorLinux64Installer${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-/Bfm/fPX3Szla23U9+qoq99E2v8jC3f9pgkJMTxNFUk=";
|
||||
hash = "sha256-oXwC4criDox8rac7mnJroqxMNKU7k+y7JQqc88XoRFc=";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://download.sweetscape.com/010EditorMac64Installer${finalAttrs.version}.dmg";
|
||||
hash = "sha256-hpDhcX1xS4Nry2HOIrFwqYK45JOmy66lPq6dJr9pkQg=";
|
||||
hash = "sha256-RZtFV3AbE5KfzW18usW0FS/AnX8Uets/RkVayBAODQ4=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
gtest,
|
||||
static ? stdenv.hostPlatform.isStatic,
|
||||
cxxStandard ? null,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "abseil-cpp";
|
||||
version = "20250127.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abseil";
|
||||
repo = "abseil-cpp";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-QTywqQCkyGFpdbtDBvUwz9bGXxbJs/qoFKF6zYAZUmQ=";
|
||||
};
|
||||
|
||||
cmakeFlags =
|
||||
[
|
||||
(lib.cmakeBool "ABSL_BUILD_TEST_HELPERS" true)
|
||||
(lib.cmakeBool "ABSL_USE_EXTERNAL_GOOGLETEST" true)
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!static))
|
||||
]
|
||||
++ lib.optionals (cxxStandard != null) [
|
||||
(lib.cmakeFeature "CMAKE_CXX_STANDARD" cxxStandard)
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ gtest ];
|
||||
|
||||
meta = {
|
||||
description = "Open-source collection of C++ code designed to augment the C++ standard library";
|
||||
homepage = "https://abseil.io/";
|
||||
changelog = "https://github.com/abseil/abseil-cpp/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.GaetanLepage ];
|
||||
};
|
||||
})
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "adw-gtk3";
|
||||
version = "5.6";
|
||||
version = "5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lassekongo83";
|
||||
repo = "adw-gtk3";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-S/H6JGXwEgiqmcH1W+ZyHYOkk0gQtKG9Q3BiI2IjnEM=";
|
||||
hash = "sha256-10NxXNbKQt39c5R+mgcvzjyZO7Z/lcVi+vArH+K35k8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "aichat";
|
||||
version = "0.28.0";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigoden";
|
||||
repo = "aichat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gs2nkZhz26tmFbAShLsFOgYt/RlPiqKTmdaPSG96m3E=";
|
||||
hash = "sha256-5fXZfRrHBAtjUa1VzzsdoFvXQSPQ8YUNJ7yhZlp58tM=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-cDYxT8WvryTLzBeMtp/iObdSfF84W1XT8ZN/nmoZfFY=";
|
||||
cargoHash = "sha256-YK2mps9DUs4HNFmYHtZHTJREuImlQ24y64ykGr8ovTs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -32,6 +32,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
homepage = "https://github.com/badaix/aixlog";
|
||||
changelog = "https://github.com/badaix/aixlog/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "alpaca";
|
||||
version = "5.2.0";
|
||||
version = "5.3.0";
|
||||
pyproject = false; # Built with meson
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jeffser";
|
||||
repo = "Alpaca";
|
||||
tag = version;
|
||||
hash = "sha256-uUGsdHrqzA5fZ4LNtX04H4ue9n4JQrkTYW2PCCFYFHc=";
|
||||
hash = "sha256-dp/v5PZoDqSp2h0gtZk97ImDKO201VZMiCBv2XnqoGQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "amazon-cloudwatch-agent";
|
||||
version = "1.300053.1";
|
||||
version = "1.300054.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "amazon-cloudwatch-agent";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-UyaAFBJ/GRwfnZVfFDsRSjAbMEHoiVCpo/M6c7nzA5M=";
|
||||
hash = "sha256-DakLgM3vNHHzOlQTVMGwIioPhB3YryEcm7T0xepAJu4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MrT30LZODuvzq3hqk/6D5u0ZAf2q2WB07yfjl6RbmtM=";
|
||||
vendorHash = "sha256-rw+doSJGeFl72hHA8FSL3H61KiYwatabQ7jEMOfJZ60=";
|
||||
|
||||
# See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77.
|
||||
subPackages = [
|
||||
|
||||
@@ -78,13 +78,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "ansel";
|
||||
version = "0-unstable-2025-03-18";
|
||||
version = "0-unstable-2025-03-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aurelienpierreeng";
|
||||
repo = "ansel";
|
||||
rev = "dd6127b7324f012abbdda55a56af4bcd061f0f83";
|
||||
hash = "sha256-RNYs40UcfLlkqdf8vRjAzGDYvIMjxTNdamc9kt0Eg1I=";
|
||||
rev = "62f9a4c56b02deca9fda4aff4392e4f44dea379c";
|
||||
hash = "sha256-T9go14/wMJbOzKjOnRzzmeklFPQMbrTUnXyPlVahpkQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "anubis";
|
||||
version = "1.15.1";
|
||||
version = "1.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TecharoHQ";
|
||||
repo = "anubis";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PlZEGe3kTBkTd17nTLSW6pGiUKIPVQttep92FT+10g8=";
|
||||
hash = "sha256-5OqpmuRTrM+hseIhR2sTb+K01Co6X+Rhb6mN+U54NAI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Rcra5cu7zxGm2LhL2x9Kd3j/uQaEb8OOh/j5Rhh8S1k=";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "argo-rollouts";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-rollouts";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SNzWAs1ytduU2XhPccJ+HUagh8cHcIb6zj0/EosdpTc=";
|
||||
sha256 = "sha256-C2Ha3Sdq5IOHEc9S4jb4g6do6a4Gkm4E0BVFq5TnJDM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1YtRc2xLP8QAIK+vO690zHb9tXCkR7na/zwwlIdAxgQ=";
|
||||
|
||||
@@ -14,13 +14,13 @@ let
|
||||
in
|
||||
awsStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aws-lc";
|
||||
version = "1.47.0";
|
||||
version = "1.49.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-lc";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Nf+UmtXbtWwkVT63eui5kINyzsmTYqCWXh8JlMHz1h8=";
|
||||
hash = "sha256-xJ+CIuYEpRN/P96gs9SpdAJehHy0NEoMvsroYZAHARk=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
|
||||
homepage = "https://github.com/zeromq/azmq";
|
||||
license = licenses.boost;
|
||||
description = "C++ language binding library integrating ZeroMQ with Boost Asio";
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "basilk";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabalpha";
|
||||
repo = "basilk";
|
||||
tag = version;
|
||||
hash = "sha256-b77vVf+WbDNzKwGaMJvgMEMCC41h5TXmg45OM9g4v+4=";
|
||||
hash = "sha256-ZicrgRghUvKp42H03IV1mUIV8FN5cfEx7ncqZMi9t9o=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Ak9ag/wInXtbnJRog4hHbyvMpDclWOSJ1gOIR+HwJ+8=";
|
||||
cargoHash = "sha256-e0zPA+DB1z2J0fIbIgHMSvrpyeglBssIx1Axp7TpQsw=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/fbdtemme/bencode";
|
||||
changelog = "https://github.com/fbdtemme/bencode/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.unix;
|
||||
# Broken because the default stdenv on these targets doesn't support C++20.
|
||||
broken = with stdenv; isDarwin || (isLinux && isAarch64);
|
||||
|
||||
@@ -319,6 +319,6 @@ buildGoModule rec {
|
||||
'';
|
||||
license = licenses.mpl20;
|
||||
mainProgram = "boulder";
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -18,13 +18,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "byobu";
|
||||
version = "6.12";
|
||||
version = "6.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dustinkirkland";
|
||||
repo = "byobu";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-NzC9Njsnz14mfKnERGDZw8O3vux0wnfCKwjUeTBQswc=";
|
||||
hash = "sha256-h+3BEMfBRozmpqFNRyfKzjKgevaYm8v7DsJMwkhiCQ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
curl,
|
||||
SDL2,
|
||||
libGLU,
|
||||
libGL,
|
||||
glew,
|
||||
ncurses,
|
||||
c-ares,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bzflag";
|
||||
version = "2.4.30";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.bzflag.org/bzflag/source/${finalAttrs.version}/bzflag-${finalAttrs.version}.tar.bz2";
|
||||
sha256 = "sha256-u3i3UOe856p8Eb01kGuwikmsx8UL8pYprzgO7NFTiU0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
SDL2
|
||||
libGLU
|
||||
libGL
|
||||
glew
|
||||
ncurses
|
||||
c-ares
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Multiplayer 3D Tank game";
|
||||
homepage = "https://bzflag.org/";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "carapace-bridge";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carapace-sh";
|
||||
repo = "carapace-bridge";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/HjoE6yaawo1hCemnvtfK3wj4SBSW91D4oyuZ5qxV4M=";
|
||||
hash = "sha256-NdEGQp3fd/dIZqGYut6tz9oze48ym/+05X8CMQhFKzk=";
|
||||
};
|
||||
|
||||
# buildGoModule try to run `go mod vendor` instead of `go work vendor` on the
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
let
|
||||
argset = {
|
||||
pname = "chezmoi";
|
||||
version = "2.60.1";
|
||||
version = "2.61.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${argset.version}";
|
||||
hash = "sha256-Rfh7b/G/6oIc+m13ReLOn8OdQ5SvV0Jt1vxpwAKRJyI=";
|
||||
hash = "sha256-ikknqi6kfXJSI4qfzwYyU97IpQEMUBV+RCPdZIzFHoE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-G+xntx8Igz2NiG7jwC5nP2QOCrPEyHOgVUxfrbRSOp0=";
|
||||
vendorHash = "sha256-IWZokKY98/ptitZNFnOajOkGca3vnepCF1CP69NTrKw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "console-setup";
|
||||
version = "1.234";
|
||||
version = "1.235";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "installer-team";
|
||||
repo = "console-setup";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Sd2/bSBv7kb7CiPYGdK/3AkZQtIY0bCVSN7pGZzyvfM=";
|
||||
hash = "sha256-EGUPj5MesEhC+W6E+8Cute3HtpurwZk0TlcLBReepvI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -39,13 +39,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cpu-x";
|
||||
version = "5.1.3";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "X0rg";
|
||||
repo = "CPU-X";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gD5sEeALbGwMBP2UDc28TnVBlbCRMIeqWkrq0oi97Nw=";
|
||||
hash = "sha256-7SZJgz4Xc7/0LouX/63BvFRqtQl/+biHulWzcdkkfjM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "croc";
|
||||
version = "10.2.1";
|
||||
version = "10.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schollz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T75RyUjni7pNOxSe90xYW8426g3XjtI7YN0z8WADusQ=";
|
||||
hash = "sha256-tRWkokgs2SZglkgzK+UxwzbTk99GcPgDBcgJkMURNJ8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IL2nKlxJ08xBCW9mnHlPlOccgjHSeLt6ISpMMiBf7J8=";
|
||||
vendorHash = "sha256-oyLjCORfx3Pf8T1EQqM9XBrmQyMSDHy2X2axh1L79PQ=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "dependabot-cli";
|
||||
version = "1.57.0";
|
||||
version = "1.62.1";
|
||||
|
||||
# vv Also update this vv
|
||||
tag = "nixpkgs-dependabot-cli-${version}";
|
||||
@@ -45,10 +45,10 @@ buildGoModule {
|
||||
owner = "dependabot";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZT1fwDT19uUjp5iG0NLSrc/6PLW/sukAd0w66mLdFVg=";
|
||||
hash = "sha256-BD95YCPKoU/crlBPWYejI6kydpXhmYNAgtMEGi+iRsY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jSINiETadd0ixzFBilgphi1vJNsRYeDkbaVNk5stTp4=";
|
||||
vendorHash = "sha256-0Q2+UK8giWL4cYJwfZ8gAAAEIYSqjadnUWJghVeIPjQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
+14
-14
@@ -11,8 +11,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Windows.CsWin32",
|
||||
"version": "0.3.106",
|
||||
"hash": "sha256-S1uQa684taPb6uh69784ebVpXoirMoX+pxBRA+Rrzlg="
|
||||
"version": "0.3.183",
|
||||
"hash": "sha256-bn0rHYoVLRTqiZqkkp6u3PMKtg0NNxA2F++1e/+3Jhw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Windows.SDK.Win32Docs",
|
||||
@@ -21,23 +21,23 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Windows.SDK.Win32Metadata",
|
||||
"version": "60.0.34-preview",
|
||||
"hash": "sha256-KdRe73sXipzMvm2BLmwwBZGh+l9isZDC9l8WFyUR1zM="
|
||||
"version": "61.0.15-preview",
|
||||
"hash": "sha256-OB60ThIv8e7AMGaRRzJ8dWme5HjN+Q0HoUDquP2ejTg="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Windows.WDK.Win32Metadata",
|
||||
"version": "0.11.4-experimental",
|
||||
"hash": "sha256-b3oKUKbr+3Udfl7RWzUY9BR/XWNsN+VmEkBxk6KiFo0="
|
||||
"version": "0.12.8-experimental",
|
||||
"hash": "sha256-YaN6JlgnpIooLYu3NdFVHwoqFwZYTeePtekXCfTiLTo="
|
||||
},
|
||||
{
|
||||
"pname": "protobuf-net",
|
||||
"version": "3.2.45",
|
||||
"hash": "sha256-rWitxe3uP3SOyoG1fwM5n00RpR5IL1V6u1zXMI0p0JA="
|
||||
"version": "3.2.46",
|
||||
"hash": "sha256-NirxAUXEIUQz0HHLS+KS4fgOZwJy1zJZYGcjPa5ujTs="
|
||||
},
|
||||
{
|
||||
"pname": "protobuf-net.Core",
|
||||
"version": "3.2.45",
|
||||
"hash": "sha256-bsMGUmd0yno8g0H0637jJboKJwyyHLHoHg45+bt9pLQ="
|
||||
"version": "3.2.46",
|
||||
"hash": "sha256-Srg7pP7rleL462idLPFUxgXBLrywWeHFyEvSV+keA4E="
|
||||
},
|
||||
{
|
||||
"pname": "QRCoder",
|
||||
@@ -46,8 +46,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "SteamKit2",
|
||||
"version": "3.0.1",
|
||||
"hash": "sha256-OnfUEPSEE9J6oTO1NFsa1MJRWvEH5MDR1wsGedKGzgI="
|
||||
"version": "3.0.2",
|
||||
"hash": "sha256-bRiLFaq/hsr+7BKtSKoD2+pf0VCGhBYe/rO3DgqMZpo="
|
||||
},
|
||||
{
|
||||
"pname": "System.Collections.Immutable",
|
||||
@@ -56,8 +56,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Hashing",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-k6Pdndm5fTD6CB1QsQfP7G+2h4B30CWIsuvjHuBg3fc="
|
||||
"version": "9.0.1",
|
||||
"hash": "sha256-IJru9BdFNsNs7FbG+F9djJdkkWdpoz2IxQ+GgvKvUOs="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.AccessControl",
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "depotdownloader";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SteamRE";
|
||||
repo = "DepotDownloader";
|
||||
rev = "DepotDownloader_${version}";
|
||||
hash = "sha256-QfnSs8pmWq/+64XdJskYxmUDKbHCnhA6Xd8VrTUaeJE=";
|
||||
hash = "sha256-xqy2SNyvJjisaPUyPsnXs6cVbT9SGdeVegVub+cs/LQ=";
|
||||
};
|
||||
|
||||
projectFile = "DepotDownloader.sln";
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "di";
|
||||
version = "5.0.14";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/diskinfo-di/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-H/5UgMT7CfzaCQnIsytRnGC1cV2mF6/SQxEU1dVDKtk=";
|
||||
sha256 = "sha256-e2Y+TbBEsfpJhr0Bj4J8GOlv5tH5o2cy3LsEUOf1GMs=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "distrobox";
|
||||
version = "1.8.1";
|
||||
version = "1.8.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "89luca89";
|
||||
repo = "distrobox";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-SwSb3UETvimRtbcmD9f6A57MpnHP6p9trW+OBQW5ZyY=";
|
||||
hash = "sha256-wTu+8SQZaf8TKkjyvKqTvIWnCZTiPnozybTu5uKXEJk=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "dotenvx";
|
||||
version = "1.38.5";
|
||||
version = "1.39.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dotenvx";
|
||||
repo = "dotenvx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-v1sLIK0lVAazhNIz3uzXAdKfaHAPW57TGm1gLogvGOc=";
|
||||
hash = "sha256-viIW2bQTcfoMhppv96TxD+i85ltGzNrPzZAeYPNcHeI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-aFC1cCPHuiQmXoVDc4+0yO22c7AhRpehiUGG81rIlvw=";
|
||||
npmDepsHash = "sha256-SVrsvl2Mw59hsh+RBZV5bZ5Qz5reg1hrDYRYq5y0UIw=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "double-entry-generator";
|
||||
version = "2.8.0";
|
||||
version = "2.7.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "deb-sig";
|
||||
repo = "double-entry-generator";
|
||||
hash = "sha256-sQiV+sdPTTiydlAbmVfMHijNnfAICMvd5ezAP+1CVWc=";
|
||||
hash = "sha256-2Y8Spj1LAVZsUgChDYDCZ63pTH+nqs2ff9xcmC+gr0c=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/QMt8zPvHM9znUc0+iUC82bOUJoBmH+shJ9D7AHiQ1E=";
|
||||
vendorHash = "sha256-Xedva9oGteOnv3rP4Wo3sOHIPyuy2TYwkZV2BAuxY4M=";
|
||||
|
||||
excludedPackages = [ "hack" ];
|
||||
|
||||
|
||||
@@ -33,14 +33,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dwarfs";
|
||||
version = "0.11.0";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhx";
|
||||
repo = "dwarfs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-UOIHtyOGKG0WPwKS1z0agMTvI0RF5sapJ5GoJ7a8+Vs=";
|
||||
hash = "sha256-6dsBWQFYjxg1oxcbc7pzK69plbCIaOW2QFzhmYrm0ck=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
let
|
||||
pname = "erigon";
|
||||
version = "2.61.3";
|
||||
version = "3.0.0";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@@ -16,11 +16,11 @@ buildGoModule {
|
||||
owner = "ledgerwatch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VGLuPaGYx/DQc3Oc9wAbELXAtkuxr8cbePVBExlZikk=";
|
||||
hash = "sha256-63wh9D5D9qzABEvKCBxBRHYuGBnlX+hrme56STkyoQU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1LB2T0o9LjFdpl86NPMKx1lFLrQZefAGldcSQyL6O7M=";
|
||||
vendorHash = "sha256-Mvat9+mbgpept9g8pYNf4a/bAGZGBM0MAM417DDIT9w=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Build errors in mdbx when format hardening is enabled:
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "f3";
|
||||
version = "8.0";
|
||||
version = "9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AltraMayor";
|
||||
repo = "f3";
|
||||
rev = "v${version}";
|
||||
sha256 = "17l5vspfcgfbkqg7bakp3gql29yb05gzawm8n3im30ilzdr53678";
|
||||
sha256 = "sha256-ZajlFGXJcYUVe/wUFfdPYVW8stOo1Aqe8uD2Bm9KIk0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcron";
|
||||
version = "3.3.3";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://fcron.free.fr/archives/${pname}-${version}.src.tar.gz";
|
||||
sha256 = "sha256-5bSMm3jLOM+ySgONyxOgi1EhiJN1N49C88lLwlDSFJc=";
|
||||
sha256 = "sha256-9Of8VTzdcP9LO2rJE4s7fP+rkZi4wmbZevCodQbg4bU=";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
@@ -80,7 +80,7 @@ buildGoModule rec {
|
||||
homepage = "https://fetchit.readthedocs.io";
|
||||
changelog = "https://github.com/containers/fetchit/releases/tag/${src.rev}";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
let
|
||||
# make install will use dconf to find desktop background file uri.
|
||||
# consider adding an args to allow specify pictures manually.
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20241208/Makefile#L38
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20250330/Makefile#L38
|
||||
fake-dconf = writeScriptBin "dconf" "echo -n";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flat-remix-gnome";
|
||||
version = "20241208";
|
||||
version = "20250330";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daniruiz";
|
||||
repo = "flat-remix-gnome";
|
||||
rev = version;
|
||||
hash = "sha256-pMxdx/D3M2DwEjrOZx/zY4zZjBUamo7+8/yvVOffxx0=";
|
||||
hash = "sha256-Ho2tqJgitSdk/i2jH5jhD3XLyy6BXUhyhb6UV7g1waM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
# make install will back up this file, it will fail if the file doesn't exist.
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20241208/Makefile#L56
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20250330/Makefile#L56
|
||||
preInstall = ''
|
||||
mkdir -p $out/share/gnome-shell/
|
||||
touch $out/share/gnome-shell/gnome-shell-theme.gresource
|
||||
|
||||
@@ -5,9 +5,9 @@ source "https://rubygems.org"
|
||||
# Specify your gem's dependencies in flatito.gemspec
|
||||
gemspec
|
||||
|
||||
gem "minitest", "~> 5.22"
|
||||
gem "rake", "~> 13.0"
|
||||
gem "rubocop", "~> 1.62"
|
||||
gem "rubocop-minitest", "~> 0.35"
|
||||
gem "rubocop-performance", "~> 1.11"
|
||||
gem "rubocop-rake", "~> 0.6"
|
||||
gem "minitest", "~> 5.25"
|
||||
gem "rake", "~> 13.2"
|
||||
gem "rubocop", "~> 1.73"
|
||||
gem "rubocop-minitest", "~> 0.37"
|
||||
gem "rubocop-performance", "~> 1.24"
|
||||
gem "rubocop-rake", "~> 0.7"
|
||||
|
||||
@@ -7,56 +7,60 @@ PATH
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
ast (2.4.2)
|
||||
ast (2.4.3)
|
||||
colorize (1.1.0)
|
||||
json (2.7.1)
|
||||
language_server-protocol (3.17.0.3)
|
||||
minitest (5.22.3)
|
||||
parallel (1.24.0)
|
||||
parser (3.3.0.5)
|
||||
json (2.10.2)
|
||||
language_server-protocol (3.17.0.4)
|
||||
lint_roller (1.1.0)
|
||||
minitest (5.25.5)
|
||||
parallel (1.26.3)
|
||||
parser (3.3.7.2)
|
||||
ast (~> 2.4.1)
|
||||
racc
|
||||
racc (1.7.3)
|
||||
racc (1.8.1)
|
||||
rainbow (3.1.1)
|
||||
rake (13.1.0)
|
||||
regexp_parser (2.9.0)
|
||||
rexml (3.2.6)
|
||||
rubocop (1.62.1)
|
||||
rake (13.2.1)
|
||||
regexp_parser (2.10.0)
|
||||
rubocop (1.74.0)
|
||||
json (~> 2.3)
|
||||
language_server-protocol (>= 3.17.0)
|
||||
language_server-protocol (~> 3.17.0.2)
|
||||
lint_roller (~> 1.1.0)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 3.3.0.2)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
regexp_parser (>= 1.8, < 3.0)
|
||||
rexml (>= 3.2.5, < 4.0)
|
||||
rubocop-ast (>= 1.31.1, < 2.0)
|
||||
regexp_parser (>= 2.9.3, < 3.0)
|
||||
rubocop-ast (>= 1.38.0, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 2.4.0, < 3.0)
|
||||
rubocop-ast (1.31.2)
|
||||
parser (>= 3.3.0.4)
|
||||
rubocop-minitest (0.35.0)
|
||||
rubocop (>= 1.61, < 2.0)
|
||||
rubocop-ast (>= 1.31.1, < 2.0)
|
||||
rubocop-performance (1.20.2)
|
||||
rubocop (>= 1.48.1, < 2.0)
|
||||
rubocop-ast (>= 1.30.0, < 2.0)
|
||||
rubocop-rake (0.6.0)
|
||||
rubocop (~> 1.0)
|
||||
unicode-display_width (>= 2.4.0, < 4.0)
|
||||
rubocop-ast (1.41.0)
|
||||
parser (>= 3.3.7.2)
|
||||
rubocop-minitest (0.37.1)
|
||||
lint_roller (~> 1.1)
|
||||
rubocop (>= 1.72.1, < 2.0)
|
||||
rubocop-ast (>= 1.38.0, < 2.0)
|
||||
rubocop-performance (1.24.0)
|
||||
lint_roller (~> 1.1)
|
||||
rubocop (>= 1.72.1, < 2.0)
|
||||
rubocop-ast (>= 1.38.0, < 2.0)
|
||||
rubocop-rake (0.7.1)
|
||||
lint_roller (~> 1.1)
|
||||
rubocop (>= 1.72.1)
|
||||
ruby-progressbar (1.13.0)
|
||||
unicode-display_width (2.5.0)
|
||||
unicode-display_width (3.1.4)
|
||||
unicode-emoji (~> 4.0, >= 4.0.4)
|
||||
unicode-emoji (4.0.4)
|
||||
|
||||
PLATFORMS
|
||||
arm64-darwin-22
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
flatito!
|
||||
minitest (~> 5.22)
|
||||
rake (~> 13.0)
|
||||
rubocop (~> 1.62)
|
||||
rubocop-minitest (~> 0.35)
|
||||
rubocop-performance (~> 1.11)
|
||||
rubocop-rake (~> 0.6)
|
||||
minitest (~> 5.25)
|
||||
rake (~> 13.2)
|
||||
rubocop (~> 1.73)
|
||||
rubocop-minitest (~> 0.37)
|
||||
rubocop-performance (~> 1.24)
|
||||
rubocop-rake (~> 0.7)
|
||||
|
||||
BUNDLED WITH
|
||||
2.5.6
|
||||
2.6.2
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
|
||||
sha256 = "10yknjyn0728gjn6b5syynvrvrwm66bhssbxq8mkhshxghaiailm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.2";
|
||||
version = "2.4.3";
|
||||
};
|
||||
colorize = {
|
||||
groups = [ "default" ];
|
||||
@@ -34,40 +34,50 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq";
|
||||
sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.1";
|
||||
version = "2.10.2";
|
||||
};
|
||||
language_server-protocol = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x";
|
||||
sha256 = "0scnz2fvdczdgadvjn0j9d49118aqm3hj66qh8sd2kv6g1j65164";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.17.0.3";
|
||||
version = "3.17.0.4";
|
||||
};
|
||||
lint_roller = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "11yc0d84hsnlvx8cpk4cbj6a4dz9pk0r1k29p0n1fz9acddq831c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
minitest = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a";
|
||||
sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.22.3";
|
||||
version = "5.25.5";
|
||||
};
|
||||
parallel = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "15wkxrg1sj3n1h2g8jcrn7gcapwcgxr659ypjf75z1ipkgxqxwsv";
|
||||
sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.24.0";
|
||||
version = "1.26.3";
|
||||
};
|
||||
parser = {
|
||||
dependencies = [
|
||||
@@ -78,20 +88,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "11r6kp8wam0nkfvnwyc1fmvky102r1vcfr84vi2p1a2wa0z32j3p";
|
||||
sha256 = "0pxnbysqw7qx6wq48mibi6nflpjylxd1nn38l9cl9f70dc3yj7f7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.3.0.5";
|
||||
version = "3.3.7.2";
|
||||
};
|
||||
racc = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
|
||||
sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.3";
|
||||
version = "1.8.1";
|
||||
};
|
||||
rainbow = {
|
||||
groups = [ "default" ];
|
||||
@@ -108,40 +118,30 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
|
||||
sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "13.1.0";
|
||||
version = "13.2.1";
|
||||
};
|
||||
regexp_parser = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1ndxm0xnv27p4gv6xynk6q41irckj76q1jsqpysd9h6f86hhp841";
|
||||
sha256 = "0qccah61pjvzyyg6mrp27w27dlv6vxlbznzipxjcswl7x3fhsvyb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.9.0";
|
||||
};
|
||||
rexml = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.6";
|
||||
version = "2.10.0";
|
||||
};
|
||||
rubocop = {
|
||||
dependencies = [
|
||||
"json"
|
||||
"language_server-protocol"
|
||||
"lint_roller"
|
||||
"parallel"
|
||||
"parser"
|
||||
"rainbow"
|
||||
"regexp_parser"
|
||||
"rexml"
|
||||
"rubocop-ast"
|
||||
"ruby-progressbar"
|
||||
"unicode-display_width"
|
||||
@@ -150,10 +150,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0daamn13fbm77rdwwa4w6j6221iq6091asivgdhk6n7g398frcdf";
|
||||
sha256 = "16rp45aygc0djhcsc982rc3r16g3anrlh0dwb8yrc76iswsql4q6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.62.1";
|
||||
version = "1.74.0";
|
||||
};
|
||||
rubocop-ast = {
|
||||
dependencies = [ "parser" ];
|
||||
@@ -161,13 +161,14 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1v3q8n48w8h809rqbgzihkikr4g3xk72m1na7s97jdsmjjq6y83w";
|
||||
sha256 = "03bwgjbldrxgzcskv3lz7kv2ymccbz0wp1y6wcijix236ynzkvqf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.31.2";
|
||||
version = "1.41.0";
|
||||
};
|
||||
rubocop-minitest = {
|
||||
dependencies = [
|
||||
"lint_roller"
|
||||
"rubocop"
|
||||
"rubocop-ast"
|
||||
];
|
||||
@@ -175,13 +176,14 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "001f4xcs3p0g04cyqfdkb2i1lld0yjmnx1s11y9z2id4b2lg64c4";
|
||||
sha256 = "0dhd8s819wsd6wcq30qhcjgwjnprm9njjrxwa0z1jnd86p4c5p6w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.35.0";
|
||||
version = "0.37.1";
|
||||
};
|
||||
rubocop-performance = {
|
||||
dependencies = [
|
||||
"lint_roller"
|
||||
"rubocop"
|
||||
"rubocop-ast"
|
||||
];
|
||||
@@ -189,21 +191,24 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0cf7fn4dwf45r3nhnda0dhnwn8qghswyqbfxr2ippb3z8a6gmc8v";
|
||||
sha256 = "1da08idjsdclcm9cimjbvd1jz2gm6z62fsc8mywrb0rn7vzkkgg5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.20.2";
|
||||
version = "1.24.0";
|
||||
};
|
||||
rubocop-rake = {
|
||||
dependencies = [ "rubocop" ];
|
||||
dependencies = [
|
||||
"lint_roller"
|
||||
"rubocop"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1nyq07sfb3vf3ykc6j2d5yq824lzq1asb474yka36jxgi4hz5djn";
|
||||
sha256 = "0kdfrckz1v32dy7c7bdiksjysx9l9zsda9kc6zvrsghch6vg55rp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.0";
|
||||
version = "0.7.1";
|
||||
};
|
||||
ruby-progressbar = {
|
||||
groups = [ "default" ];
|
||||
@@ -216,13 +221,24 @@
|
||||
version = "1.13.0";
|
||||
};
|
||||
unicode-display_width = {
|
||||
dependencies = [ "unicode-emoji" ];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
|
||||
sha256 = "1has87asspm6m9wgqas8ghhhwyf2i1yqrqgrkv47xw7jq3qjmbwc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.0";
|
||||
version = "3.1.4";
|
||||
};
|
||||
unicode-emoji = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0ajk6rngypm3chvl6r0vwv36q1931fjqaqhjjya81rakygvlwb1c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.4";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
ruby,
|
||||
buildRubyGem,
|
||||
bundlerEnv,
|
||||
bundlerUpdateScript,
|
||||
}:
|
||||
let
|
||||
deps = bundlerEnv rec {
|
||||
@@ -30,6 +31,8 @@ buildRubyGem rec {
|
||||
source.sha256 = "sha256-n1qPiZoUwaD+dMuJKI8k3cR71dg6yIrIAj0ZsFbstQ8=";
|
||||
propagatedBuildInputs = [ deps ];
|
||||
|
||||
passthru.updateScript = bundlerUpdateScript "${pname}";
|
||||
|
||||
meta = with lib; {
|
||||
description = "It allows you to search for a key and get the value and the line number where it is located in YAML and JSON files";
|
||||
homepage = "https://github.com/ceritium/flatito";
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flink";
|
||||
version = "1.20.1";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz";
|
||||
sha256 = "sha256-X8RVHNEa7oOpVpOSM5xD+zKmCEfbRW4ctPpkyNquAYY=";
|
||||
sha256 = "sha256-BP5b6YQaENMODhzWguxNAVqGYD9xDy+FfEPHW+rpeq0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flowblade";
|
||||
version = "2.18.1";
|
||||
version = "2.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jliljebl";
|
||||
repo = "flowblade";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TV/oOA7m8VbvaZe9oujqsB4KJcmYBBo9p2bagpFTwrY=";
|
||||
sha256 = "sha256-5w8mGFPOawbUwinzVLSCUZWGxuyxhi1/3tOrmQyfUUg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
homepage = "https://github.com/phillbush/focus";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,17 +9,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fselect";
|
||||
version = "0.8.10";
|
||||
version = "0.8.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jhspetersson";
|
||||
repo = "fselect";
|
||||
rev = version;
|
||||
sha256 = "sha256-9JSyPNXiBMwPxhVWL5M6o/nnzDJv5MmWYqC1veinZuI=";
|
||||
sha256 = "sha256-S7SFcOhFl5dVgUl2qlsE/Bizq8v0NPKPqBggzPGoOu8=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-cRF/drfdmUccb9Y/RKB3Bs748Y5dJUCgsFJxklAZB9Q=";
|
||||
cargoHash = "sha256-r6GKJGJThaaawHcL+IL29Vy/NXmA75eswEBWDS/zs1g=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "geteduroam-cli";
|
||||
version = "0.4";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geteduroam";
|
||||
repo = "linux-app";
|
||||
tag = version;
|
||||
hash = "sha256-9+IjrHg536/6ulj94CBhYWY0S3aNA7Ne4JQynMmsLxE=";
|
||||
hash = "sha256-2iAvE38r3iwulBqW+rrbrpNVgQlDhhcVUsjZSOT5P1A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9SNjOC59wcEkxJqBXsgYClHKGH7OFWk3t/wMPLANAy0=";
|
||||
vendorHash = "sha256-b06wnqT88J7etNTFJ6nE9Uo0gOQOGvvs0vPNnJr6r4Q=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/geteduroam-cli"
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glbinding";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cginternals";
|
||||
repo = "glbinding";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xmEXZ1ssXzrElqd6D1zooFxLEyspsF4Dau3d9+1/2yw=";
|
||||
sha256 = "sha256-EHvudihHL/MEVo0lbSqxrgc6TJnPH8Ia6bCJK0yNCbg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -20,11 +20,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnote";
|
||||
version = "47.2";
|
||||
version = "48.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-mmDxaSSA9k0WbTHmVkoP8kgSelmOL/f2NX3AsuwlsWg=";
|
||||
hash = "sha256-DZ20NCmXf4IS5wMC80EbTt6qDNKYt8yMTAad5uTeGn8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -33,6 +33,6 @@ buildGoModule rec {
|
||||
description = "Dead simple, no frills Go cross compile tool";
|
||||
mainProgram = "gox";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "guile-goblins";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://spritely.institute/files/releases/guile-goblins/guile-goblins-${version}.tar.gz";
|
||||
hash = "sha256-H4mBn0Fe32J99pybfa7jMfxBBvmTfffbAcchujuC3bc=";
|
||||
hash = "sha256-2oPS6Ar0ee7BQBtjvhJCCQYXK2TLIiADiCwnDaHPGBc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -34,10 +34,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gwyddion";
|
||||
version = "2.67";
|
||||
version = "2.68";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz";
|
||||
sha256 = "sha256-kK6vTeADc2lrC+9KgqxFtih62ce3rKYkkGjU0qT8jWE=";
|
||||
sha256 = "sha256-clw/cXODYrELHiz3bTkWhM8vFacaKzTvHK3avW1am/o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "heroku";
|
||||
version = "10.2.0";
|
||||
version = "10.4.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://cli-assets.heroku.com/versions/10.2.0/9d9128b/heroku-v10.2.0-9d9128b-linux-x64.tar.xz";
|
||||
hash = "sha256-RIkRcJc+pFu4czwlNgo8ntmKu/ihY25Q6jBCP6pEIdI=";
|
||||
url = "https://cli-assets.heroku.com/versions/10.4.0/467b8ab/heroku-v10.4.0-467b8ab-linux-x64.tar.xz";
|
||||
hash = "sha256-SSZby3CjNOaukrc8Bv/8OwWY6JkU6XpXvfEt/kh4Rig=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -11,18 +11,18 @@
|
||||
}:
|
||||
let
|
||||
pname = "homebox";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sysadminsmedia";
|
||||
repo = "homebox";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XzO/aJcLGu+ZHt9fDUhUzBbUS9VpChFVOH0cgvYK6kc=";
|
||||
hash = "sha256-6iNlx0lBVU/awUZHqRYFKe84D86EJNFF7Nm1XChs75w=";
|
||||
};
|
||||
in
|
||||
buildGo123Module {
|
||||
inherit pname version src;
|
||||
|
||||
vendorHash = "sha256-Zo/yI1mNeN0O9gZsHux6aOzBlv72h17s7QNO+MaG2/g=";
|
||||
vendorHash = "sha256-TxuydZjlT8Y4BB77Z8Tyn8j0SPTU2O12TNm9PQGZXTw=";
|
||||
modRoot = "backend";
|
||||
# the goModules derivation inherits our buildInputs and buildPhases
|
||||
# Since we do pnpm thing in those it fails if we don't explicitly remove them
|
||||
@@ -38,7 +38,7 @@ buildGo123Module {
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit pname version;
|
||||
src = "${src}/frontend";
|
||||
hash = "sha256-nbZxCUXgXoaxIiJsB57OZ7YUkD7Njccj6nFkaHBbctw=";
|
||||
hash = "sha256-NjuthspxojlrCofAj4Egre8s5PG7vvPJW5mzrvAW4TQ=";
|
||||
};
|
||||
pnpmRoot = "../frontend";
|
||||
|
||||
@@ -71,6 +71,14 @@ buildGo123Module {
|
||||
"-X main.version=${version}"
|
||||
"-X main.commit=${version}"
|
||||
];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp -r $GOPATH/bin/api $out/bin/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "hydrus";
|
||||
version = "612";
|
||||
version = "614";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zRaabW1QwNNgA3F84CFSDbxyALV74T3t8u8WdL8GwG0=";
|
||||
hash = "sha256-7UYi2dbpoGy373akOKFJjssxMdCKjpv4IgPMqBoe93Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -162,7 +162,7 @@ python3Packages.buildPythonApplication rec {
|
||||
description = "Danbooru-like image tagging and searching system for the desktop";
|
||||
license = lib.licenses.wtfpl;
|
||||
homepage = "https://hydrusnetwork.github.io/hydrus/";
|
||||
changelog = "https://github.com/hydrusnetwork/hydrus/releases/tag/v${version}";
|
||||
changelog = "https://github.com/hydrusnetwork/hydrus/releases/tag/${src.tag}";
|
||||
maintainers = with lib.maintainers; [
|
||||
dandellion
|
||||
evanjs
|
||||
|
||||
@@ -1,409 +0,0 @@
|
||||
From bce09ab2a483a29479518e28511a99a56c0ac943 Mon Sep 17 00:00:00 2001
|
||||
From: xinyangli <lixinyang411@gmail.com>
|
||||
Date: Sun, 1 Sep 2024 16:39:29 +0800
|
||||
Subject: [PATCH 1/3] refactor:use gtest instead of libgtest.a, .so can be used
|
||||
if provided
|
||||
|
||||
---
|
||||
.../iNO/external_libs/ino_test_external_libs.cmake | 11 ++++++-----
|
||||
.../iPL/external_libs/ipl_test_external_libs.cmake | 7 ++++---
|
||||
.../iTO/external_libs/ito_test_external_libs.cmake | 11 ++++++-----
|
||||
3 files changed, 16 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/src/operation/iNO/external_libs/ino_test_external_libs.cmake b/src/operation/iNO/external_libs/ino_test_external_libs.cmake
|
||||
index be5764cc..cc3460a6 100644
|
||||
--- a/src/operation/iNO/external_libs/ino_test_external_libs.cmake
|
||||
+++ b/src/operation/iNO/external_libs/ino_test_external_libs.cmake
|
||||
@@ -1,8 +1,9 @@
|
||||
add_library(ino_test_external_libs INTERFACE)
|
||||
|
||||
-target_link_libraries(ino_test_external_libs
|
||||
+target_link_libraries(ino_test_external_libs
|
||||
INTERFACE
|
||||
- libgtest.a
|
||||
- libgtest_main.a
|
||||
- pthread
|
||||
-)
|
||||
\ No newline at end of file
|
||||
+ gtest
|
||||
+ gtest_main
|
||||
+ pthread
|
||||
+)
|
||||
+
|
||||
diff --git a/src/operation/iPL/external_libs/ipl_test_external_libs.cmake b/src/operation/iPL/external_libs/ipl_test_external_libs.cmake
|
||||
index 9accbee5..b763f91e 100644
|
||||
--- a/src/operation/iPL/external_libs/ipl_test_external_libs.cmake
|
||||
+++ b/src/operation/iPL/external_libs/ipl_test_external_libs.cmake
|
||||
@@ -2,7 +2,8 @@ add_library(ipl-test_external_libs INTERFACE)
|
||||
|
||||
target_link_libraries(ipl-test_external_libs
|
||||
INTERFACE
|
||||
- libgtest.a
|
||||
- libgtest_main.a
|
||||
+ gtest
|
||||
+ gtest_main
|
||||
pthread
|
||||
-)
|
||||
\ No newline at end of file
|
||||
+)
|
||||
+
|
||||
diff --git a/src/operation/iTO/external_libs/ito_test_external_libs.cmake b/src/operation/iTO/external_libs/ito_test_external_libs.cmake
|
||||
index 9382d2e3..582e7abc 100644
|
||||
--- a/src/operation/iTO/external_libs/ito_test_external_libs.cmake
|
||||
+++ b/src/operation/iTO/external_libs/ito_test_external_libs.cmake
|
||||
@@ -1,8 +1,9 @@
|
||||
add_library(ito_test_external_libs INTERFACE)
|
||||
|
||||
-target_link_libraries(ito_test_external_libs
|
||||
+target_link_libraries(ito_test_external_libs
|
||||
INTERFACE
|
||||
- libgtest.a
|
||||
- libgtest_main.a
|
||||
- pthread
|
||||
-)
|
||||
\ No newline at end of file
|
||||
+ gtest
|
||||
+ gtest_main
|
||||
+ pthread
|
||||
+)
|
||||
+
|
||||
--
|
||||
2.47.0
|
||||
|
||||
|
||||
From 56cd8a3c510b884cca7ef2bbc9e279feb57a3041 Mon Sep 17 00:00:00 2001
|
||||
From: xinyangli <lixinyang411@gmail.com>
|
||||
Date: Sun, 1 Sep 2024 16:44:07 +0800
|
||||
Subject: [PATCH 2/3] fix:missing headers in gcc 13
|
||||
|
||||
---
|
||||
src/database/basic/geometry/IdbGeometry.h | 1 +
|
||||
src/database/basic/geometry/IdbLayerShape.h | 3 ++-
|
||||
src/feature/database/feature_db.h | 1 +
|
||||
.../iCTS/source/data_manager/database/CtsCellLib.hh | 3 ++-
|
||||
.../iCTS/source/data_manager/io/report/CtsReport.hh | 3 ++-
|
||||
src/operation/iCTS/source/solver/database/Net.hh | 5 ++++-
|
||||
src/operation/iFP/source/module/tap_cell/tapcell.h | 4 +++-
|
||||
src/operation/iPDN/source/module/pdn_plan/pdn_plan.h | 4 ++--
|
||||
src/operation/iPDN/source/module/pdn_via/pdn_via.h | 3 ++-
|
||||
.../iPL/source/module/detail_placer/database/DPNet.hh | 3 ++-
|
||||
.../iPL/source/module/detail_placer/database/DPPin.cc | 4 +++-
|
||||
src/operation/iRT/interface/RTInterface.hpp | 1 +
|
||||
src/third_party/CMakeLists.txt | 2 +-
|
||||
src/third_party/salt/refine/flip.cpp | 3 ++-
|
||||
14 files changed, 28 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/src/database/basic/geometry/IdbGeometry.h b/src/database/basic/geometry/IdbGeometry.h
|
||||
index ec16907c..a8b8a360 100644
|
||||
--- a/src/database/basic/geometry/IdbGeometry.h
|
||||
+++ b/src/database/basic/geometry/IdbGeometry.h
|
||||
@@ -34,6 +34,7 @@
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
+#include <cstdint>
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
diff --git a/src/database/basic/geometry/IdbLayerShape.h b/src/database/basic/geometry/IdbLayerShape.h
|
||||
index 8c7ac435..35981708 100644
|
||||
--- a/src/database/basic/geometry/IdbLayerShape.h
|
||||
+++ b/src/database/basic/geometry/IdbLayerShape.h
|
||||
@@ -31,6 +31,7 @@
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
+#include <cstdint>
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
@@ -110,4 +111,4 @@ class IdbLayerShape
|
||||
IdbLayer* _layer;
|
||||
std::vector<IdbRect*> _rect_list;
|
||||
};
|
||||
-} // namespace idb
|
||||
\ No newline at end of file
|
||||
+} // namespace idb
|
||||
diff --git a/src/feature/database/feature_db.h b/src/feature/database/feature_db.h
|
||||
index 53ee71ca..71d8c3f3 100644
|
||||
--- a/src/feature/database/feature_db.h
|
||||
+++ b/src/feature/database/feature_db.h
|
||||
@@ -31,6 +31,7 @@
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <cmath>
|
||||
+#include <cstdint>
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
diff --git a/src/operation/iCTS/source/data_manager/database/CtsCellLib.hh b/src/operation/iCTS/source/data_manager/database/CtsCellLib.hh
|
||||
index 43699ff5..b103a702 100644
|
||||
--- a/src/operation/iCTS/source/data_manager/database/CtsCellLib.hh
|
||||
+++ b/src/operation/iCTS/source/data_manager/database/CtsCellLib.hh
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <map>
|
||||
#include <span>
|
||||
#include <tuple>
|
||||
+#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include "ModelFactory.hh"
|
||||
@@ -187,4 +188,4 @@ class CtsLibs
|
||||
std::unordered_map<std::string, ModelBase*> _model_maps;
|
||||
#endif
|
||||
};
|
||||
-} // namespace icts
|
||||
\ No newline at end of file
|
||||
+} // namespace icts
|
||||
diff --git a/src/operation/iCTS/source/data_manager/io/report/CtsReport.hh b/src/operation/iCTS/source/data_manager/io/report/CtsReport.hh
|
||||
index 8798e50e..b88df74c 100644
|
||||
--- a/src/operation/iCTS/source/data_manager/io/report/CtsReport.hh
|
||||
+++ b/src/operation/iCTS/source/data_manager/io/report/CtsReport.hh
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
#include <map>
|
||||
+#include <memory>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
@@ -70,4 +71,4 @@ class CtsReportTable : public ieda::ReportTable
|
||||
static std::unique_ptr<CtsReportTable> createReportTable(const std::string& tbl_name, const CtsReportType& type);
|
||||
};
|
||||
|
||||
-} // namespace icts
|
||||
\ No newline at end of file
|
||||
+} // namespace icts
|
||||
diff --git a/src/operation/iCTS/source/solver/database/Net.hh b/src/operation/iCTS/source/solver/database/Net.hh
|
||||
index 85c1751b..5cbc0470 100644
|
||||
--- a/src/operation/iCTS/source/solver/database/Net.hh
|
||||
+++ b/src/operation/iCTS/source/solver/database/Net.hh
|
||||
@@ -20,6 +20,9 @@
|
||||
*/
|
||||
#pragma once
|
||||
class Pin;
|
||||
+#include <algorithm>
|
||||
+#include <cstdint>
|
||||
+
|
||||
#include "CTSAPI.hh"
|
||||
#include "Pin.hh"
|
||||
|
||||
@@ -70,4 +73,4 @@ class Net
|
||||
Pin* _driver_pin = nullptr;
|
||||
std::vector<Pin*> _load_pins = {};
|
||||
};
|
||||
-} // namespace icts
|
||||
\ No newline at end of file
|
||||
+} // namespace icts
|
||||
diff --git a/src/operation/iFP/source/module/tap_cell/tapcell.h b/src/operation/iFP/source/module/tap_cell/tapcell.h
|
||||
index 4af86b51..e15ba4a3 100644
|
||||
--- a/src/operation/iFP/source/module/tap_cell/tapcell.h
|
||||
+++ b/src/operation/iFP/source/module/tap_cell/tapcell.h
|
||||
@@ -16,6 +16,8 @@
|
||||
// ***************************************************************************************
|
||||
#pragma once
|
||||
|
||||
+#include <stdint.h>
|
||||
+
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
@@ -58,4 +60,4 @@ class TapCellPlacer
|
||||
int32_t getCellMasterWidthByOrient(idb::IdbCellMaster* cell_master, idb::IdbOrient orinet);
|
||||
};
|
||||
|
||||
-} // namespace ifp
|
||||
\ No newline at end of file
|
||||
+} // namespace ifp
|
||||
diff --git a/src/operation/iPDN/source/module/pdn_plan/pdn_plan.h b/src/operation/iPDN/source/module/pdn_plan/pdn_plan.h
|
||||
index e46b5c34..82de562b 100644
|
||||
--- a/src/operation/iPDN/source/module/pdn_plan/pdn_plan.h
|
||||
+++ b/src/operation/iPDN/source/module/pdn_plan/pdn_plan.h
|
||||
@@ -16,13 +16,13 @@
|
||||
// ***************************************************************************************
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "ipdn_basic.h"
|
||||
#include "pdn_cut_stripe.h"
|
||||
-
|
||||
namespace idb {
|
||||
class IdbLayer;
|
||||
class IdbSpecialWireSegment;
|
||||
@@ -108,4 +108,4 @@ class PdnPlan
|
||||
std::vector<idb::IdbSpecialWireSegment*>& segment_list_bottom);
|
||||
};
|
||||
|
||||
-} // namespace ipdn
|
||||
\ No newline at end of file
|
||||
+} // namespace ipdn
|
||||
diff --git a/src/operation/iPDN/source/module/pdn_via/pdn_via.h b/src/operation/iPDN/source/module/pdn_via/pdn_via.h
|
||||
index 837399ce..e0fe85bf 100644
|
||||
--- a/src/operation/iPDN/source/module/pdn_via/pdn_via.h
|
||||
+++ b/src/operation/iPDN/source/module/pdn_via/pdn_via.h
|
||||
@@ -16,6 +16,7 @@
|
||||
// ***************************************************************************************
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
@@ -64,4 +65,4 @@ class PdnVia
|
||||
int32_t transUnitDB(double value);
|
||||
};
|
||||
|
||||
-} // namespace ipdn
|
||||
\ No newline at end of file
|
||||
+} // namespace ipdn
|
||||
diff --git a/src/operation/iPL/source/module/detail_placer/database/DPNet.hh b/src/operation/iPL/source/module/detail_placer/database/DPNet.hh
|
||||
index f0013433..890111c5 100644
|
||||
--- a/src/operation/iPL/source/module/detail_placer/database/DPNet.hh
|
||||
+++ b/src/operation/iPL/source/module/detail_placer/database/DPNet.hh
|
||||
@@ -27,6 +27,7 @@
|
||||
#ifndef IPL_DPNET_H
|
||||
#define IPL_DPNET_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
@@ -92,4 +93,4 @@ class DPNet
|
||||
std::vector<DPPin*> _pins;
|
||||
};
|
||||
} // namespace ipl
|
||||
-#endif
|
||||
\ No newline at end of file
|
||||
+#endif
|
||||
diff --git a/src/operation/iPL/source/module/detail_placer/database/DPPin.cc b/src/operation/iPL/source/module/detail_placer/database/DPPin.cc
|
||||
index 93aea277..537b1282 100644
|
||||
--- a/src/operation/iPL/source/module/detail_placer/database/DPPin.cc
|
||||
+++ b/src/operation/iPL/source/module/detail_placer/database/DPPin.cc
|
||||
@@ -16,6 +16,8 @@
|
||||
// ***************************************************************************************
|
||||
#include "DPPin.hh"
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
namespace ipl {
|
||||
|
||||
DPPin::DPPin(std::string name)
|
||||
@@ -35,4 +37,4 @@ DPPin::~DPPin()
|
||||
{
|
||||
}
|
||||
|
||||
-} // namespace ipl
|
||||
\ No newline at end of file
|
||||
+} // namespace ipl
|
||||
diff --git a/src/operation/iRT/interface/RTInterface.hpp b/src/operation/iRT/interface/RTInterface.hpp
|
||||
index 5a6c3c18..45a4952e 100644
|
||||
--- a/src/operation/iRT/interface/RTInterface.hpp
|
||||
+++ b/src/operation/iRT/interface/RTInterface.hpp
|
||||
@@ -17,6 +17,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <any>
|
||||
+#include <cstdint>
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <string>
|
||||
diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt
|
||||
index cb66c339..29f6b02d 100644
|
||||
--- a/src/third_party/CMakeLists.txt
|
||||
+++ b/src/third_party/CMakeLists.txt
|
||||
@@ -12,4 +12,4 @@ add_subdirectory(yaml-cpp)
|
||||
# add_subdirectory(mt-kahypar)
|
||||
if(BUILD_GUI)
|
||||
add_subdirectory(tcl_qt)
|
||||
-endif()
|
||||
\ No newline at end of file
|
||||
+endif()
|
||||
diff --git a/src/third_party/salt/refine/flip.cpp b/src/third_party/salt/refine/flip.cpp
|
||||
index 5dad3766..73743f3c 100644
|
||||
--- a/src/third_party/salt/refine/flip.cpp
|
||||
+++ b/src/third_party/salt/refine/flip.cpp
|
||||
@@ -3,6 +3,7 @@
|
||||
#include "salt/base/eval.h"
|
||||
|
||||
#include <algorithm>
|
||||
+#include <array>
|
||||
|
||||
namespace salt {
|
||||
|
||||
@@ -197,4 +198,4 @@ void Refine::flip(Tree& tree) {
|
||||
} while (cur.wireLength < pre.wireLength);
|
||||
}
|
||||
|
||||
-} // namespace salt
|
||||
\ No newline at end of file
|
||||
+} // namespace salt
|
||||
--
|
||||
2.47.0
|
||||
|
||||
|
||||
From 55e689db3a9d2a51828806ab46ff655cc4c1193c Mon Sep 17 00:00:00 2001
|
||||
From: xinyangli <lixinyang411@gmail.com>
|
||||
Date: Sun, 1 Sep 2024 17:00:37 +0800
|
||||
Subject: [PATCH 3/3] fix:glog force size_t on sighandler from 0.6
|
||||
|
||||
---
|
||||
src/operation/iPL/source/module/logger/Log.cc | 5 +++--
|
||||
src/utility/log/Log.cc | 3 ++-
|
||||
2 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/operation/iPL/source/module/logger/Log.cc b/src/operation/iPL/source/module/logger/Log.cc
|
||||
index c94d3907..2fc70b31 100644
|
||||
--- a/src/operation/iPL/source/module/logger/Log.cc
|
||||
+++ b/src/operation/iPL/source/module/logger/Log.cc
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
#include "Log.hh"
|
||||
|
||||
+#include <cstddef>
|
||||
#include <filesystem>
|
||||
#include <fstream>
|
||||
#include <functional>
|
||||
@@ -40,7 +41,7 @@ namespace ipl {
|
||||
* @param {int} size
|
||||
* @return {*}
|
||||
*/
|
||||
-void SignalHandle(const char* data, int size)
|
||||
+void SignalHandle(const char* data, std::size_t size)
|
||||
{
|
||||
std::ofstream fs("glog_dump.log", std::ios::app);
|
||||
std::string str = std::string(data, size);
|
||||
@@ -101,4 +102,4 @@ void Log::makeSureDirectoryExist(std::string directory_path)
|
||||
std::filesystem::create_directories(directory_path.c_str());
|
||||
}
|
||||
|
||||
-} // namespace ipl
|
||||
\ No newline at end of file
|
||||
+} // namespace ipl
|
||||
diff --git a/src/utility/log/Log.cc b/src/utility/log/Log.cc
|
||||
index 42d43041..190566a3 100644
|
||||
--- a/src/utility/log/Log.cc
|
||||
+++ b/src/utility/log/Log.cc
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#include "Log.hh"
|
||||
|
||||
+#include <cstddef>
|
||||
#include <fstream>
|
||||
#include <functional>
|
||||
#include <iostream>
|
||||
@@ -39,7 +40,7 @@ namespace ieda {
|
||||
* @param data
|
||||
* @param size
|
||||
*/
|
||||
-void SignalHandle(const char* data, int size)
|
||||
+void SignalHandle(const char* data, std::size_t size)
|
||||
{
|
||||
std::ofstream fs("glog_dump.log", std::ios::app);
|
||||
std::string str = std::string(data, size);
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
callPackages,
|
||||
cmake,
|
||||
ninja,
|
||||
@@ -22,28 +24,34 @@
|
||||
onnxruntime,
|
||||
}:
|
||||
let
|
||||
glog-lock = glog.overrideAttrs (oldAttrs: rec {
|
||||
version = "0.6.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "glog";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xqRp9vaauBkKz2CXbh/Z4TWqhaUtqfbsSlbYZR/kW9s=";
|
||||
};
|
||||
});
|
||||
rootSrc = stdenv.mkDerivation {
|
||||
pname = "iEDA-src";
|
||||
version = "2024-09-10";
|
||||
version = "2025-03-12";
|
||||
src = fetchgit {
|
||||
url = "https://gitee.com/oscc-project/iEDA";
|
||||
rev = "a68b691b9d25fafd8c10fae3df7ef3837a42e052";
|
||||
sha256 = "sha256-0rSESfNqI3ALipNAInwcYSccq9C0WuXI9na44TyYAgY=";
|
||||
rev = "3a066726aa9521991a46d603f041831361d3ba51";
|
||||
sha256 = "sha256-iPdp1xEje8bBumI/eqhvw0llg3NAzRb8pzc3fmWMwtU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-bump-gcc.patch
|
||||
|
||||
# We need to build rust projects with rustPlatform
|
||||
# and remove hard coded linking to libonnxruntime
|
||||
./remove-subprojects-from-cmake.patch
|
||||
# This patch is to fix the build error caused by the missing of the header file,
|
||||
# and remove some libs or path that they hard-coded in the source code.
|
||||
# Should be removed after we upstream these changes.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Emin017/iEDA/commit/0eb86754063df6e21b35fd1396363ebc75b760c5.patch";
|
||||
hash = "sha256-hdH6+g3eZUxDudWqTwbaWNKS0fwfUWJPp//dqGNJQfM=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O3 -Wall")' 'set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O2")'
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
dontFixup = true;
|
||||
installPhase = ''
|
||||
@@ -56,7 +64,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "iEDA";
|
||||
version = "0-unstable-2024-10-11";
|
||||
version = "0-unstable-2025-03-12";
|
||||
|
||||
src = rootSrc;
|
||||
|
||||
@@ -87,7 +95,7 @@ stdenv.mkDerivation {
|
||||
rustpkgs.verilog-parser
|
||||
rustpkgs.liberty-parser
|
||||
gtest
|
||||
glog
|
||||
glog-lock
|
||||
gflags
|
||||
boost
|
||||
onnxruntime
|
||||
@@ -111,7 +119,10 @@ stdenv.mkDerivation {
|
||||
description = "Open-source EDA infracstructure and tools from Netlist to GDS for ASIC design";
|
||||
homepage = "https://gitee.com/oscc-project/iEDA";
|
||||
license = lib.licenses.mulan-psl2;
|
||||
maintainers = with lib.maintainers; [ xinyangli ];
|
||||
maintainers = with lib.maintainers; [
|
||||
xinyangli
|
||||
Emin017
|
||||
];
|
||||
mainProgram = "iEDA";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -1,166 +0,0 @@
|
||||
From 170a842da107e937c1c62c2a318ef84d49e1d292 Mon Sep 17 00:00:00 2001
|
||||
From: xinyangli <lixinyang411@gmail.com>
|
||||
Date: Fri, 30 Aug 2024 17:33:15 +0800
|
||||
Subject: [PATCH 1/2] fix:wrong headers in nix
|
||||
|
||||
---
|
||||
src/operation/iCTS/api/CTSAPI.hh | 1 +
|
||||
src/utility/tcl/ScriptEngine.hh | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/operation/iCTS/api/CTSAPI.hh b/src/operation/iCTS/api/CTSAPI.hh
|
||||
index c0881dc0..85c38728 100644
|
||||
--- a/src/operation/iCTS/api/CTSAPI.hh
|
||||
+++ b/src/operation/iCTS/api/CTSAPI.hh
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <string_view>
|
||||
#include <type_traits>
|
||||
#include <vector>
|
||||
+#include <optional>
|
||||
|
||||
#include "../../../database/interaction/ids.hpp"
|
||||
|
||||
diff --git a/src/utility/tcl/ScriptEngine.hh b/src/utility/tcl/ScriptEngine.hh
|
||||
index 3e679de2..78e9d24d 100644
|
||||
--- a/src/utility/tcl/ScriptEngine.hh
|
||||
+++ b/src/utility/tcl/ScriptEngine.hh
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
-#include <tcl8.6/tcl.h>
|
||||
+#include <tcl.h>
|
||||
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
--
|
||||
2.47.0
|
||||
|
||||
|
||||
From 66e3e69aa12a331d3724314ac06cd713ebb152d9 Mon Sep 17 00:00:00 2001
|
||||
From: xinyangli <lixinyang411@gmail.com>
|
||||
Date: Sat, 31 Aug 2024 23:28:30 +0800
|
||||
Subject: [PATCH 2/2] remove rust packages and onnxruntime lib from cmake
|
||||
|
||||
---
|
||||
src/database/manager/parser/liberty/CMakeLists.txt | 6 +++---
|
||||
src/database/manager/parser/spef/CMakeLists.txt | 4 ++--
|
||||
src/database/manager/parser/vcd/CMakeLists.txt | 6 +++---
|
||||
src/database/manager/parser/verilog/CMakeLists.txt | 6 +++---
|
||||
src/operation/iIR/source/iir-rust/CMakeLists.txt | 4 ++--
|
||||
src/operation/iSTA/CMakeLists.txt | 2 +-
|
||||
6 files changed, 14 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/src/database/manager/parser/liberty/CMakeLists.txt b/src/database/manager/parser/liberty/CMakeLists.txt
|
||||
index cf9ee880..c03f9dbe 100644
|
||||
--- a/src/database/manager/parser/liberty/CMakeLists.txt
|
||||
+++ b/src/database/manager/parser/liberty/CMakeLists.txt
|
||||
@@ -22,9 +22,9 @@ endif()
|
||||
|
||||
message("liberty parser rust lib path ${RUST_LIB_PATH}")
|
||||
|
||||
-ADD_EXTERNAL_PROJ(liberty)
|
||||
+# ADD_EXTERNAL_PROJ(liberty)
|
||||
|
||||
-target_link_libraries(liberty str sta-solver log ${RUST_LIB_PATH} dl)
|
||||
+target_link_libraries(liberty str sta-solver log liberty_parser dl)
|
||||
|
||||
target_include_directories(liberty PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
@@ -35,4 +35,4 @@ target_link_libraries(test_lib liberty)
|
||||
target_include_directories(test_lib PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
-install(TARGETS test_lib DESTINATION /home/taosimin/bin/iEDA_bin)
|
||||
\ No newline at end of file
|
||||
+# install(TARGETS test_lib DESTINATION /home/taosimin/bin/iEDA_bin)
|
||||
diff --git a/src/database/manager/parser/spef/CMakeLists.txt b/src/database/manager/parser/spef/CMakeLists.txt
|
||||
index 0d8672ed..9e27083b 100644
|
||||
--- a/src/database/manager/parser/spef/CMakeLists.txt
|
||||
+++ b/src/database/manager/parser/spef/CMakeLists.txt
|
||||
@@ -22,9 +22,9 @@ endif()
|
||||
|
||||
message("spef parser rust lib path ${RUST_LIB_PATH}")
|
||||
|
||||
-ADD_EXTERNAL_PROJ(spef)
|
||||
+# ADD_EXTERNAL_PROJ(spef)
|
||||
|
||||
-target_link_libraries(spef log ${RUST_LIB_PATH} dl)
|
||||
+target_link_libraries(spef log spef_parser dl)
|
||||
target_include_directories(spef PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
diff --git a/src/database/manager/parser/vcd/CMakeLists.txt b/src/database/manager/parser/vcd/CMakeLists.txt
|
||||
index 3a9cfddb..89bad504 100644
|
||||
--- a/src/database/manager/parser/vcd/CMakeLists.txt
|
||||
+++ b/src/database/manager/parser/vcd/CMakeLists.txt
|
||||
@@ -21,9 +21,9 @@ endif()
|
||||
|
||||
message("vcd parser rust lib path ${RUST_LIB_PATH}")
|
||||
|
||||
-ADD_EXTERNAL_PROJ(vcd)
|
||||
+# ADD_EXTERNAL_PROJ(vcd)
|
||||
|
||||
-target_link_libraries(vcd ${RUST_LIB_PATH} dl)
|
||||
+target_link_libraries(vcd vcd_parser dl)
|
||||
target_include_directories(vcd PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
@@ -31,4 +31,4 @@ add_executable(test_vcd ${CMAKE_CURRENT_SOURCE_DIR}/vcd_parser/test/test.cpp)
|
||||
target_link_libraries(test_vcd vcd)
|
||||
target_include_directories(test_vcd PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR})
|
||||
-
|
||||
\ No newline at end of file
|
||||
+
|
||||
diff --git a/src/database/manager/parser/verilog/CMakeLists.txt b/src/database/manager/parser/verilog/CMakeLists.txt
|
||||
index a3f21183..e2a55cfc 100644
|
||||
--- a/src/database/manager/parser/verilog/CMakeLists.txt
|
||||
+++ b/src/database/manager/parser/verilog/CMakeLists.txt
|
||||
@@ -25,12 +25,12 @@ endif()
|
||||
|
||||
message("verilog parser rust lib path ${RUST_LIB_PATH}")
|
||||
|
||||
-ADD_EXTERNAL_PROJ(verilog)
|
||||
+# ADD_EXTERNAL_PROJ(verilog)
|
||||
|
||||
-target_link_libraries(verilog str log ${ZLIB_LIBRARIES} ${RUST_LIB_PATH} dl)
|
||||
+target_link_libraries(verilog str log ${ZLIB_LIBRARIES} verilog_parser dl)
|
||||
|
||||
target_include_directories(verilog
|
||||
PUBLIC
|
||||
${HOME_OPERATION}/iSTA/include
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
-)
|
||||
\ No newline at end of file
|
||||
+)
|
||||
diff --git a/src/operation/iIR/source/iir-rust/CMakeLists.txt b/src/operation/iIR/source/iir-rust/CMakeLists.txt
|
||||
index 69e7009c..049c0012 100644
|
||||
--- a/src/operation/iIR/source/iir-rust/CMakeLists.txt
|
||||
+++ b/src/operation/iIR/source/iir-rust/CMakeLists.txt
|
||||
@@ -22,6 +22,6 @@ endif()
|
||||
|
||||
message("iIR rust lib path ${RUST_LIB_PATH}")
|
||||
|
||||
-ADD_EXTERNAL_PROJ(iir)
|
||||
+# ADD_EXTERNAL_PROJ(iir)
|
||||
|
||||
-target_link_libraries(iIR-Rust PRIVATE ${RUST_LIB_PATH} dl)
|
||||
\ No newline at end of file
|
||||
+target_link_libraries(iIR-Rust PRIVATE iir dl)
|
||||
diff --git a/src/operation/iSTA/CMakeLists.txt b/src/operation/iSTA/CMakeLists.txt
|
||||
index 31563917..9a1207a5 100644
|
||||
--- a/src/operation/iSTA/CMakeLists.txt
|
||||
+++ b/src/operation/iSTA/CMakeLists.txt
|
||||
@@ -24,7 +24,7 @@ include_directories(${HOME_THIRDPARTY}/yaml-cpp/include)
|
||||
include(${HOME_CMAKE}/operation/idb.cmake)
|
||||
|
||||
link_directories(${CMAKE_BINARY_DIR}/lib)
|
||||
-link_directories(${HOME_THIRDPARTY}/onnxruntime/)
|
||||
+# link_directories(${HOME_THIRDPARTY}/onnxruntime/)
|
||||
|
||||
find_package(Eigen3 REQUIRED)
|
||||
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -9,7 +9,7 @@ in
|
||||
src = rootSrc;
|
||||
sourceRoot = "${src.name}/src/operation/iIR/source/iir-rust/iir";
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-xyNaUTPvU21yOdkQq8vdnHCyLzcpDAFAje0R/gDqliU=";
|
||||
cargoHash = "sha256-CV1e/f3oCKW5mTbQnFBnp7E2d9nFyDwY3qclP2HwdPM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "imgproxy";
|
||||
version = "3.27.2";
|
||||
version = "3.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
hash = "sha256-rPdo+gj1nxbrE3qbABB7H+tN6WXAdwhtPUCYCsn6vEk=";
|
||||
hash = "sha256-aI+rWXt+tioHFGBJk/RkYeo7JaV+10jurx7YKX448Yk=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ckJ9HJkkaDx42wS/j9cwDGOku9X7yZ5uL1bun6IMfH4=";
|
||||
vendorHash = "sha256-L18vxiFXBlKeipMm1N/c+F+zHDQYN5CHjYwa4xi9I3s=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -15,13 +15,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "immudb";
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "codenotary";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XKioPk0Rv+I916OLInJEtOaDV9KcBMWSHmPOq2k3LTQ=";
|
||||
sha256 = "sha256-sQLxHHaKdqocjJVXuuuQqx+BNubl6bjVcp50r4kPQEs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://imtui.ggerganov.com";
|
||||
changelog = "https://github.com/ggerganov/imtui/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,6 +17,10 @@ buildNpmPackage rec {
|
||||
|
||||
npmDepsHash = "sha256-nHGTi1aH9YY01dzBeNyUEUEswrdjZPWaoycDVZZmIAA=";
|
||||
|
||||
postInstall = ''
|
||||
find $out/lib/node_modules -xtype l -delete
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "JavaScript and TypeScript code intelligence through the Language Server Protocol";
|
||||
homepage = "https://github.com/sourcegraph/javascript-typescript-langserver";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jcal";
|
||||
version = "0.4.1";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fzerorubigd";
|
||||
repo = "jcal";
|
||||
rev = "v${version}";
|
||||
sha256 = "0m3g3rf0ycv2dsfn9y2472fa3r0yla8pfqk6gq00nrscsc3pp4zf";
|
||||
sha256 = "sha256-vJc5uijZlvohEtiS03LYlqtswVE38S9/ejlHrmZ0wqA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@@ -8,10 +8,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet-prosody";
|
||||
version = "1.0.8448";
|
||||
version = "1.0.8499";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "ET41A6MQblz3Vw/ZHIvXv05Kk41S8dBxempkgwwpa88=";
|
||||
sha256 = "U+Xy0uFdH4vYx9GYuwWD5o/K6pMRlqM0QJdWFBJXNls=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
@@ -11,10 +11,10 @@
|
||||
|
||||
let
|
||||
pname = "jitsi-videobridge2";
|
||||
version = "2.3-209-gb5fbe618";
|
||||
version = "2.3-215-gbee626bf";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "DsHpGdVmkhXNovBF2VEw96praKd6WpVMdxV+Tnxbzi0=";
|
||||
sha256 = "naporhTId7igQ2OHEiwmP9t1MPniBOehWhuRAFQJSVE=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keepalived";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acassen";
|
||||
repo = "keepalived";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Faj7fgCYdjZ8yPH/GrDG9t+O1n+h/9lHCE7vMe4kROQ=";
|
||||
sha256 = "sha256-+IwV8ifQ8gWN4eR9Fgvw3HV3WJDmy3urEQDLngoMdm8=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kokkos";
|
||||
version = "4.5.01";
|
||||
version = "4.6.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kokkos";
|
||||
repo = "kokkos";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-vqNuLoyhsw7Hoc4Or7dm5hPvKaHjQjlkvrHEc6sdL7M=";
|
||||
hash = "sha256-4Or6Z/ZXH/WmA8GW6/Odn9+w7E/jdBDMCkWSpMf5Zoc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -67,7 +67,7 @@ python3.pkgs.buildPythonPackage rec {
|
||||
homepage = "https://github.com/robusta-dev/krr";
|
||||
changelog = "https://github.com/robusta-dev/krr/releases/tag/v${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with lib.maintainers; [ azahi ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "krr";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,15 +10,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubernetes-kcp";
|
||||
version = "0.27.0";
|
||||
version = "0.27.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kcp-dev";
|
||||
repo = "kcp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-yAS53KYR6jHZxuvq8jRKH36IPdEqsQeG/Do+SIZnQpw=";
|
||||
hash = "sha256-X4zSuul/dFvnv3ayrUewngZgt39bxCd2ZxTObR0QY5s=";
|
||||
};
|
||||
vendorHash = "sha256-CE3Wloi4evMEftKeRkPJq186kPFqMpI3yWWIEKn/bOQ=";
|
||||
vendorHash = "sha256-rzHHudaYSzr15zkB8K0A4wR4AHhMyzQt2V0OVVDhKjA=";
|
||||
|
||||
subPackages = [ "cmd/kcp" ];
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubevpn";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KubeNetworks";
|
||||
repo = "kubevpn";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IZna+DOavIkhGuNfVq31Hvuq5J0rylCAmNActjbA/io=";
|
||||
hash = "sha256-E/1MV/EjG9MU2xiCFC0jAvIwSAfyNCrhKcfedH5DPN0=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
let
|
||||
pname = "lefthook";
|
||||
version = "1.11.2";
|
||||
version = "1.11.5";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@@ -16,10 +16,10 @@ buildGoModule {
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kh1U3w39C+6UewKRyKQc4EBgQmBNP7Ou8V54CeG5hlQ=";
|
||||
hash = "sha256-JBDEVgMUVZceXSppq26xJcsKRlHmIBK5UN5uehmG/VU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uvPpkSqfe1NvO78kIMo5cYdr87YTGozudeESmI0q+1E=";
|
||||
vendorHash = "sha256-0d+lr6wo4FbyVvpG15MdXesGfgnkSozANyGhjWZFRvI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -39,17 +39,17 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "liana";
|
||||
version = "9.0"; # keep in sync with lianad
|
||||
version = "10.0"; # keep in sync with lianad
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wizardsardine";
|
||||
repo = "liana";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RFlICvoePwSglpheqMb+820My//LElnSeMDPFmXyHz0=";
|
||||
hash = "sha256-nuwbJxpcapk01qwGAZ2z9nKjHNqE1BMikz3hWrCAGsA=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-nj7L4glbjevVd1ef6RUGPm4hpzeNdnsCLC01BOJj6kI=";
|
||||
cargoHash = "sha256-tODnld6V2KWarfHXyoPjSGw+q1A/dalPtW3Swc2dNes=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lianad";
|
||||
version = "9.0"; # keep in sync with liana
|
||||
version = "10.0"; # keep in sync with liana
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wizardsardine";
|
||||
repo = "liana";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RFlICvoePwSglpheqMb+820My//LElnSeMDPFmXyHz0=";
|
||||
hash = "sha256-nuwbJxpcapk01qwGAZ2z9nKjHNqE1BMikz3hWrCAGsA=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-nj7L4glbjevVd1ef6RUGPm4hpzeNdnsCLC01BOJj6kI=";
|
||||
cargoHash = "sha256-tODnld6V2KWarfHXyoPjSGw+q1A/dalPtW3Swc2dNes=";
|
||||
|
||||
buildInputs = [ udev ];
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user