Merge master into staging-next
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
# Community
|
||||
|
||||
* [Discourse Forum](https://discourse.nixos.org/)
|
||||
* [Matrix Chat](https://matrix.to/#/#community:nixos.org)
|
||||
* [Matrix Chat](https://matrix.to/#/#space:nixos.org)
|
||||
* [NixOS Weekly](https://weekly.nixos.org/)
|
||||
* [Official wiki](https://wiki.nixos.org/)
|
||||
* [Community-maintained list of ways to get in touch](https://wiki.nixos.org/wiki/Get_In_Touch#Chat) (Discord, Telegram, IRC, etc.)
|
||||
|
||||
@@ -2896,6 +2896,13 @@
|
||||
github = "beezow";
|
||||
githubId = 42082156;
|
||||
};
|
||||
bellackn = {
|
||||
name = "Nico Bellack";
|
||||
email = "blcknc@pm.me";
|
||||
github = "bellackn";
|
||||
githubId = 32039602;
|
||||
keys = [ { fingerprint = "2B46 58FF 887A 8366 F88B BE92 CF83 0BB3 B973 9A6A"; } ];
|
||||
};
|
||||
ben9986 = {
|
||||
name = "Ben Carmichael";
|
||||
email = "ben9986.unvmn@passinbox.com";
|
||||
|
||||
@@ -212,6 +212,7 @@
|
||||
|
||||
- [ipfs-cluster](https://ipfscluster.io/), Pinset orchestration for IPFS. Available as [services.ipfs-cluster](#opt-services.ipfs-cluster.enable)
|
||||
|
||||
- [bitbox-bridge](https://github.com/BitBoxSwiss/bitbox-bridge), a bridge software that connects BitBox hardware wallets to computers & web wallets like [Rabby](https://rabby.io/). Allows one to interact & transact with smart contracts, Web3 websites & financial services without storing private keys anywhere other than the hardware wallet. Available as [services.bitbox-bridge](#opt-services.bitbox-bridge.enable).
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
## Backward Incompatibilities {#sec-release-25.05-incompatibilities}
|
||||
|
||||
@@ -613,6 +613,7 @@
|
||||
./services/hardware/asusd.nix
|
||||
./services/hardware/auto-cpufreq.nix
|
||||
./services/hardware/auto-epp.nix
|
||||
./services/hardware/bitbox-bridge.nix
|
||||
./services/hardware/bluetooth.nix
|
||||
./services/hardware/bolt.nix
|
||||
./services/hardware/brltty.nix
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.bitbox-bridge;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.bitbox-bridge = {
|
||||
enable = lib.mkEnableOption "Bitbox bridge daemon, for use with Bitbox hardware wallets.";
|
||||
|
||||
package = lib.mkPackageOption pkgs "bitbox-bridge" { };
|
||||
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 8178;
|
||||
description = ''
|
||||
Listening port for the bitbox-bridge.
|
||||
'';
|
||||
};
|
||||
|
||||
runOnMount = lib.mkEnableOption null // {
|
||||
default = true;
|
||||
description = ''
|
||||
Run bitbox-bridge.service only when hardware wallet is plugged, also registers the systemd device unit.
|
||||
This option is enabled by default to save power, when false, bitbox-bridge service runs all the time instead.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
services.udev.packages =
|
||||
[ cfg.package ]
|
||||
++ lib.optionals (cfg.runOnMount) [
|
||||
(pkgs.writeTextFile {
|
||||
name = "bitbox-bridge-run-on-mount-udev-rules";
|
||||
destination = "/etc/udev/rules.d/99-bitbox-bridge-run-on-mount.rules";
|
||||
text = ''
|
||||
SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", MODE="0660", GROUP="bitbox", TAG+="systemd", SYMLINK+="bitbox02", ENV{SYSTEMD_WANTS}="bitbox-bridge.service"
|
||||
'';
|
||||
})
|
||||
];
|
||||
|
||||
systemd.services.bitbox-bridge = {
|
||||
description = "BitBox Bridge";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
bindsTo = lib.optionals (cfg.runOnMount) [ "dev-bitbox02.device" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${cfg.package}/bin/bitbox-bridge -p ${builtins.toString cfg.port}";
|
||||
User = "bitbox";
|
||||
};
|
||||
};
|
||||
|
||||
users.groups.bitbox = { };
|
||||
users.users.bitbox = {
|
||||
group = "bitbox";
|
||||
description = "bitbox-bridge daemon user";
|
||||
isSystemUser = true;
|
||||
extraGroups = [ "bitbox" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -214,6 +214,7 @@ in {
|
||||
bind = handleTest ./bind.nix {};
|
||||
bird = handleTest ./bird.nix {};
|
||||
birdwatcher = handleTest ./birdwatcher.nix {};
|
||||
bitbox-bridge = runTest ./bitbox-bridge.nix;
|
||||
bitcoind = handleTest ./bitcoind.nix {};
|
||||
bittorrent = handleTest ./bittorrent.nix {};
|
||||
blockbook-frontend = handleTest ./blockbook-frontend.nix {};
|
||||
@@ -1295,7 +1296,7 @@ in {
|
||||
vscodium = discoverTests (import ./vscodium.nix);
|
||||
vsftpd = handleTest ./vsftpd.nix {};
|
||||
waagent = handleTest ./waagent.nix {};
|
||||
wakapi = handleTest ./wakapi.nix {};
|
||||
wakapi = runTest ./wakapi.nix;
|
||||
warzone2100 = handleTest ./warzone2100.nix {};
|
||||
wasabibackend = handleTest ./wasabibackend.nix {};
|
||||
wastebin = handleTest ./wastebin.nix {};
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{ lib, ... }:
|
||||
|
||||
let
|
||||
testPort = 8179;
|
||||
in
|
||||
{
|
||||
name = "bitbox-bridge";
|
||||
meta = {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
izelnakri
|
||||
tensor5
|
||||
];
|
||||
};
|
||||
|
||||
nodes.machine = {
|
||||
services.bitbox-bridge = {
|
||||
enable = true;
|
||||
port = testPort;
|
||||
runOnMount = false;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
machine.wait_for_unit("bitbox-bridge.service")
|
||||
machine.wait_for_open_port(${toString testPort})
|
||||
machine.wait_until_succeeds("curl -fL http://localhost:${toString testPort}/api/info | grep version")
|
||||
'';
|
||||
}
|
||||
+55
-57
@@ -1,67 +1,65 @@
|
||||
import ./make-test-python.nix (
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "Wakapi";
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "Wakapi";
|
||||
|
||||
nodes = {
|
||||
wakapiPsql = {
|
||||
services.wakapi = {
|
||||
enable = true;
|
||||
settings = {
|
||||
server.port = 3000; # upstream default, set explicitly in case upstream changes it
|
||||
db = {
|
||||
dialect = "postgres"; # `createLocally` only supports postgres
|
||||
host = "/run/postgresql";
|
||||
port = 5432; # service will fail if port is not set
|
||||
name = "wakapi";
|
||||
user = "wakapi";
|
||||
};
|
||||
nodes = {
|
||||
wakapiPsql = {
|
||||
services.wakapi = {
|
||||
enable = true;
|
||||
settings = {
|
||||
server.port = 3000; # upstream default, set explicitly in case upstream changes it
|
||||
db = {
|
||||
dialect = "postgres"; # `createLocally` only supports postgres
|
||||
host = "/run/postgresql";
|
||||
port = 5432; # service will fail if port is not set
|
||||
name = "wakapi";
|
||||
user = "wakapi";
|
||||
};
|
||||
|
||||
# Automatically create our database
|
||||
database.createLocally = true; # only works with Postgresql for now
|
||||
|
||||
# Created with `cat /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -n 1`
|
||||
# Prefer passwordSaltFile in production.
|
||||
passwordSalt = "NpqCY7eY7fMoIWYmPx5mAgr6YoSlXSuI";
|
||||
};
|
||||
};
|
||||
|
||||
wakapiSqlite = {
|
||||
services.wakapi = {
|
||||
enable = true;
|
||||
settings = {
|
||||
server.port = 3001;
|
||||
db = {
|
||||
dialect = "sqlite3";
|
||||
name = "wakapi";
|
||||
user = "wakapi";
|
||||
};
|
||||
};
|
||||
# Automatically create our database
|
||||
database.createLocally = true; # only works with Postgresql for now
|
||||
|
||||
passwordSalt = "NpqCY7eY7fMoIWYmPx5mAgr6YoSlXSuI";
|
||||
};
|
||||
# Created with `cat /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -n 1`
|
||||
# Prefer passwordSaltFile in production.
|
||||
passwordSalt = "NpqCY7eY7fMoIWYmPx5mAgr6YoSlXSuI";
|
||||
};
|
||||
};
|
||||
|
||||
# Test that service works under both postgresql and sqlite3
|
||||
# by starting all machines, and curling the default address.
|
||||
# This is not very comprehensive for a test, but it should
|
||||
# catch very basic mistakes in the module.
|
||||
testScript = ''
|
||||
with subtest("Test Wakapi with postgresql backend"):
|
||||
wakapiPsql.start()
|
||||
wakapiPsql.wait_for_unit("wakapi.service")
|
||||
wakapiPsql.wait_for_open_port(3000)
|
||||
wakapiPsql.succeed("curl --fail http://localhost:3000")
|
||||
wakapiSqlite = {
|
||||
services.wakapi = {
|
||||
enable = true;
|
||||
settings = {
|
||||
server.port = 3001;
|
||||
db = {
|
||||
dialect = "sqlite3";
|
||||
name = "wakapi";
|
||||
user = "wakapi";
|
||||
};
|
||||
};
|
||||
|
||||
with subtest("Test Wakapi with sqlite3 backend"):
|
||||
wakapiSqlite.start()
|
||||
wakapiSqlite.wait_for_unit("wakapi.service")
|
||||
wakapiSqlite.wait_for_open_port(3001)
|
||||
wakapiSqlite.succeed("curl --fail http://localhost:3001")
|
||||
'';
|
||||
passwordSalt = "NpqCY7eY7fMoIWYmPx5mAgr6YoSlXSuI";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = [ lib.maintainers.NotAShelf ];
|
||||
}
|
||||
)
|
||||
# Test that service works under both postgresql and sqlite3
|
||||
# by starting all machines, and curling the default address.
|
||||
# This is not very comprehensive for a test, but it should
|
||||
# catch very basic mistakes in the module.
|
||||
testScript = ''
|
||||
with subtest("Test Wakapi with postgresql backend"):
|
||||
wakapiPsql.start()
|
||||
wakapiPsql.wait_for_unit("wakapi.service")
|
||||
wakapiPsql.wait_for_open_port(3000)
|
||||
wakapiPsql.succeed("curl --fail http://localhost:3000")
|
||||
|
||||
with subtest("Test Wakapi with sqlite3 backend"):
|
||||
wakapiSqlite.start()
|
||||
wakapiSqlite.wait_for_unit("wakapi.service")
|
||||
wakapiSqlite.wait_for_open_port(3001)
|
||||
wakapiSqlite.succeed("curl --fail http://localhost:3001")
|
||||
'';
|
||||
|
||||
meta.maintainers = [ lib.maintainers.NotAShelf ];
|
||||
}
|
||||
|
||||
@@ -5681,8 +5681,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-zig";
|
||||
publisher = "ziglang";
|
||||
version = "0.5.1";
|
||||
hash = "sha256-ygxvkewK5Tf1zNIXxzu6D/tKYNVcNsU9cKij7d5aRdQ=";
|
||||
version = "0.6.6";
|
||||
hash = "sha256-UxbCRsTp7Fz6iAeC3lwojWrLPMJx5b7cNXxOFY7k0pk=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog";
|
||||
|
||||
@@ -26,11 +26,11 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-vzLyLOC/4SDlIrsbVKDXu42nx7QLgK7TWkzKC1/tSQo=";
|
||||
x86_64-darwin = "sha256-dLCepFyTht6hzdm1jZbhFKt6yNIbCZWlpxAkSfE9Fww=";
|
||||
aarch64-linux = "sha256-Hiqrw6f7SWzdPQCV0s1d+cWwQ2u4PVDY8saL1Q+mZQg=";
|
||||
aarch64-darwin = "sha256-zy+oI6MEHpxF8vOnE9EdjVm3LBAfgMas593hAJsWNz4=";
|
||||
armv7l-linux = "sha256-Z0qnKm+axJTAHq8E69wYWpZOF9FuFRkdJmap4rFhbTY=";
|
||||
x86_64-linux = "sha256-qiSCrPScPtfoxVXpjapOUqzIAHlNsXwVAZNYN6CeuQo=";
|
||||
x86_64-darwin = "sha256-2MEBSjiy4Ct4RrlbsD6ZiYO7Fb3hFcQnzZpa1WjMKXY=";
|
||||
aarch64-linux = "sha256-wax6tTFkaGsKsOrkfcXF1yvBsVmUexNwe7Aex04HS/Q=";
|
||||
aarch64-darwin = "sha256-ccHrhEVqxKrgQK5iP4nlOROEQWbLBRWXjXrhnkaRpMQ=";
|
||||
armv7l-linux = "sha256-1+4/QdAi9wLtnZTwutCIpjMwBA3Zzzi4M2746mIu3gE=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.98.2.25072";
|
||||
version = "1.98.2.25078";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "puae";
|
||||
version = "0-unstable-2025-02-20";
|
||||
version = "0-unstable-2025-03-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "libretro-uae";
|
||||
rev = "12972a7da5aeb849ba7234dff342625d23617eaf";
|
||||
hash = "sha256-/w1Rbw0eStWyoR+UDD7a298vVAa0vb67qUPfiqhfm/k=";
|
||||
rev = "987ac9bf14b813bf14ee6ab0f9d1f95c9d19ea78";
|
||||
hash = "sha256-ONL7KjDMF+syiwBG+ivU7b7D7qFVr2gpw5ulnV3OZU8=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -84,13 +84,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.1-45";
|
||||
version = "7.1.1-46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7oE+fkozhTqTagcwpzttKLZoq4gT1nSib4JssRmz3YI=";
|
||||
hash = "sha256-ogL8KJaEB2Q9XYzhPiX2b6Nr0G7ICLntN3Xn+zoNlG0=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -1,44 +1,48 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qt5,
|
||||
mkDerivation,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttr: {
|
||||
pname = "qtbitcointrader";
|
||||
version = "1.40.43";
|
||||
version = "1.42.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JulyIGHOR";
|
||||
repo = "QtBitcoinTrader";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u3+Kwn8KunYUpWCd55TQuVVfoSp8hdti93d6hk7Uqx8=";
|
||||
tag = "v${finalAttr.version}";
|
||||
hash = "sha256-u3+Kwn8KunYUpWCd55TQuVVfoSp8hdti93d6hk7Uqx8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
qt5.qtbase
|
||||
qt5.qtmultimedia
|
||||
qt5.qtscript
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtmultimedia
|
||||
libsForQt5.qtscript
|
||||
];
|
||||
|
||||
postUnpack = "sourceRoot=\${sourceRoot}/src";
|
||||
sourceRoot = "${finalAttr.src.name}/src";
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
qmake $qmakeFlags \
|
||||
PREFIX=$out \
|
||||
DESKTOPDIR=$out/share/applications \
|
||||
ICONDIR=$out/share/pixmaps \
|
||||
QtBitcoinTrader_Desktop.pro
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Bitcoin trading client";
|
||||
mainProgram = "QtBitcoinTrader";
|
||||
homepage = "https://centrabit.com/";
|
||||
license = licenses.gpl3;
|
||||
platforms = qt5.qtbase.meta.platforms;
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = libsForQt5.qtbase.meta.platforms;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,11 +9,11 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "128.8.0esr";
|
||||
version = "128.8.1esr";
|
||||
applicationName = "Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "7c0ef22bc14d4fa248cbae14d629174c9c967f891f4525f609760595f5a108aedf7dd804d1b63b97ec268613fa98378f4742a9b6ab562454351cf21175fdb802";
|
||||
sha512 = "040c4c6667d5020569075e25cad21d019a66165cc2e05ecd386db2c1db1243473c4a1a96ca4901d734da8c7aee4761574b284afb44aff85cef071da995619157";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
(
|
||||
(buildMozillaMach rec {
|
||||
pname = "floorp";
|
||||
packageVersion = "11.24.0";
|
||||
packageVersion = "11.25.0";
|
||||
applicationName = "Floorp";
|
||||
binaryName = "floorp";
|
||||
branding = "browser/branding/official";
|
||||
@@ -24,7 +24,7 @@
|
||||
repo = "Floorp";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${packageVersion}";
|
||||
hash = "sha256-3Y34HUtxEqcEr2DC2frOdbCiq59oWcDLIFABl+N5K+Q=";
|
||||
hash = "sha256-zY0JklGWsulZXj45/yKJpJypGSA5qwH/zo8F52gp2nE=";
|
||||
};
|
||||
|
||||
extraConfigureFlags = [
|
||||
|
||||
+4
-2
@@ -1,16 +1,15 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
callPackage,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
protoc-gen-grpc-web,
|
||||
protoc-gen-js,
|
||||
protobuf,
|
||||
tantivy-go,
|
||||
}:
|
||||
|
||||
let
|
||||
tantivy-go = callPackage ../tantivy-go { };
|
||||
pname = "anytype-heart";
|
||||
version = "0.39.11";
|
||||
src = fetchFromGitHub {
|
||||
@@ -76,6 +75,9 @@ buildGoModule {
|
||||
cp LICENSE.md $out/share
|
||||
'';
|
||||
|
||||
# disable tests to save time, as it's mostly built by users, not CI
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Shared library for Anytype clients";
|
||||
homepage = "https://anytype.io/";
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
callPackage,
|
||||
runCommand,
|
||||
fetchFromGitHub,
|
||||
buildNpmPackage,
|
||||
pkg-config,
|
||||
anytype-heart,
|
||||
libsecret,
|
||||
electron,
|
||||
makeDesktopItem,
|
||||
@@ -14,7 +14,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
anytype-heart = callPackage ./anytype-heart { };
|
||||
pname = "anytype";
|
||||
version = "0.45.3";
|
||||
|
||||
@@ -74,13 +73,20 @@ buildNpmPackage {
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
# remove unnecessary files
|
||||
preInstall = ''
|
||||
npm prune --omit=dev
|
||||
chmod u+w -R dist
|
||||
find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} +
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/node_modules/anytype
|
||||
cp -r electron.js electron dist node_modules package.json $out/lib/node_modules/anytype/
|
||||
mkdir -p $out/lib/anytype
|
||||
cp -r electron.js electron dist node_modules package.json $out/lib/anytype/
|
||||
|
||||
for icon in $out/lib/node_modules/anytype/electron/img/icons/*.png; do
|
||||
for icon in $out/lib/anytype/electron/img/icons/*.png; do
|
||||
mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"
|
||||
ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/anytype.png"
|
||||
done
|
||||
@@ -90,7 +96,7 @@ buildNpmPackage {
|
||||
makeWrapper '${lib.getExe electron}' $out/bin/anytype \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags $out/lib/node_modules/anytype/ \
|
||||
--add-flags $out/lib/anytype/ \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
runHook postInstall
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
buildPackages,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "az-pim-cli";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netr0m";
|
||||
repo = "az-pim-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Zi/DNTroMews4PvPCeLWSq74xWdZ22NO2VtmW91zcfs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-g4NcRNmHXS3mOtE0nbV96vFFoVzGFbAvcj/vkdXshoU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
|
||||
let
|
||||
emulator = stdenv.hostPlatform.emulator buildPackages;
|
||||
in
|
||||
''
|
||||
installShellCompletion --cmd az-pim-cli \
|
||||
--bash <(${emulator} $out/bin/az-pim-cli completion bash) \
|
||||
--fish <(${emulator} $out/bin/az-pim-cli completion fish) \
|
||||
--zsh <(${emulator} $out/bin/az-pim-cli completion zsh)
|
||||
''
|
||||
);
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheck = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "version";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "List and activate Azure Entra ID Privileged Identity Management roles from the CLI";
|
||||
homepage = "https://github.com/netr0m/az-pim-cli";
|
||||
changelog = "https://github.com/netr0m/az-pim-cli/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.awwpotato ];
|
||||
mainProgram = "az-pim-cli";
|
||||
};
|
||||
})
|
||||
@@ -1,54 +1,127 @@
|
||||
{
|
||||
appimageTools,
|
||||
fetchurl,
|
||||
lib,
|
||||
makeWrapper,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
dpkg,
|
||||
autoPatchelfHook,
|
||||
makeWrapper,
|
||||
glibc,
|
||||
gcc,
|
||||
glib,
|
||||
gtk3,
|
||||
pango,
|
||||
cairo,
|
||||
dbus,
|
||||
at-spi2-atk,
|
||||
cups,
|
||||
libdrm,
|
||||
gdk-pixbuf,
|
||||
nss,
|
||||
nspr,
|
||||
xorg,
|
||||
alsa-lib,
|
||||
expat,
|
||||
libxkbcommon,
|
||||
libgbm,
|
||||
vulkan-loader,
|
||||
systemd,
|
||||
libGL,
|
||||
writeShellScript,
|
||||
nix-update,
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "beekeeper-studio";
|
||||
version = "5.0.9";
|
||||
version = "5.1.5";
|
||||
|
||||
plat =
|
||||
{
|
||||
aarch64-linux = "-arm64";
|
||||
x86_64-linux = "";
|
||||
}
|
||||
.${stdenv.hostPlatform.system};
|
||||
src =
|
||||
let
|
||||
selectSystem = attrs: attrs.${stdenv.hostPlatform.system};
|
||||
arch = selectSystem {
|
||||
x86_64-linux = "amd64";
|
||||
aarch64-linux = "arm64";
|
||||
};
|
||||
in
|
||||
fetchurl {
|
||||
url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${finalAttrs.version}/beekeeper-studio_${finalAttrs.version}_${arch}.deb";
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-ClKD5OnNhEBo1O3E3rXOGu9X8vVGZAOrfXQFppuEnbU=";
|
||||
aarch64-linux = "sha256-64ID+psuwfiVTfBayILeotJ3en21Hsv8FMQj+IQjjyE=";
|
||||
};
|
||||
};
|
||||
|
||||
hash =
|
||||
{
|
||||
aarch64-linux = "sha256-Ky7nowci7PNp9IAbmnr1W8+sN8A9f2BakBRUQHx14HY=";
|
||||
x86_64-linux = "sha256-DAxY2b6WAl9llgDr5SNlvp8ZnwQuVKVrC4T++1FyiZE=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system};
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${version}/Beekeeper-Studio-${version}${plat}.AppImage";
|
||||
inherit hash;
|
||||
};
|
||||
buildInputs = [
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
xorg.libX11
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXrandr
|
||||
xorg.libxcb
|
||||
libxkbcommon
|
||||
glibc
|
||||
gcc
|
||||
libGL
|
||||
glib
|
||||
gtk3
|
||||
pango
|
||||
cairo
|
||||
dbus
|
||||
at-spi2-atk
|
||||
cups
|
||||
libdrm
|
||||
gdk-pixbuf
|
||||
nss
|
||||
nspr
|
||||
alsa-lib
|
||||
expat
|
||||
libgbm
|
||||
vulkan-loader
|
||||
];
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
runtimeDependencies = map lib.getLib [
|
||||
systemd
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
extraInstallCommands = ''
|
||||
wrapProgram $out/bin/${pname} \
|
||||
cp -r usr $out
|
||||
substituteInPlace $out/share/applications/beekeeper-studio.desktop \
|
||||
--replace-fail '"/opt/Beekeeper Studio/beekeeper-studio"' "beekeeper-studio"
|
||||
mkdir -p $out/opt $out/bin
|
||||
cp -r opt/"Beekeeper Studio" $out/opt/beekeeper-studio
|
||||
makeWrapper $out/opt/beekeeper-studio/beekeeper-studio-bin $out/bin/beekeeper-studio \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/
|
||||
install -Dm444 ${appimageContents}/${pname}.png -t $out/share/pixmaps/
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace-fail 'Exec=AppRun --no-sandbox' 'Exec=${pname}'
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
patchelf --add-needed libGL.so.1 \
|
||||
--add-rpath ${
|
||||
lib.makeLibraryPath [
|
||||
libGL
|
||||
]
|
||||
} $out/opt/beekeeper-studio/beekeeper-studio-bin
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeShellScript "beekeeper-studio-update-script" ''
|
||||
${lib.getExe nix-update} beekeeper-studio --system x86_64-linux
|
||||
${lib.getExe nix-update} beekeeper-studio --system aarch64-linux --version "skip"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more. Linux, MacOS, and Windows";
|
||||
description = "Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more";
|
||||
homepage = "https://www.beekeeperstudio.io";
|
||||
changelog = "https://github.com/beekeeper-studio/beekeeper-studio/releases/tag/v${version}";
|
||||
changelog = "https://github.com/beekeeper-studio/beekeeper-studio/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
mainProgram = "beekeeper-studio";
|
||||
@@ -60,5 +133,6 @@ appimageTools.wrapType2 {
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
knownVulnerabilities = [ "Electron version 31 is EOL" ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
libudev-zero,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -38,9 +40,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
mkdir -p $out/lib/systemd/user
|
||||
substitute bitbox-bridge/release/linux/bitbox-bridge.service $out/lib/systemd/user/bitbox-bridge.service \
|
||||
--replace-fail /opt/bitbox-bridge/bin/bitbox-bridge $out/bin/bitbox-bridge
|
||||
install -Dm644 bitbox-bridge/release/linux/hid-digitalbitbox.rules $out/lib/udev/rules.d/50-hid-digitalbitbox.rules
|
||||
install -Dm644 bitbox-bridge/release/linux/hid-digitalbitbox.rules $out/etc/udev/rules.d/50-hid-digitalbitbox.rules
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.basic = nixosTests.bitbox-bridge;
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A bridge service that connects web wallets like Rabby to BitBox02";
|
||||
homepage = "https://github.com/BitBoxSwiss/bitbox-bridge";
|
||||
|
||||
@@ -7,9 +7,6 @@
|
||||
yq,
|
||||
_experimental-update-script-combinators,
|
||||
gitUpdater,
|
||||
pdfium-binaries,
|
||||
stdenv,
|
||||
replaceVars,
|
||||
}:
|
||||
|
||||
flutter327.buildFlutterApplication rec {
|
||||
@@ -27,33 +24,6 @@ flutter327.buildFlutterApplication rec {
|
||||
|
||||
sourceRoot = "${src.name}/app";
|
||||
|
||||
customSourceBuilders = {
|
||||
# unofficial printing
|
||||
printing =
|
||||
{ version, src, ... }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "printing";
|
||||
inherit version src;
|
||||
inherit (src) passthru;
|
||||
|
||||
patches = [
|
||||
(replaceVars ./printing.patch {
|
||||
inherit pdfium-binaries;
|
||||
})
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r . $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
gitHashes = {
|
||||
dart_leap = "sha256-eEyUqdVToybQoDwdmz47H0f3/5zRdJzmPv1d/5mTOgA=";
|
||||
lw_file_system = "sha256-0LLSADBWq19liQLtJIJEuTEqmeyIWP61zRRjjpdV6SM=";
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
--- old/printing/linux/CMakeLists.txt 2024-07-16 18:45:19.000000000 +0800
|
||||
+++ new/printing/linux/CMakeLists.txt 2024-10-01 01:49:05.544910894 +0800
|
||||
@@ -16,6 +16,7 @@
|
||||
set(PROJECT_NAME "printing")
|
||||
project(${PROJECT_NAME} LANGUAGES CXX)
|
||||
|
||||
+set(PDFIUM_DIR @pdfium-binaries@)
|
||||
set(PDFIUM_VERSION "5200" CACHE STRING "Version of pdfium used")
|
||||
string(REPLACE "linux-" "" TARGET_ARCH ${FLUTTER_TARGET_PLATFORM})
|
||||
set(PDFIUM_ARCH ${TARGET_ARCH} CACHE STRING "Architecture of pdfium used")
|
||||
@@ -32,18 +33,11 @@
|
||||
)
|
||||
endif()
|
||||
|
||||
-# Download pdfium
|
||||
-include(../windows/DownloadProject.cmake)
|
||||
-download_project(PROJ
|
||||
- pdfium
|
||||
- URL
|
||||
- ${PDFIUM_URL})
|
||||
-
|
||||
# This value is used when generating builds using this plugin, so it must not be
|
||||
# changed
|
||||
set(PLUGIN_NAME "printing_plugin")
|
||||
|
||||
-include(${pdfium_SOURCE_DIR}/PDFiumConfig.cmake)
|
||||
+include(${PDFIUM_DIR}/PDFiumConfig.cmake)
|
||||
|
||||
# System-level dependencies.
|
||||
find_package(PkgConfig REQUIRED)
|
||||
@@ -67,7 +61,7 @@
|
||||
target_link_libraries(${PLUGIN_NAME}
|
||||
PRIVATE PkgConfig::GTK PkgConfig::GTKUnixPrint)
|
||||
target_link_libraries(${PLUGIN_NAME} PRIVATE pdfium)
|
||||
-get_filename_component(PDFium_lib_path "${PDFium_LIBRARY}" DIRECTORY)
|
||||
+set(PDFium_lib_path "${PDFIUM_DIR}/lib")
|
||||
set_target_properties(${PLUGIN_NAME}
|
||||
PROPERTIES SKIP_BUILD_RPATH
|
||||
FALSE
|
||||
@@ -77,4 +71,4 @@
|
||||
"$ORIGIN:${PDFium_lib_path}")
|
||||
|
||||
# List of absolute paths to libraries that should be bundled with the plugin
|
||||
-set(printing_bundled_libraries "${PDFium_LIBRARY}" PARENT_SCOPE)
|
||||
+set(printing_bundled_libraries "${PDFIUM_DIR}/lib/libpdfium.so" PARENT_SCOPE)
|
||||
@@ -0,0 +1,70 @@
|
||||
{
|
||||
lib,
|
||||
flutter327,
|
||||
fetchFromGitHub,
|
||||
autoPatchelfHook,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
runCommand,
|
||||
yq,
|
||||
chatmcp,
|
||||
_experimental-update-script-combinators,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
flutter327.buildFlutterApplication rec {
|
||||
pname = "chatmcp";
|
||||
version = "0.0.21-alpha";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daodao97";
|
||||
repo = "chatmcp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-T0HVvnMBH/Tnhks7NTCdE3QkHPbg4XaPnT1aJ+LSH6E=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "chatmcp";
|
||||
exec = "chatmcp %U";
|
||||
icon = "chatmcp";
|
||||
desktopName = "ChatMCP";
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm0644 assets/logo.png $out/share/pixmaps/chatmcp.png
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
pubspecSource =
|
||||
runCommand "pubspec.lock.json"
|
||||
{
|
||||
nativeBuildInputs = [ yq ];
|
||||
inherit (chatmcp) src;
|
||||
}
|
||||
''
|
||||
cat $src/pubspec.lock | yq > $out
|
||||
'';
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(gitUpdater { rev-prefix = "v"; })
|
||||
(_experimental-update-script-combinators.copyAttrOutputToFile "chatmcp.pubspecSource" ./pubspec.lock.json)
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "AI chat client implementing the Model Context Protocol";
|
||||
homepage = "https://github.com/daodao97/chatmcp";
|
||||
mainProgram = "chatmcp";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ emaryn ];
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -39,13 +39,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crun";
|
||||
version = "1.20";
|
||||
version = "1.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "crun";
|
||||
rev = version;
|
||||
hash = "sha256-rSh0oPZxhFSvEqzZrgM5eFrv1lW8Xd3JN1JTCT7Mj0I=";
|
||||
hash = "sha256-uAB/IJ1psGKvOTVhj00VlNadxSKTXvg1eU97bngVblw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
libnotify,
|
||||
qt6,
|
||||
xkeyboard_config,
|
||||
openssl,
|
||||
wayland-protocols,
|
||||
wayland,
|
||||
libsysprof-capture,
|
||||
@@ -34,20 +33,18 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deskflow";
|
||||
version = "1.19.0";
|
||||
version = "1.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deskflow";
|
||||
repo = "deskflow";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Jj2BNqz4pIJ468pywJRKu6GjgGX31GZZtDLHgcvC3JE=";
|
||||
hash = "sha256-lX8K7HuC/Sxa5M0h+r5NmdFf032nVrE9JF6H+IBWPUA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/lib/deskflow/unix/AppUtilUnix.cpp \
|
||||
--replace-fail "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboard_config}/share/X11/xkb/rules/evdev.xml"
|
||||
substituteInPlace src/lib/gui/tls/TlsCertificate.cpp \
|
||||
--replace-fail '"openssl"' '"${lib.getBin openssl}/bin/openssl"'
|
||||
substituteInPlace deploy/linux/deploy.cmake \
|
||||
--replace-fail 'message(FATAL_ERROR "Unable to read file /etc/os-release")' 'set(RELEASE_FILE_CONTENTS "")'
|
||||
'';
|
||||
@@ -119,9 +116,5 @@ stdenv.mkDerivation rec {
|
||||
licenses.openssl
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
knownVulnerabilities = [
|
||||
"CVE-2021-42072"
|
||||
"CVE-2021-42073"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.83.1";
|
||||
version = "1.84.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gs6fLczd4BhiiwXPAFICSwPtDOQGsPZf7KVL3K+782s=";
|
||||
sha256 = "sha256-PO6LIp5eortBEygdIRf2LpPJalSEMGosW8KtqBV/MlM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
Generated
-30
@@ -34,26 +34,6 @@
|
||||
"version": "17.12.0",
|
||||
"hash": "sha256-lGjifppD0OBMBp28pjUfPipaeXg739n8cPhtHWoo5RE="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Abstractions",
|
||||
"version": "7.5.1",
|
||||
"hash": "sha256-q4Q9HtdGbjfih1QegppYaJh1ZrzCzQ56NXM7lQ9ZvU0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.JsonWebTokens",
|
||||
"version": "7.5.1",
|
||||
"hash": "sha256-/Xuu3mzeicfMP4elmXkJvBLsoAye7c57sX+fRmE9yds="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Logging",
|
||||
"version": "7.5.1",
|
||||
"hash": "sha256-Tro3KKW/WjAnVoaMcOwvLybp+/Mm8GCObS7DPbrNCv4="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Tokens",
|
||||
"version": "7.5.1",
|
||||
"hash": "sha256-gf0QQMx+/n8AMoH5Yrq17ndbAeFkN95qGVRxmI7J0pE="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NET.Test.Sdk",
|
||||
"version": "17.12.0",
|
||||
@@ -444,11 +424,6 @@
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
|
||||
},
|
||||
{
|
||||
"pname": "System.Buffers",
|
||||
"version": "4.5.1",
|
||||
"hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
|
||||
},
|
||||
{
|
||||
"pname": "System.ClientModel",
|
||||
"version": "1.1.0",
|
||||
@@ -554,11 +529,6 @@
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
|
||||
},
|
||||
{
|
||||
"pname": "System.IdentityModel.Tokens.Jwt",
|
||||
"version": "7.5.1",
|
||||
"hash": "sha256-1pBDkT0aL2xiPg55728rA0FHIqyCNnrv1TYLjuLnMV8="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO",
|
||||
"version": "4.1.0-rc2-24027",
|
||||
|
||||
@@ -25,13 +25,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "github-runner";
|
||||
version = "2.322.0";
|
||||
version = "2.323.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2HbV1evqZZxyJintJG7kDrBjLFN06nDfR5NRvkw3nTM=";
|
||||
hash = "sha256-3KdNkQKmFR1999e99I4qKsM/10QW8G+7eUK44RisQr8=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse --short HEAD > $out/.git-revision
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pcsclite,
|
||||
PCSC,
|
||||
pkg-config,
|
||||
cmake,
|
||||
zlib,
|
||||
pandoc,
|
||||
doxygen,
|
||||
graphviz,
|
||||
openssl,
|
||||
cmocka,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "globalplatform";
|
||||
version = "2.4.0-unstable-2025-03-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kaoh";
|
||||
repo = "globalplatform";
|
||||
rev = "0f970751c5d9e8a7030f897ca2d1b86d0eeba4c2";
|
||||
sha256 = "sha256-H/muc/gY5glXPWKj75fHi6+1DAP91YGAUefdQkX9nfk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
pandoc
|
||||
doxygen
|
||||
graphviz
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
zlib
|
||||
openssl
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
pcsclite
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
PCSC
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DTESTING=ON"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
cmocka
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
cp "$src/gpshell/helloworld.cap" globalplatform/src
|
||||
cp "$src/globalplatform/src/rsa_pub_key_test.pem" globalplatform/src
|
||||
'';
|
||||
|
||||
# libglobalplatform.so uses dlopen() to load specified connection plugins at runtime.
|
||||
# Currently, libgppcscconnectionplugin.so is the only plugin included.
|
||||
# The user has to specify custom plugin locations by setting LD_LIBRARY_PATH.
|
||||
|
||||
postFixup =
|
||||
lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
patchelf $out/lib/libglobalplatform.so --add-rpath "$out/lib"
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
install_name_tool -add_rpath "$out/lib" "$out/lib/libglobalplatform.dylib"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "C library + command-line for Open- / GlobalPlatform smart cards";
|
||||
mainProgram = "gpshell";
|
||||
homepage = "https://github.com/kaoh/globalplatform";
|
||||
# Clarify license for GPShell
|
||||
# https://github.com/kaoh/globalplatform/issues/81
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [ stargate01 ];
|
||||
};
|
||||
})
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "google-java-format";
|
||||
version = "1.25.2";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar";
|
||||
sha256 = "sha256-JRV3l6CpcsIpC1vHFTDE961kZFgCXjSEQSpuWpuMmqY=";
|
||||
sha256 = "sha256-AqNhNXKX+pYpGMHQiDDVCxfWKYTSqGSRWblbmm2fgrI=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goose";
|
||||
version = "3.24.1";
|
||||
version = "3.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pressly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Dy6HHmf1kHd0KJ1EuPnNaa/zIQPUClvwJ8gUR7pi3Cw=";
|
||||
hash = "sha256-C/FeXsmKmSA8unpqT5TcNOsSaQNzc4JTv5hkfeb760E=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-wTzQoDgo54FY4Mt4rfZc075p/FGu3WhS+TSc3Bps75M=";
|
||||
vendorHash = "sha256-RLUZktadsr1KgNA6luAkyztIJTzMdlp/phRZDq1jUyk=";
|
||||
|
||||
# skipping: end-to-end tests require a docker daemon
|
||||
postPatch = ''
|
||||
|
||||
@@ -12,17 +12,24 @@
|
||||
autoPatchelfHook,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
replaceVars,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "gui-for-clash";
|
||||
version = "1.9.0";
|
||||
version = "1.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GUI-for-Cores";
|
||||
repo = "GUI.for.Clash";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0PNFiOZ+POp1P/HDJmAIMKNGIjft6bfwPiRDLswY2ns=";
|
||||
hash = "sha256-XQbiric4iAxvWRLKCCZtDrpFpPCylQlwnCm9dHSq/KM=";
|
||||
};
|
||||
|
||||
metaCommon = {
|
||||
homepage = "https://github.com/GUI-for-Cores/GUI.for.Clash";
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
|
||||
frontend = stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -36,7 +43,7 @@ let
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
sourceRoot = "${finalAttrs.src.name}/frontend";
|
||||
hash = "sha256-mG8b16PP876EyaX3Sc4WM41Yc/oDGZDiilZPaxPvvuQ=";
|
||||
hash = "sha256-5SVu8eCyN89k6BvNEqgs4hOrP5IjvjUZrzrVuDwtYCk=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/frontend";
|
||||
@@ -52,16 +59,14 @@ let
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r ./dist $out
|
||||
cp -r dist $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = metaCommon // {
|
||||
description = "GUI program developed by vue3";
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
});
|
||||
in
|
||||
@@ -76,7 +81,7 @@ buildGoModule {
|
||||
--replace-fail '@basepath@' "$out"
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-OrysyJF+lUMf+0vWmOZHjxUdE6fQCKArmpV4alXxtYs=";
|
||||
vendorHash = "sha256-Zt3We+Ai8oEqof2eQvcaIkocH85goeldmPf4mmDX17o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
wails
|
||||
@@ -90,6 +95,18 @@ buildGoModule {
|
||||
libsoup_3
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${frontend} frontend/dist
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
wails build -m -s -trimpath -skipbindings -devtools -tags webkit2_40 -o GUI.for.Clash
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "gui-for-clash";
|
||||
@@ -106,33 +123,28 @@ buildGoModule {
|
||||
})
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${frontend} ./frontend/dist
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
wails build -m -s -trimpath -skipbindings -devtools -tags webkit2_40 -o GUI.for.Clash
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm 0755 ./build/bin/GUI.for.Clash $out/bin/GUI.for.Clash
|
||||
install -Dm 0755 build/bin/GUI.for.Clash $out/bin/GUI.for.Clash
|
||||
install -Dm 0644 build/appicon.png $out/share/pixmaps/gui-for-clash.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
passthru = {
|
||||
inherit frontend;
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--subpackage"
|
||||
"frontend"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = metaCommon // {
|
||||
description = "Clash GUI program developed by vue3 + wails";
|
||||
homepage = "https://github.com/GUI-for-Cores/GUI.for.Clash";
|
||||
mainProgram = "GUI.for.Clash";
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,19 +20,19 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "incus-ui-canonical";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zabbly";
|
||||
repo = "incus-ui-canonical";
|
||||
# only use tags prefixed by incus- they are the tested fork versions
|
||||
tag = "incus-${version}";
|
||||
hash = "sha256-I0t2ShMkc/zYn7I6Vcd9A31ZAscY0D7cWAdF80NwRGg=";
|
||||
hash = "sha256-oXdkMalzAAcHEwca6h83cHH4buC/gGu5F3S82RM+IX4=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-O7oEAjmCEmPpsO/rdkZVhUkxhFzhHpPRbmci3yRBA7g=";
|
||||
hash = "sha256-nZyk/ZrTAOyL+A3oMUHY52PIffVZxMG2tvh4FM/A+w0=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@@ -3,21 +3,26 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
appimageTools,
|
||||
undmg,
|
||||
}:
|
||||
let
|
||||
pname = "insomnia";
|
||||
version = "10.2.0";
|
||||
version = "11.0.1";
|
||||
|
||||
src =
|
||||
fetchurl
|
||||
{
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg";
|
||||
hash = "sha256-3LjQYFCIIrjEQ+J0m7Xau3qcHMRR3xU078QOVgoBat4=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg";
|
||||
hash = "sha256-Yny5Rwt8XHTM77DH4AXmY8VtZ92F7jAdNW+polPePJk=";
|
||||
hash = "sha256-3LjQYFCIIrjEQ+J0m7Xau3qcHMRR3xU078QOVgoBat4=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.AppImage";
|
||||
hash = "sha256-DmDYyYJq7B4Zs9SCwyxgY3F5v+MXAhCKeQB35b3E86w=";
|
||||
hash = "sha256-X0UiD+IhyMTrUmsgocw0bpRZEk5YNEF3CMo3IkwKtvA=";
|
||||
};
|
||||
}
|
||||
.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
@@ -29,6 +34,7 @@ let
|
||||
changelog = "https://github.com/Kong/insomnia/releases/tag/core@${version}";
|
||||
license = licenses.asl20;
|
||||
platforms = [
|
||||
"aarch64-darwin"
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
];
|
||||
@@ -49,23 +55,7 @@ if stdenv.hostPlatform.isDarwin then
|
||||
;
|
||||
sourceRoot = ".";
|
||||
|
||||
unpackCmd = ''
|
||||
echo "Creating temp directory"
|
||||
mnt=$(TMPDIR=/tmp mktemp -d -t nix-XXXXXXXXXX)
|
||||
function finish {
|
||||
echo "Ejecting temp directory"
|
||||
/usr/bin/hdiutil detach $mnt -force
|
||||
rm -rf $mnt
|
||||
}
|
||||
# Detach volume when receiving SIG "0"
|
||||
trap finish EXIT
|
||||
# Mount DMG file
|
||||
echo "Mounting DMG file into \"$mnt\""
|
||||
/usr/bin/hdiutil attach -nobrowse -mountpoint $mnt $curSrc
|
||||
# Copy content to local dir for later use
|
||||
echo 'Copying extracted content into "sourceRoot"'
|
||||
cp -a $mnt/Insomnia.app $PWD/
|
||||
'';
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "iroh";
|
||||
version = "0.33.0";
|
||||
version = "0.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n0-computer";
|
||||
repo = "iroh";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GmgLPtg01sUrvno45IJEmhltuBWGXZnOI+Xeskz0BXg=";
|
||||
hash = "sha256-uavWluu7rVY2lZXDRsKApcZMB7TJsGuhJzieZPMXdvE=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-xLNdZtzx6BZ0RJj3hfzo7ZZ0AeE1KAg51/FTJyLva6Y=";
|
||||
cargoHash = "sha256-7tQbfXVdgoxACF6qtesbUQ3AtVFAI2IbGO720PjwZCc=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
with darwin.apple_sdk.frameworks; [
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
flutter,
|
||||
flutter327,
|
||||
fetchFromGitHub,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
mpv-unwrapped,
|
||||
}:
|
||||
flutter.buildFlutterApplication rec {
|
||||
flutter327.buildFlutterApplication rec {
|
||||
pname = "jellyflix";
|
||||
version = "1.0.0";
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k8sgpt";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k8sgpt-ai";
|
||||
repo = "k8sgpt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uvbKsRomHUR8YH2SUhGL25o3EdI2zxDs+qSozc2X++4=";
|
||||
hash = "sha256-GKRI5qry2eYPP3/BTjS7qnIp7lX/uAR0s40y/oECaeY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7YmGjlqtW4oq58hjQJITVslEl/g6ek3ERTX+b5Clo/A=";
|
||||
vendorHash = "sha256-7xcCSbQ5Mvoi7MActgwHMSp/duDxfugUZBOsMbzUGhg=";
|
||||
|
||||
# https://nixos.org/manual/nixpkgs/stable/#var-go-CGO_ENABLED
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
libevent,
|
||||
libxml2,
|
||||
mariadb-connector-c,
|
||||
pcre,
|
||||
pcre2,
|
||||
gnugrep,
|
||||
gawk,
|
||||
coreutils,
|
||||
@@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kamailio";
|
||||
version = "5.7.4";
|
||||
version = "6.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kamailio.org/pub/kamailio/${finalAttrs.version}/src/kamailio-${finalAttrs.version}_src.tar.gz";
|
||||
hash = "sha256-AP9zgGFuoM+gsVmoepfedFTwDOM3RpsRpO6gS/4AMfM=";
|
||||
hash = "sha256-jB1htMFHBtwnSNN7GtQFU5cnYgWpTgvXDjn9mMR1PQE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libevent
|
||||
libxml2
|
||||
mariadb-connector-c
|
||||
pcre
|
||||
pcre2
|
||||
openssl
|
||||
];
|
||||
|
||||
|
||||
Generated
+946
-873
File diff suppressed because it is too large
Load Diff
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "keyguard";
|
||||
version = "1.10.1";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AChep";
|
||||
repo = "keyguard-app";
|
||||
tag = "r20250226.1";
|
||||
hash = "sha256-yDg3Ge+eI3UPVfvBUzDG1fmthgSaDkOMjPa9v90Bi+U=";
|
||||
tag = "r20250324";
|
||||
hash = "sha256-luuj8bg9XlIrE38RmZzJM1u4TKZAWXtxCMG1rGRjVFk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -23,6 +23,6 @@ fi
|
||||
hash=$(nix hash convert --hash-algo sha256 --to sri $(nix-prefetch-url --unpack "https://github.com/AChep/keyguard-app/archive/refs/tags/${latestTag}.tar.gz"))
|
||||
update-source-version keyguard $latestVersion $hash
|
||||
|
||||
sed -i "s/tag = \"r[0-9]\+\";/tag = \"$latestTag\";/g" "$ROOT/package.nix"
|
||||
sed -i 's/tag = "r[0-9]\+\(\.[0-9]\+\)\?";/tag = "'"$latestTag"'";/g' "$ROOT/package.nix"
|
||||
|
||||
$(nix-build -A keyguard.mitmCache.updateScript)
|
||||
|
||||
@@ -37,7 +37,7 @@ let
|
||||
|
||||
pname = "librewolf-bin-unwrapped";
|
||||
|
||||
version = "136.0-2";
|
||||
version = "136.0.4-1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -47,9 +47,9 @@ stdenv.mkDerivation {
|
||||
url = "https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
|
||||
hash =
|
||||
{
|
||||
i686-linux = "sha256-VRY6OY3nBTfwrdoRF8zBjSfwrxCM9SnmjUvAXhLbGSY=";
|
||||
x86_64-linux = "sha256-KjOES7AjoObZ0EPjTFAVafm++8MsxtEs1FgViLsR/hc=";
|
||||
aarch64-linux = "sha256-vUW+eEabJ3Gp0ov/9ms/KyLzwHOCKozpR/CdZGaxA0I=";
|
||||
i686-linux = "sha256-olqGXteeHqT456SEMEHjPWcnypABGZbFvlpWKBF962Y=";
|
||||
x86_64-linux = "sha256-3zcI1ND+laXFAv7nDlUEDjM007XHglnMYyFkd1n+sR8=";
|
||||
aarch64-linux = "sha256-9OwVuKsTJZ7js846BZSzXiyz53d0ebXwugXyrmnFFQc=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or throwSystem;
|
||||
};
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
latestVersion=$(curl ${PRIVATE-TOKEN:+-u ":$PRIVATE-TOKEN"} -sL https://gitlab.com/api/v4/projects/44042130/releases | jq -r '.[0].tag_name')
|
||||
latestVersion=$(curl ${GITLAB_TOKEN:+-H "Private-Token: $GITLAB_TOKEN"} -sL https://gitlab.com/api/v4/projects/44042130/releases | jq -r '.[0].tag_name')
|
||||
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; librewolf-bin-unwrapped.version or (lib.getVersion librewolf-bin-unwrapped)" | tr -d '"')
|
||||
|
||||
echo "latest version: $latestVersion"
|
||||
@@ -19,6 +19,6 @@ for i in \
|
||||
"x86_64-linux linux-x86_64" \
|
||||
"aarch64-linux linux-arm64"; do
|
||||
set -- $i
|
||||
hash=$(nix hash convert --to sri --hash-algo sha256 $(curl ${PRIVATE-TOKEN:+-u ":$PRIVATE-TOKEN"} -sL https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/$latestVersion/librewolf-$latestVersion-$2-package.tar.xz.sha256sum))
|
||||
hash=$(nix hash convert --to sri --hash-algo sha256 $(curl ${GITLAB_TOKEN:+-H "Private-Token: $GITLAB_TOKEN"} -sL https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/$latestVersion/librewolf-$latestVersion-$2-package.tar.xz.sha256sum))
|
||||
update-source-version librewolf-bin-unwrapped $latestVersion $hash --system=$1 --ignore-same-version
|
||||
done
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
darwin,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libserialport";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sigrok.org/download/source/libserialport/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-XeuStcpywDR7B7eGhINQ3sotz9l1zmE7jg4dlHpLTKk=";
|
||||
url = "https://sigrok.org/download/source/libserialport/libserialport-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-XeuStcpywDR7B7eGhINQ3sotz9l1zmE7jg4dlHpLTKk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
|
||||
lib.optional stdenv.hostPlatform.isLinux udev
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Cross-platform shared library for serial port access";
|
||||
homepage = "https://sigrok.org/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = with lib; platforms.linux ++ platforms.darwin ++ platforms.windows;
|
||||
maintainers = [ lib.maintainers.bjornfor ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metals";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${pname}-deps-${version}";
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-2FA2B/WzNGU4B785pn5zZ9Xj64huzbSbr2Or+CxUMlI=";
|
||||
outputHash = "sha256-Qh8T0/nLVpfdJiWqdi1mpvUom5B9Xr8jsNGqzEx8OLs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "modelscan";
|
||||
version = "0.8.4";
|
||||
version = "0.8.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protectai";
|
||||
repo = "modelscan";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tpxonfkdqPNLQQPjn+uIYSEzpXfeoRk4PG14cXR+tS8=";
|
||||
hash = "sha256-8VupkPiHebVtOqMdtkBflAI1zPRdDSvHCEq3ghjASaE=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
@@ -49,7 +49,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "Protection against Model Serialization Attacks";
|
||||
homepage = "https://github.com/protectai/modelscan";
|
||||
changelog = "https://github.com/protectai/modelscan/releases/tag/v${version}";
|
||||
changelog = "https://github.com/protectai/modelscan/releases/tag/${src.tag}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "modelscan";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mtail";
|
||||
version = "3.0.9";
|
||||
version = "3.0.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
owner = "jaqx0r";
|
||||
repo = "mtail";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZyQpTxWBCU+pmulEXi/Y2PimbNMsUlbEFj8r+gTOTA0=";
|
||||
hash = "sha256-B/to05/qORplhNyz0s7t/WgpmOJ6UZoKnmJfqaf6Htc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-96r2UWM5HUF69BOGW6buV6juJEDYoiBPmR5iGNmI5WA=";
|
||||
vendorHash = "sha256-jE1tcZJ7TaMC3yegBHE3Zad9sF0EfbHxDA8ffehNL4U=";
|
||||
|
||||
ldflags = [
|
||||
"-X=main.Branch=main"
|
||||
@@ -29,7 +29,7 @@ buildGoModule rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for extracting metrics from application logs";
|
||||
homepage = "https://github.com/google/mtail";
|
||||
homepage = "https://github.com/jaqx0r/mtail";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
mainProgram = "mtail";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nu_scripts";
|
||||
version = "0-unstable-2025-03-13";
|
||||
version = "0-unstable-2025-03-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nushell";
|
||||
repo = pname;
|
||||
rev = "861a99779d31010ba907e4d6aaf7b1629b9eb775";
|
||||
hash = "sha256-L/ySTOTGijpu+6Bncg+Rn7MBd/R5liSSPLlfoQvg7ps=";
|
||||
rev = "e956708244820d2b98620ef0ed10e63cb7d42b3a";
|
||||
hash = "sha256-fzQ8f6mB7cVRbwVOCxPD/4nFmI3s5mXzJagn8us6ngA=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
asciidoctor,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "nux";
|
||||
version = "0.1.4";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NuxPackage";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-k3HRaWN8/MTZRGWBxI8RRK0tcSYBbSLs3vHkUdLGTc8";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-iemfLIiT2BOsf0Q4X8fmEHmgHMd0WQk1t2rmRUuF5pY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoctor
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage $releaseDir/build/nux-*/out/nux.1
|
||||
installShellCompletion $releaseDir/build/nux-*/out/nux.{bash,fish}
|
||||
installShellCompletion $releaseDir/build/nux-*/out/_nux
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/NuxPackage/nux";
|
||||
description = "Wrapper over the nix cli";
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "nux";
|
||||
};
|
||||
}
|
||||
@@ -4,7 +4,6 @@
|
||||
flutter327,
|
||||
autoPatchelfHook,
|
||||
makeDesktopItem,
|
||||
pkg-config,
|
||||
copyDesktopItems,
|
||||
alsa-lib,
|
||||
libepoxy,
|
||||
@@ -16,7 +15,13 @@
|
||||
mpv-unwrapped,
|
||||
mpv,
|
||||
mimalloc,
|
||||
runCommand,
|
||||
yq,
|
||||
oneanime,
|
||||
_experimental-update-script-combinators,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
let
|
||||
libopencc = buildGoModule rec {
|
||||
pname = "libopencc";
|
||||
@@ -50,34 +55,37 @@ let
|
||||
meta = {
|
||||
homepage = "https://github.com/Predidit/open_chinese_convert_bridge";
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
};
|
||||
in
|
||||
flutter327.buildFlutterApplication rec {
|
||||
pname = "oneanime";
|
||||
version = "1.3.7";
|
||||
version = "1.3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Predidit";
|
||||
repo = "oneAnime";
|
||||
tag = version;
|
||||
hash = "sha256-lRO5JYzzopy69lJ0/4pLf4u93NlYLaghhG4Fuf04f6A=";
|
||||
hash = "sha256-YPz0sctDzzBM1B/Ugspwj2Jg8LMSuB84ngZ8+PnlrDM=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
gitHashes = {
|
||||
flutter_open_chinese_convert = "sha256-uRPBBB5RUd8fiFaM8dg9Th2tvQYwnbsQrsiDSPMm5kk=";
|
||||
media_kit = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
|
||||
media_kit_libs_android_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
|
||||
media_kit_libs_ios_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
|
||||
media_kit_libs_linux = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
|
||||
media_kit_libs_macos_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
|
||||
media_kit_libs_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
|
||||
media_kit_libs_windows_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
|
||||
media_kit_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
|
||||
};
|
||||
gitHashes =
|
||||
let
|
||||
media_kit-hash = "sha256-6V4ZTRsExm8TidznnvAZRXGbkxTLDs7YFNutNh7tLK8=";
|
||||
in
|
||||
{
|
||||
flutter_open_chinese_convert = "sha256-uRPBBB5RUd8fiFaM8dg9Th2tvQYwnbsQrsiDSPMm5kk=";
|
||||
media_kit = media_kit-hash;
|
||||
media_kit_libs_android_video = media_kit-hash;
|
||||
media_kit_libs_ios_video = media_kit-hash;
|
||||
media_kit_libs_linux = media_kit-hash;
|
||||
media_kit_libs_macos_video = media_kit-hash;
|
||||
media_kit_libs_video = media_kit-hash;
|
||||
media_kit_libs_windows_video = media_kit-hash;
|
||||
media_kit_video = media_kit-hash;
|
||||
};
|
||||
|
||||
customSourceBuilders = {
|
||||
# unofficial media_kit_libs_linux
|
||||
@@ -136,7 +144,6 @@ flutter327.buildFlutterApplication rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoPatchelfHook
|
||||
copyDesktopItems
|
||||
];
|
||||
@@ -156,9 +163,26 @@ flutter327.buildFlutterApplication rec {
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm0644 ./assets/images/logo/logo_android_2.png $out/share/pixmaps/oneanime.png
|
||||
ln -snf ${mpv}/lib/libmpv.so.2 $out/app/oneanime/lib/libmpv.so.2
|
||||
install -Dm0644 assets/images/logo/logo_android_2.png $out/share/pixmaps/oneanime.png
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
pubspecSource =
|
||||
runCommand "pubspec.lock.json"
|
||||
{
|
||||
nativeBuildInputs = [ yq ];
|
||||
inherit (oneanime) src;
|
||||
}
|
||||
''
|
||||
cat $src/pubspec.lock | yq > $out
|
||||
'';
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(gitUpdater { })
|
||||
(_experimental-update-script-combinators.copyAttrOutputToFile "oneanime.pubspecSource" ./pubspec.lock.json)
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Anime1 third-party client with bullet screen";
|
||||
homepage = "https://github.com/Predidit/oneAnime";
|
||||
|
||||
@@ -180,11 +180,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "canvas_danmaku",
|
||||
"sha256": "25bb2dd9a3f46cc47a926a7a3aacca461ae8c6290e9d44767cddc0f9ac4f9c91",
|
||||
"sha256": "a6761973c72328c3872fa288d0a943bf3675238a30913cf9cd0155d9b7cea9ca",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.2.5"
|
||||
"version": "0.2.6"
|
||||
},
|
||||
"characters": {
|
||||
"dependency": "transitive",
|
||||
@@ -635,11 +635,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "http",
|
||||
"sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
|
||||
"sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.2"
|
||||
"version": "1.3.0"
|
||||
},
|
||||
"http_multi_server": {
|
||||
"dependency": "transitive",
|
||||
@@ -806,7 +806,7 @@
|
||||
"description": {
|
||||
"path": "media_kit",
|
||||
"ref": "main",
|
||||
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
|
||||
"resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -817,7 +817,7 @@
|
||||
"description": {
|
||||
"path": "libs/android/media_kit_libs_android_video",
|
||||
"ref": "main",
|
||||
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
|
||||
"resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -828,7 +828,7 @@
|
||||
"description": {
|
||||
"path": "libs/ios/media_kit_libs_ios_video",
|
||||
"ref": "main",
|
||||
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
|
||||
"resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -839,7 +839,7 @@
|
||||
"description": {
|
||||
"path": "libs/linux/media_kit_libs_linux",
|
||||
"ref": "main",
|
||||
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
|
||||
"resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -850,7 +850,7 @@
|
||||
"description": {
|
||||
"path": "libs/macos/media_kit_libs_macos_video",
|
||||
"ref": "main",
|
||||
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
|
||||
"resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -861,7 +861,7 @@
|
||||
"description": {
|
||||
"path": "libs/universal/media_kit_libs_video",
|
||||
"ref": "main",
|
||||
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
|
||||
"resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -872,7 +872,7 @@
|
||||
"description": {
|
||||
"path": "libs/windows/media_kit_libs_windows_video",
|
||||
"ref": "main",
|
||||
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
|
||||
"resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -883,7 +883,7 @@
|
||||
"description": {
|
||||
"path": "media_kit_video",
|
||||
"ref": "main",
|
||||
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
|
||||
"resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -973,11 +973,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "package_info_plus",
|
||||
"sha256": "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d",
|
||||
"sha256": "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.1.2"
|
||||
"version": "8.1.3"
|
||||
},
|
||||
"package_info_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -1699,21 +1699,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "wakelock_plus",
|
||||
"sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484",
|
||||
"sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.8"
|
||||
"version": "1.2.10"
|
||||
},
|
||||
"wakelock_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "wakelock_plus_platform_interface",
|
||||
"sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16",
|
||||
"sha256": "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.1"
|
||||
"version": "1.2.2"
|
||||
},
|
||||
"watcher": {
|
||||
"dependency": "transitive",
|
||||
@@ -1828,6 +1828,6 @@
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.6.0 <4.0.0",
|
||||
"flutter": ">=3.27.1"
|
||||
"flutter": ">=3.27.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
let
|
||||
pname = "openfga";
|
||||
version = "1.8.7";
|
||||
version = "1.8.8";
|
||||
in
|
||||
|
||||
buildGoModule {
|
||||
@@ -17,10 +17,10 @@ buildGoModule {
|
||||
owner = "openfga";
|
||||
repo = "openfga";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gA/lyToqKWbReFocR4QytBpCqiLZmjQIpP3C8njc1YQ=";
|
||||
hash = "sha256-Hg6mtePtaZ2Yg3ohDVEDFsZKcBDY24K2lb+avZHfqD8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eKo6GK/g93dsLxGYA5aw6nuUCVPNLdr2sKq5XOaJUJs=";
|
||||
vendorHash = "sha256-M14y4WZZTvXm6dOkJV16TFv2xHkInZCI9rEu9h7lQ1I=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -1,20 +1,37 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
|
||||
, curl, libxml2, pam, sblim-sfcc }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
curl,
|
||||
libxml2,
|
||||
pam,
|
||||
sblim-sfcc,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openwsman";
|
||||
version = "2.7.2";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Openwsman";
|
||||
repo = "openwsman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CH2pqWs64Dznim3IljmsthKEQfACVlaAKQ/07MgryHo=";
|
||||
owner = "Openwsman";
|
||||
repo = "openwsman";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-jXsnjnYZ2UiEj3sJDhMuWlopIECKLraqgIV4evw5Tbw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ curl libxml2 pam sblim-sfcc ];
|
||||
buildInputs = [
|
||||
curl
|
||||
libxml2
|
||||
pam
|
||||
sblim-sfcc
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_RUBY_GEM=no"
|
||||
@@ -28,12 +45,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [ "--disable-more-warnings" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Openwsman server implementation and client API with bindings";
|
||||
meta = {
|
||||
description = "Openwsman server implementation and client API with bindings";
|
||||
downloadPage = "https://github.com/Openwsman/openwsman/releases";
|
||||
homepage = "https://openwsman.github.io";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ deepfire ];
|
||||
platforms = platforms.linux; # PAM is not available on Darwin
|
||||
homepage = "https://openwsman.github.io";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ deepfire ];
|
||||
platforms = lib.platforms.linux; # PAM is not available on Darwin
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pack";
|
||||
version = "0.36.4";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildpacks";
|
||||
repo = "pack";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6cWmBNlmPnNszmv6zaHlyd8GqncMtttKOMfQxxJGJ18=";
|
||||
hash = "sha256-QCN0UvWa5u9XX5LvY3yD8Xz2s1XzZUg/WXnAfWwZnY0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9fO/jwTpVvCdHIy1GrE2YZr7jN7Oyw64EbS2w08VOVI=";
|
||||
vendorHash = "sha256-W8FTk2eJYaTE9gCRwrT+mDhda/ZZeCytqQ9vvVZZHSQ=";
|
||||
|
||||
subPackages = [ "cmd/pack" ];
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://www.pberndt.com/Programme/Linux/pqiv";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ donovanglover ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "pqiv";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{
|
||||
lib,
|
||||
flutter327,
|
||||
fetchFromGitHub,
|
||||
autoPatchelfHook,
|
||||
}:
|
||||
|
||||
flutter327.buildFlutterApplication rec {
|
||||
pname = "proxypin";
|
||||
version = "1.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wanghongenpin";
|
||||
repo = "proxypin";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-A+FgWTzluyTENyr29I57107pYrClMn+L4Th1BluTQIU=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
gitHashes = {
|
||||
desktop_multi_window = "sha256-Tbl0DOxW1F8V2Kj34gcNRbBqr5t9Iq74qCT26deqFdQ=";
|
||||
flutter_code_editor = "sha256-HwgjyIwS0HcXL5JN7T1pTKyALakCC31V3rMFum7dHvE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace linux/my_application.cc \
|
||||
--replace-fail "/opt/proxypin/data/flutter_assets/assets/icon.png" "$out/app/proxypin/data/flutter_assets/assets/icon.png"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace linux/proxy-pin.desktop \
|
||||
--replace-fail "/opt/proxypin/data/flutter_assets/assets/icon.png" "proxypin" \
|
||||
--replace-fail "/opt/proxypin/" ""
|
||||
install -Dm0644 linux/proxy-pin.desktop $out/share/applications/proxypin.desktop
|
||||
install -Dm0644 assets/icon.png $out/share/pixmaps/proxypin.png
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Capture HTTP(S) traffic software";
|
||||
homepage = "https://github.com/wanghongenpin/proxypin";
|
||||
mainProgram = "ProxyPin";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ emaryn ];
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -10,7 +10,7 @@
|
||||
copyDesktopItems,
|
||||
}:
|
||||
let
|
||||
version = "2.62.1";
|
||||
version = "2.62.2";
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
inherit version;
|
||||
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "pyfa-org";
|
||||
repo = "Pyfa";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-yNMqP4YsfwTrf92wizstBXiTbhxAwIFoml4CUecqjbo=";
|
||||
hash = "sha256-7YFObKV4vXiTWgCfek7k4yVq7IG3JMtaB36Jhu7rGjk=";
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
|
||||
Generated
+5
@@ -209,6 +209,11 @@
|
||||
"version": "3.1.5",
|
||||
"hash": "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw="
|
||||
},
|
||||
{
|
||||
"pname": "SixLabors.ImageSharp",
|
||||
"version": "3.1.7",
|
||||
"hash": "sha256-jMD/FiIwW1kNhTI6hKig8/QFOO3eTQX/C22cSAcKBH4="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp",
|
||||
"version": "2.88.8",
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
runCommandLocal,
|
||||
}:
|
||||
let
|
||||
version = "6.8.3";
|
||||
version = "6.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "retrospy";
|
||||
repo = "RetroSpy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NuLfFSRGOIB6h4b5XZ7Qs8y5L+fqozQfMr8q0xZAurQ=";
|
||||
hash = "sha256-QoZcKFVjd0qYQ+Ds4Y/JKBPiL+z83wxm0ktuETX5ZPU=";
|
||||
};
|
||||
|
||||
executables = [
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
{
|
||||
autoPatchelfHook,
|
||||
copyDesktopItems,
|
||||
fetchurl,
|
||||
gtk3,
|
||||
lib,
|
||||
makeDesktopItem,
|
||||
qt6,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
let
|
||||
desktopItem = makeDesktopItem {
|
||||
type = "Application";
|
||||
exec = "roomarranger";
|
||||
name = "roomarranger";
|
||||
desktopName = "Room Arranger";
|
||||
genericName = "Design your room, office, apartment, house.";
|
||||
icon = "roomarranger-icon";
|
||||
terminal = false;
|
||||
categories = [ "Graphics" ];
|
||||
mimeTypes = [
|
||||
"application/com.roomarranger.project"
|
||||
"application/com.roomarranger.object"
|
||||
];
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "roomarranger";
|
||||
version = "10.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://f000.backblazeb2.com/file/rooarr/rooarr1001-linux64.tar.gz";
|
||||
hash = "sha256-OwJSOfyTQinVKzrJftpFa5NN1kGweBezedpL2aE4LbE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
copyDesktopItems
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
qt6.qt3d
|
||||
qt6.qtwayland
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib $out/bin
|
||||
cp -r rooarr-bin/* $out/lib/
|
||||
|
||||
# Delete bundled dynamic libraries that reference major Qt version 6
|
||||
rm -f $out/lib/*.6
|
||||
|
||||
ln -s $out/lib/RoomArranger $out/bin/roomarranger
|
||||
|
||||
# Install application icons
|
||||
icon_resolutions="16x16 32x32 48x48 64x64 128x128 256x256 512x512"
|
||||
for res in $icon_resolutions; do
|
||||
mkdir -p $out/share/icons/hicolor/$res/apps
|
||||
cp rooarr-bin/icons/icon_$res.png $out/share/icons/hicolor/$res/apps/roomarranger-icon.png
|
||||
done
|
||||
mkdir -p $out/share/icons/hicolor/32x32/mimetypes
|
||||
cp rooarr-bin/icons/raFileIcon32.png $out/share/icons/hicolor/32x32/mimetypes/application-com.roomarranger.project.png
|
||||
cp rooarr-bin/icons/raFileObjectIcon32.png $out/share/icons/hicolor/32x32/mimetypes/application-com.roomarranger.object.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [ desktopItem ];
|
||||
|
||||
meta = {
|
||||
description = "3D room planning software";
|
||||
longDescription = ''
|
||||
Room Arranger is a 3D room / apartment / floor planner with a simple user interface.
|
||||
Free for 30 days. Updates are free.
|
||||
'';
|
||||
homepage = "https://www.roomarranger.com/";
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [ bellackn ];
|
||||
mainProgram = "roomarranger";
|
||||
sourceProvenance = [
|
||||
lib.sourceTypes.binaryNativeCode
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simdjson";
|
||||
version = "3.12.2";
|
||||
version = "3.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdjson";
|
||||
repo = "simdjson";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TjUPySFwwTlD4fLpHoUywAeWvVvi7Hg1wxzgE9vohrs=";
|
||||
sha256 = "sha256-/FfaM5BTWKrt2m70+VcUXz//RiZuzxnUOaHOjPJWsGw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
func main() {
|
||||
outputFile, err := os.Create("geosite.db")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
defer outputFile.Close()
|
||||
vData, err := ioutil.ReadFile("@geosite_data@")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
domainMap, err := parse(vData)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = geosite.Write(outputFile, domainMap)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
ruleSetOutput := "rule-set"
|
||||
err = os.MkdirAll(ruleSetOutput, 0o755)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
for code, domains := range domainMap {
|
||||
var headlessRule option.DefaultHeadlessRule
|
||||
defaultRule := geosite.Compile(domains)
|
||||
headlessRule.Domain = defaultRule.Domain
|
||||
headlessRule.DomainSuffix = defaultRule.DomainSuffix
|
||||
headlessRule.DomainKeyword = defaultRule.DomainKeyword
|
||||
headlessRule.DomainRegex = defaultRule.DomainRegex
|
||||
var plainRuleSet option.PlainRuleSet
|
||||
plainRuleSet.Rules = []option.HeadlessRule{
|
||||
{
|
||||
Type: C.RuleTypeDefault,
|
||||
DefaultOptions: headlessRule,
|
||||
},
|
||||
}
|
||||
srsPath, _ := filepath.Abs(filepath.Join(ruleSetOutput, "geosite-"+code+".srs"))
|
||||
os.Stderr.WriteString("write " + srsPath + "\n")
|
||||
outputRuleSet, err := os.Create(srsPath)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = srs.Write(outputRuleSet, plainRuleSet)
|
||||
if err != nil {
|
||||
outputRuleSet.Close()
|
||||
panic(err)
|
||||
}
|
||||
outputRuleSet.Close()
|
||||
}
|
||||
}
|
||||
@@ -2,31 +2,35 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
replaceVars,
|
||||
v2ray-domain-list-community,
|
||||
}:
|
||||
|
||||
let
|
||||
patch = replaceVars ./main.go {
|
||||
geosite_data = "${v2ray-domain-list-community}/share/v2ray/geosite.dat";
|
||||
};
|
||||
in
|
||||
buildGoModule {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "sing-geosite";
|
||||
inherit (v2ray-domain-list-community) version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SagerNet";
|
||||
repo = "sing-geosite";
|
||||
rev = "bbd9f11bb9245463bf9d5614b74014fe5803b989";
|
||||
hash = "sha256-UQChYKgN5JZk+KZ2c5Ffh/rQi6/TVeFQkbH6mpLx4x8=";
|
||||
tag = "20250326132209";
|
||||
hash = "sha256-l9YjoxKxsEbWjhMuZC0NDsDjEQySdjdr34ix1NWNMlM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-C6idJDUp6AFe50tQ+4mmZsxuOKH8JSeC1p7XVRZ224E=";
|
||||
vendorHash = "sha256-35sCpEfelXcx8jQaOx7TO+X39NPuhStFmbLyLFooQcc=";
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e '/func main()/,/^}/d' -e '/"io"/a "io/ioutil"' main.go
|
||||
cat ${patch} >> main.go
|
||||
sed -i main.go \
|
||||
-e '/"io"/a "io/ioutil"' \
|
||||
-e '/func main(/,/^}/d'
|
||||
|
||||
substituteInPlace main.go --replace-fail \
|
||||
'vData, err := download(release)' \
|
||||
'vData, err := ioutil.ReadFile("${v2ray-domain-list-community}/share/v2ray/geosite.dat")'
|
||||
|
||||
cat << EOF >> main.go
|
||||
func main() {
|
||||
generate(nil, "geosite.db", "geosite-cn.db", "rule-set", "rule-set-unstable")
|
||||
}
|
||||
EOF
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
@@ -42,10 +46,11 @@ buildGoModule {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "community managed domain list";
|
||||
homepage = "https://github.com/SagerNet/sing-geosite";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ linsui ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ linsui ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.1296.0";
|
||||
version = "1.1296.1";
|
||||
in
|
||||
buildNpmPackage {
|
||||
pname = "snyk";
|
||||
@@ -18,10 +18,10 @@ buildNpmPackage {
|
||||
owner = "snyk";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-y3S4qQ/zf28YvI0bfxNr1l521vF6Z8rmh4nuxN4z7DA=";
|
||||
hash = "sha256-7eelAsZGoCVXdAIW8hyXN+s2Bz9z8Ya2v+mskYNy4Kg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-rNvPOLI9FhDlnVorjaCvJKw++TYQZ6Z52yZwV13h37U=";
|
||||
npmDepsHash = "sha256-3zNiFYuosyw4PBSt2NXMMOLP//XKsLHfVqiOjNSbL4A=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace package.json \
|
||||
|
||||
@@ -11,22 +11,29 @@
|
||||
|
||||
let
|
||||
rocksdb = rocksdb_8_3;
|
||||
concurrentqueue = fetchFromGitHub {
|
||||
owner = "cameron314";
|
||||
repo = "concurrentqueue";
|
||||
tag = "v1.0.4";
|
||||
hash = "sha256-MkhlDme6ZwKPuRINhfpv7cxliI2GU3RmTfC6O0ke/IQ=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sortmerna";
|
||||
version = "4.2.0";
|
||||
version = "4.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sortmerna";
|
||||
repo = "sortmerna";
|
||||
owner = "biocore";
|
||||
rev = "v${version}";
|
||||
sha256 = "0r91viylzr069jm7kpcgb45kagvf8sqcj5zc1af4arl9sgfs1f3j";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oxwZBkeW3usEcJE1XLu1UigKsgOsljwGFTpb7U3845I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
rocksdb
|
||||
@@ -37,19 +44,15 @@ stdenv.mkDerivation rec {
|
||||
"-DPORTABLE=off"
|
||||
"-DRAPIDJSON_HOME=${rapidjson}"
|
||||
"-DROCKSDB_HOME=${rocksdb}"
|
||||
"-DCONCURRENTQUEUE_HOME=${concurrentqueue}"
|
||||
"-DROCKSDB_STATIC=off"
|
||||
"-DZLIB_STATIC=off"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix formatting string error:
|
||||
# https://github.com/biocore/sortmerna/issues/255
|
||||
substituteInPlace src/sortmerna/indexdb.cpp \
|
||||
--replace 'is_verbose, ss' 'is_verbose, "%s", ss'
|
||||
|
||||
# Fix missing pthread dependency for the main binary.
|
||||
substituteInPlace src/sortmerna/CMakeLists.txt \
|
||||
--replace "target_link_libraries(sortmerna" \
|
||||
--replace-fail "target_link_libraries(sortmerna" \
|
||||
"target_link_libraries(sortmerna Threads::Threads"
|
||||
|
||||
# Fix gcc-13 build by adding missing <cstdint> includes:
|
||||
@@ -57,13 +60,13 @@ stdenv.mkDerivation rec {
|
||||
sed -e '1i #include <cstdint>' -i include/kseq_load.hpp
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Tools for filtering, mapping, and OTU-picking from shotgun genomics data";
|
||||
mainProgram = "sortmerna";
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.x86_64;
|
||||
license = lib.licenses.lgpl3;
|
||||
platforms = lib.platforms.x86_64;
|
||||
homepage = "https://bioinfo.lifl.fr/RNA/sortmerna/";
|
||||
maintainers = with maintainers; [ luispedro ];
|
||||
maintainers = with lib.maintainers; [ luispedro ];
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,21 +7,23 @@
|
||||
makeWrapper,
|
||||
python3,
|
||||
rcs,
|
||||
asciidoctor,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "src";
|
||||
version = "1.33";
|
||||
version = "1.41";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "esr";
|
||||
repo = "src";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-xyKJcM9dWsFGhe+ISR6S1f67jkYlS9heZe0TFXY8DgQ=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-i5i6+RmQ/70ul2r/NC6xv/8sUP3+8mkQIDgyC1NrSrI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoc
|
||||
asciidoctor
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
@@ -46,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--suffix PATH ":" "${rcs}/bin"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "http://www.catb.org/esr/src/";
|
||||
description = "Simple single-file revision control";
|
||||
longDescription = ''
|
||||
@@ -58,9 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
anywhere.
|
||||
'';
|
||||
changelog = "https://gitlab.com/esr/src/-/raw/${finalAttrs.version}/NEWS.adoc";
|
||||
license = licenses.bsd2;
|
||||
license = lib.licenses.bsd2;
|
||||
mainProgram = "src";
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
inherit (python3.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sttr";
|
||||
version = "0.2.24";
|
||||
version = "0.2.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abhimanyu003";
|
||||
repo = "sttr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9p4h30iM3SZDCAn08KQjJLJGbQND13gbWK5rhW+Knok=";
|
||||
hash = "sha256-FVjdlheKt3WoFQnb9qrYQATSkJmuXCVrigBbnKUHUR0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GJtnwnT+dJAjnAlGcoealsiKcLu0bBBHOE8xRjJQaVs=";
|
||||
vendorHash = "sha256-OQxp52v8TEgB09obp3UKOReRWB79Cwa6zbSE1V/s+JY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -4,22 +4,24 @@
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
ninja,
|
||||
gettext,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "subnetcalc";
|
||||
version = "2.5.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dreibh";
|
||||
repo = "subnetcalc";
|
||||
rev = "subnetcalc-${finalAttrs.version}";
|
||||
hash = "sha256-uP2T7c5aBvOsuJK648WNWO9WmRN4WCRlAIBFYTYyUkw=";
|
||||
tag = "subnetcalc-${finalAttrs.version}";
|
||||
hash = "sha256-TiPnNfETb69snl/8LXaIfjAq92meahvfIWSJLSrlxcc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
gettext
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -24,17 +24,23 @@
|
||||
stdenv,
|
||||
vala,
|
||||
wrapGAppsHook3,
|
||||
blueprint-compiler,
|
||||
gtk4,
|
||||
libadwaita,
|
||||
udisks,
|
||||
libgtop,
|
||||
gtk4-layer-shell,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swaysettings";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ErikReider";
|
||||
repo = "SwaySettings";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dn3n5DOAsw0FeXBkh19A2qB/5O+RyA2/Fj5PVtMOyL0=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XP0Q3Q40cvAl3MEqShY+VMWjlCtqs9e91nkxocVNQQQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -48,6 +54,10 @@ stdenv.mkDerivation rec {
|
||||
vala
|
||||
wrapGAppsHook3
|
||||
gobject-introspection
|
||||
blueprint-compiler
|
||||
udisks
|
||||
libgtop
|
||||
gtk4-layer-shell
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -62,22 +72,24 @@ stdenv.mkDerivation rec {
|
||||
libhandy
|
||||
libpulseaudio
|
||||
libxml2
|
||||
pantheon.granite
|
||||
pantheon.granite7
|
||||
gtk4
|
||||
libadwaita
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "GUI for configuring your sway desktop";
|
||||
longDescription = ''
|
||||
Sway settings enables easy configuration of a sway desktop environment
|
||||
such as selection of application or icon themes.
|
||||
'';
|
||||
homepage = "https://github.com/ErikReider/SwaySettings";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.aacebedo ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.aacebedo ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,11 +16,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tarsnap";
|
||||
version = "1.0.40";
|
||||
version = "1.0.41";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz";
|
||||
sha256 = "1mbzq81l4my5wdhyxyma04sblr43m8p7ryycbpi6n78w1hwfbjmw";
|
||||
hash = "sha256-vr2+Hm6RIzdVvrQu8LStvv2Vc0VSWPAJ+zMVVseZs9A=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tbls";
|
||||
version = "1.83.0";
|
||||
version = "1.84.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k1LoW";
|
||||
repo = "tbls";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9tpElkwhGSBGT1wWEzU5vvU6ntlJUYeoSHxVwIzyRYM=";
|
||||
hash = "sha256-c4LxntQhni6dHbjs0QZLWgioU2GT101x4lDC43buiwk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rO437sj5hLQefLkGGGr/wFCIqfeARMcHgip5E88jdCA=";
|
||||
vendorHash = "sha256-6b5JYWjJIbZakrOkB1Xgg4HyBBBecN31iutOMZpLeHc=";
|
||||
|
||||
excludedPackages = [ "scripts/jsonschema" ];
|
||||
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "termius";
|
||||
version = "9.16.0";
|
||||
revision = "217";
|
||||
version = "9.17.1";
|
||||
revision = "218";
|
||||
|
||||
src = fetchurl {
|
||||
# find the latest version with
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
# and the sha512 with
|
||||
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap";
|
||||
hash = "sha512-N/CCY3IRup2RCnLrMRNsM0drmiKnwfSpbNi6RTf/rp2Z95S8AJUV7rjGQzl/Wi9KgmYOdIes708N4Zn2rGl+Lg==";
|
||||
hash = "sha512-KmBBE+0gNq85Kb9ouynXTkC7mcTvYOMeBaW3jjBN1IK2hoCIELrwkypFWfhpPNuo2e3GA30haql0tRZ1LU/JMg==";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
||||
@@ -13,10 +13,10 @@
|
||||
|
||||
let
|
||||
mvnDepsHashes = {
|
||||
"x86_64-linux" = "sha256-M8O1EJtlTm+mVy/qxapRcBWxD14eYL/LLUxP2uOBoM4=";
|
||||
"aarch64-linux" = "sha256-+ewdV9g0MfgiBiRAimkIZp9lrOTKnKnBB1LqhIlOSaQ=";
|
||||
"x86_64-darwin" = "sha256-nUAy2+O8REuq6pOWb8d+/c/YxPxj+XwtCtkaxfihDzc=";
|
||||
"aarch64-darwin" = "sha256-D6adBXtBH1IokUwwA2Z6m+6rJP2xg6BK4rcPyDSgo6o=";
|
||||
"x86_64-linux" = "sha256-a2EIxok7Ov2QQntu3fpagzvMAQcBjKwcd1whDNdCm2E=";
|
||||
"aarch64-linux" = "sha256-TUJmlnFJeYY4Pzrmd+9uKb07Tq7HYd4EnAXkbgGCFDk=";
|
||||
"x86_64-darwin" = "sha256-OTctUd4lsH6Z6H7rDYbyAcrBmzpSzFELjPBRN8zUyhY=";
|
||||
"aarch64-darwin" = "sha256-0tNFHEaxAEqrZTTrGCIX53K9MczkqIuDABD/bB6R1KU=";
|
||||
};
|
||||
|
||||
knownMvnDepsHash =
|
||||
@@ -25,13 +25,13 @@ let
|
||||
in
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "tika";
|
||||
version = "2.9.2";
|
||||
version = "2.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "tika";
|
||||
rev = version;
|
||||
hash = "sha256-4pSQcLDKgIcU+YypJ/ywdthi6tI1852fGVOCREzUFH0=";
|
||||
tag = version;
|
||||
hash = "sha256-nuiE+MWJNA4PLprAC0vDBadk34TFsVEDBcCZct1XRxo=";
|
||||
};
|
||||
|
||||
buildOffline = true;
|
||||
@@ -79,7 +79,7 @@ maven.buildMavenPackage rec {
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/apache/tika/blob/${src.rev}/CHANGES.txt";
|
||||
description = "A toolkit for extracting metadata and text from over a thousand different file types";
|
||||
description = "Toolkit for extracting metadata and text from over a thousand different file types";
|
||||
longDescription = ''
|
||||
The Apache Tika™ toolkit detects and extracts metadata and text
|
||||
from over a thousand different file types (such as PPT, XLS, and PDF).
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
diff --git a/FindMagic_EP.cmake b/FindMagic_EP.cmake
|
||||
--- a/cmake/Modules/FindMagic_EP.cmake
|
||||
+++ b/cmake/Modules/FindMagic_EP.cmake
|
||||
@@ -126,9 +126,7 @@ if(NOT TILEDB_LIBMAGIC_EP_BUILT)
|
||||
# that was modified by tiledb to also build with cmake for nix
|
||||
ExternalProject_Add(ep_magic
|
||||
PREFIX "externals"
|
||||
- GIT_REPOSITORY "https://github.com/TileDB-Inc/file-windows.git"
|
||||
- GIT_TAG "5.38.2.tiledb"
|
||||
- GIT_SUBMODULES_RECURSE TRUE
|
||||
+ DOWNLOAD_COMMAND true
|
||||
UPDATE_COMMAND ""
|
||||
CMAKE_ARGS
|
||||
-DCMAKE_INSTALL_PREFIX=${TILEDB_EP_INSTALL_PREFIX}
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
|
||||
cmake,
|
||||
zlib,
|
||||
lz4,
|
||||
@@ -16,70 +15,56 @@
|
||||
clang-tools,
|
||||
catch2_3,
|
||||
python3,
|
||||
gtest,
|
||||
doxygen,
|
||||
fixDarwinDylibNames,
|
||||
gtest,
|
||||
rapidcheck,
|
||||
libpng,
|
||||
file,
|
||||
runCommand,
|
||||
catch2,
|
||||
useAVX2 ? stdenv.hostPlatform.avx2Support,
|
||||
}:
|
||||
|
||||
let
|
||||
# pre-fetch ExternalProject from cmake/Modules/FindMagic_EP.cmake
|
||||
ep-file-windows = fetchFromGitHub {
|
||||
owner = "TileDB-Inc";
|
||||
repo = "file-windows";
|
||||
rev = "5.38.2.tiledb";
|
||||
hash = "sha256-TFn30VCuWZr252VN1T5NNCZe2VEN3xQSomS7XxxKGF8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
rapidcheck' = runCommand "rapidcheck" { } ''
|
||||
cp -r ${rapidcheck.out} $out
|
||||
chmod -R +w $out
|
||||
cp -r ${rapidcheck.dev}/* $out
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tiledb";
|
||||
version = "2.18.2";
|
||||
version = "2.27.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TileDB-Inc";
|
||||
repo = "TileDB";
|
||||
rev = version;
|
||||
hash = "sha256-uLiXhigYz3v7NgY38twot3sBHxZS5QCrOiPfME4wWzE=";
|
||||
tag = version;
|
||||
hash = "sha256-zk4jkXJMh6wpuEKaCvuKUDod+F8B/6W5Lw8gwelcPEM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./FindMagic_EP.cmake.patch
|
||||
];
|
||||
# libcxx (as of llvm-19) does not yet support `stop_token` and `jthread`
|
||||
# without the -fexperimental-library flag. Tiledb adds its own
|
||||
# implementations in the std namespace which conflict with libcxx. This
|
||||
# test can be re-enabled once libcxx supports stop_token and jthread.
|
||||
postPatch = lib.optionalString (stdenv.cc.libcxx != null) ''
|
||||
truncate -s0 tiledb/stdx/test/CMakeLists.txt
|
||||
'';
|
||||
|
||||
postPatch =
|
||||
''
|
||||
# copy pre-fetched external project to directory where it is expected to be
|
||||
mkdir -p build/externals/src
|
||||
cp -a ${ep-file-windows} build/externals/src/ep_magic
|
||||
chmod -R u+w build/externals/src/ep_magic
|
||||
|
||||
# add openssl on path
|
||||
sed -i '49i list(APPEND OPENSSL_PATHS "${openssl.dev}" "${openssl.out}")' \
|
||||
cmake/Modules/FindOpenSSL_EP.cmake
|
||||
''
|
||||
# libcxx (as of llvm-19) does not yet support `stop_token` and `jthread`
|
||||
# without the -fexperimental-library flag. Tiledb adds its own
|
||||
# implementations in the std namespace which conflict with libcxx. This
|
||||
# test can be re-enabled once libcxx supports stop_token and jthread.
|
||||
+ lib.optionalString (stdenv.cc.libcxx != null) ''
|
||||
truncate -s0 tiledb/stdx/test/CMakeLists.txt
|
||||
'';
|
||||
|
||||
# upstream will hopefully fix this in some newer release
|
||||
env.CXXFLAGS = "-include random";
|
||||
env.TILEDB_DISABLE_AUTO_VCPKG = "1";
|
||||
|
||||
# (bundled) blosc headers have a warning on some archs that it will be using
|
||||
# unaccelerated routines.
|
||||
cmakeFlags = [
|
||||
"-DTILEDB_VCPKG=OFF"
|
||||
"-DTILEDB_WEBP=OFF"
|
||||
"-DTILEDB_WERROR=OFF"
|
||||
# https://github.com/NixOS/nixpkgs/issues/144170
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
] ++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE";
|
||||
|
||||
nativeBuildInputs = [
|
||||
ep-file-windows
|
||||
catch2_3
|
||||
clang-tools
|
||||
cmake
|
||||
@@ -87,10 +72,6 @@ stdenv.mkDerivation rec {
|
||||
doxygen
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
|
||||
nativeCheckInputs = [
|
||||
gtest
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
lz4
|
||||
@@ -101,20 +82,34 @@ stdenv.mkDerivation rec {
|
||||
openssl
|
||||
boost
|
||||
libpqxx
|
||||
libpng
|
||||
file
|
||||
rapidcheck'
|
||||
catch2
|
||||
];
|
||||
|
||||
# fatal error: catch.hpp: No such file or directory
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = [
|
||||
gtest
|
||||
catch2
|
||||
];
|
||||
|
||||
# test commands taken from
|
||||
# https://github.com/TileDB-Inc/TileDB/blob/dev/.github/workflows/unit-test-runs.yml
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
make -C tiledb tests -j$NIX_BUILD_CORES
|
||||
make -C tiledb test ARGS="-R '^unit_'" -R "test_assert"
|
||||
make -C tiledb test ARGS="-R 'test_ci_asserts'"
|
||||
|
||||
pushd ..
|
||||
cmake --build build --target tests
|
||||
ctest --test-dir build -R '(^unit_|test_assert)' --no-tests=error
|
||||
ctest --test-dir build -R 'test_ci_asserts'
|
||||
popd
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
installTargets = [
|
||||
"install-tiledb"
|
||||
"doc"
|
||||
@@ -124,11 +119,11 @@ stdenv.mkDerivation rec {
|
||||
install_name_tool -add_rpath ${tbb}/lib $out/lib/libtiledb.dylib
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "TileDB allows you to manage the massive dense and sparse multi-dimensional array data";
|
||||
homepage = "https://github.com/TileDB-Inc/TileDB";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ rakesh4g ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ rakesh4g ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tonelib-jam";
|
||||
version = "4.7.8";
|
||||
version = "4.8.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://tonelib.net/download/221222/ToneLib-Jam-amd64.deb";
|
||||
sha256 = "sha256-c6At2lRPngQPpE7O+VY/Hsfw+QfIb3COIuHfbqqIEuM=";
|
||||
url = "https://tonelib.vip/download/24-10-24/ToneLib-Jam-amd64.deb";
|
||||
hash = "sha256-qBCEaV9uw6HHJYK+8AK+JYQK375cY0Ae3gxiQ0+sAg4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -45,19 +45,22 @@ stdenv.mkDerivation rec {
|
||||
libjack2
|
||||
];
|
||||
|
||||
unpackCmd = "dpkg -x $curSrc source";
|
||||
|
||||
installPhase = ''
|
||||
mv usr $out
|
||||
substituteInPlace $out/share/applications/ToneLib-Jam.desktop --replace /usr/ $out/
|
||||
runHook preInstall
|
||||
|
||||
cp -r usr $out
|
||||
substituteInPlace $out/share/applications/ToneLib-Jam.desktop \
|
||||
--replace-fail "/usr/" "$out/"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "ToneLib Jam – the learning and practice software for guitar players";
|
||||
homepage = "https://tonelib.net/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ dan4ik605743 ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ dan4ik605743 ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "ToneLib-Jam";
|
||||
};
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "turso-cli";
|
||||
version = "0.99.1";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tursodatabase";
|
||||
repo = "turso-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4gcG23Tdkl+UO4MQ7A9s8GweOlwVSDHAY+WNVyBvNqE=";
|
||||
hash = "sha256-94av3EW96qApCYWpo08QjrxoneuqGrE98aE7YXQEaT4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tBO21IgUczwMgrEyV7scV3YTY898lYHASaLeXqvBopU=";
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "typstyle";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Enter-tainer";
|
||||
repo = "typstyle";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dYhdrxyyndGhJID0WKwvW6KFQ3ubC917UG9rhDnrAfM=";
|
||||
hash = "sha256-kCBM2A2MihzB3tafn6+uHYjj85GAlAxMtheXAY+RksM=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Eb+qN7hBECESlTElN0uQtOg4uyuaWQw3ikFb8po+ubQ=";
|
||||
cargoHash = "sha256-K0N6Sq/YeM/Hi/BbJZMpQp+bEwttbJ/nVCWx5gxs1qQ=";
|
||||
|
||||
# Disabling tests requiring network access
|
||||
checkFlags = [
|
||||
|
||||
@@ -5,51 +5,54 @@
|
||||
makeWrapper,
|
||||
libzen,
|
||||
libmediainfo,
|
||||
jre8,
|
||||
jdk17,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ums";
|
||||
version = "10.12.0";
|
||||
version = "13.2.1";
|
||||
|
||||
src =
|
||||
{
|
||||
i686-linux = fetchurl {
|
||||
url =
|
||||
"mirror://sourceforge/project/unimediaserver/${version}/"
|
||||
+ lib.toUpper "${pname}-${version}"
|
||||
+ "-x86.tgz";
|
||||
sha256 = "0j3d5zcwwswlcr2vicmvnnr7n8cg3q46svz0mbmga4j3da4473i6";
|
||||
let
|
||||
selectSystem =
|
||||
attrs:
|
||||
attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
arch = selectSystem {
|
||||
x86_64-linux = "x86_64";
|
||||
aarch64-linux = "arm64";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url =
|
||||
"mirror://sourceforge/project/unimediaserver/${version}/"
|
||||
+ lib.toUpper "${pname}-${version}"
|
||||
+ "-x86_64.tgz";
|
||||
sha256 = "06f96vkf593aasyfw458fa4x3rnai2k83vpgzc83hlwr0rw70qfn";
|
||||
in
|
||||
fetchurl {
|
||||
url = "mirror://sourceforge/project/unimediaserver/${version}/UMS-${version}-${arch}.tgz";
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-MGi5S0jA9WVh7PuNei5hInUVZLcypJu8izwWJpDi42s=";
|
||||
aarch64-linux = "sha256-9x1M1rZxwg65RdMmxQ2geeF0yXrukQ3dQPXKfQ2GRIw=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
cp -a . $out/
|
||||
runHook preInstall
|
||||
|
||||
cp -a . $out
|
||||
mkdir $out/bin
|
||||
mv $out/documentation /$out/doc
|
||||
|
||||
# ums >= 9.0.0 ships its own JRE in the package. if we remove it, the `UMS.sh`
|
||||
# script will correctly fall back to the JRE specified by JAVA_HOME
|
||||
rm -rf $out/jre8
|
||||
rm -rf $out/jre17
|
||||
|
||||
makeWrapper "$out/UMS.sh" "$out/bin/ums" \
|
||||
--prefix LD_LIBRARY_PATH ":" "${
|
||||
makeWrapper $out/UMS.sh $out/bin/ums \
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
libzen
|
||||
libmediainfo
|
||||
]
|
||||
}" \
|
||||
--set JAVA_HOME "${jre8}"
|
||||
} \
|
||||
--set JAVA_HOME ${jdk17}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vendir";
|
||||
version = "0.43.0";
|
||||
version = "0.43.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "carvel-vendir";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QiuSFi/su4cQVee6mUI/EKCrybe6cviqQuGIugWTJOc=";
|
||||
sha256 = "sha256-VIP1NkSZMoTZfvl6xAAbs0sL9rBc6FDaZHgOmRViStY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -3,17 +3,18 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vexctl";
|
||||
version = "0.1.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chainguard-dev";
|
||||
repo = "vex";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-f5UVX6x4DwjlcgMAv0GuKBH9UUzFhQ8pW8l+9pc7RQ4=";
|
||||
owner = "openvex";
|
||||
repo = "vexctl";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rJK9OTaEF0PU12m7voMUHPHI2/Je7wh6w2Zr1Ug8+1w=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -25,7 +26,8 @@ buildGoModule rec {
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorHash = "sha256-GZIssLLPg2dF7xsvsYn2MKYunMCpGbNA+6qCYBW++vk=";
|
||||
|
||||
vendorHash = "sha256-YVMg9tjwJmrqxB2GmVuLkzsGXGlpp5gmZZTmv+PGWPc=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -42,10 +44,6 @@ buildGoModule rec {
|
||||
ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)"
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
mv $GOPATH/bin/vex{,ctl}
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd vexctl \
|
||||
--bash <($out/bin/vexctl completion bash) \
|
||||
@@ -54,18 +52,16 @@ buildGoModule rec {
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/vexctl --help
|
||||
$out/bin/vexctl version 2>&1 | grep "v${version}"
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/chainguard-dev/vex/";
|
||||
description = "Tool to attest VEX impact statements";
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
versionCheckProgramArg = "version";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/openvex/vexctl";
|
||||
description = "Tool to create, transform and attest VEX metadata";
|
||||
mainProgram = "vexctl";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jk ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ jk ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
apple-sdk_14,
|
||||
apple-sdk_15,
|
||||
buildGoModule,
|
||||
darwin,
|
||||
fetchFromGitHub,
|
||||
@@ -12,23 +12,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vfkit";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crc-org";
|
||||
repo = "vfkit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uBFL3iZLpGcVUSgZSoq8FI87CDAr3NI8uu+u5UsrZCc=";
|
||||
hash = "sha256-+ds9GIa3q2ck4D3sjUHz7e9w00XgD6/jq4L8QkBpCJg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/crc-org/vfkit/pull/276/commits/97ad151b208593d2fa0227ef5117f1ff2667b562.patch?full_index=1";
|
||||
hash = "sha256-rcKLMXk5B2JoDpsNH4+aBmOidh9HtVQeYhx5q1raFJU=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-+5QZcoI+/98hyd87NV6uX/VZqd5z38fk7K7RibX/9vw=";
|
||||
vendorHash = "sha256-YvrcEPyAvuECUVgQoHKveMoFOeh4M3k5ngsP2w46+vY=";
|
||||
|
||||
subPackages = [ "cmd/vfkit" ];
|
||||
|
||||
@@ -43,7 +36,7 @@ buildGoModule rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
apple-sdk_14
|
||||
apple-sdk_15
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -12,15 +12,15 @@
|
||||
withVictoriaLogs ? true, # logs server
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "VictoriaMetrics";
|
||||
version = "1.112.0";
|
||||
version = "1.113.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VictoriaMetrics";
|
||||
repo = "VictoriaMetrics";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9/478WcGtD7ugpumNMBsyefCh9vNUTllBjjk5OsmiU8=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yjK81kT2EW8Vqykl2xelCQg54ancVfSHriG08z7tXWU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@@ -60,20 +60,20 @@ buildGoModule rec {
|
||||
|
||||
# Increase timeouts in tests to prevent failure on heavily loaded builders
|
||||
substituteInPlace lib/storage/storage_test.go \
|
||||
--replace "time.After(10 " "time.After(120 " \
|
||||
--replace "time.NewTimer(30 " "time.NewTimer(120 " \
|
||||
--replace "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \
|
||||
--replace-fail "time.After(10 " "time.After(120 " \
|
||||
--replace-fail "time.NewTimer(30 " "time.NewTimer(120 " \
|
||||
--replace-fail "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}"
|
||||
"-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# `lib/querytracer/tracer_test.go` expects `buildinfo.Version` to be unset
|
||||
export ldflags=''${ldflags//=${version}/=}
|
||||
export ldflags=''${ldflags//=${finalAttrs.version}/=}
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
@@ -82,18 +82,18 @@ buildGoModule rec {
|
||||
inherit (nixosTests) victoriametrics;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://victoriametrics.com/";
|
||||
description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
yorickvp
|
||||
ivan
|
||||
leona
|
||||
shawn8901
|
||||
ryan4yin
|
||||
];
|
||||
changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}";
|
||||
changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${finalAttrs.version}";
|
||||
mainProgram = "victoria-metrics";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
libsoup_2_4,
|
||||
webkitgtk_4_0,
|
||||
webkitgtk_4_1,
|
||||
gtk3,
|
||||
glib-networking,
|
||||
gsettings-desktop-schemas,
|
||||
@@ -13,23 +13,24 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vimb";
|
||||
version = "3.6.0";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fanglingsu";
|
||||
repo = "vimb";
|
||||
rev = version;
|
||||
sha256 = "sha256-Eq4riJSznKpkW9JJDnTCLxZ9oMJTmWkIoGphOiCcSAg=";
|
||||
tag = version;
|
||||
hash = "sha256-NW9B/hybSOaojKIubaxiQ+Nd5f/D4XKxPl9vUyFoX/k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook3
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libsoup_2_4
|
||||
webkitgtk_4_0
|
||||
webkitgtk_4_1
|
||||
glib-networking
|
||||
gsettings-desktop-schemas
|
||||
];
|
||||
@@ -53,6 +54,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://fanglingsu.github.io/vimb/";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ ];
|
||||
platforms = with lib.platforms; linux;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,23 +14,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vipsdisp";
|
||||
version = "2.6.3";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcupitt";
|
||||
repo = "vipsdisp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-a8wqDTVZnhqk0zHAuGvwjtJTM0irN2tkRIjx6sIteV0=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3HciPvem8ySIW/H7d5M71lQV9mBcT6ZlpF3yo8BXsPE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes build with clang
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/jcupitt/vipsdisp/commit/e95888153838d6e58d5b9fd7c08e3d03db38e8b1.patch?full_index=1";
|
||||
hash = "sha256-MtQ9AMvl2MkHSLyOuwFVbmNiCEoPPnrK3EoUdvqEtOo=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x ./meson_post_install.py
|
||||
patchShebangs ./meson_post_install.py
|
||||
@@ -52,12 +44,12 @@ stdenv.mkDerivation rec {
|
||||
# No tests implemented.
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/jcupitt/vipsdisp";
|
||||
description = "Tiny image viewer with libvips";
|
||||
license = licenses.mit;
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "vipsdisp";
|
||||
maintainers = with maintainers; [ foo-dogsquared ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with lib.maintainers; [ foo-dogsquared ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
unzip,
|
||||
autoPatchelfHook,
|
||||
fontconfig,
|
||||
freetype,
|
||||
@@ -22,18 +23,18 @@
|
||||
path = "~";
|
||||
},
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "windterm";
|
||||
version = "2.6.1";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/kingToolbox/WindTerm/releases/download/2.6.0/WindTerm_${version}_Linux_Portable_x86_64.tar.gz";
|
||||
hash = "sha256-JwTsfUkESl2vUx48TanKYAOVWw6q4xGY+i0PrN9GfpA=";
|
||||
url = "https://github.com/kingToolbox/WindTerm/releases/download/${finalAttrs.version}/WindTerm_${finalAttrs.version}_Linux_Portable_x86_64.zip";
|
||||
hash = "sha256-d5dpfutgI5AgUS4rVJaVpgw5s/0B/n67BH/VCiiJEDw=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
unzip
|
||||
makeWrapper
|
||||
autoPatchelfHook
|
||||
];
|
||||
@@ -41,19 +42,19 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
xorg.libxcb
|
||||
xorg.xcbutil
|
||||
xorg.libXtst
|
||||
xorg.xcbutilimage
|
||||
xorg.xcbutilkeysyms
|
||||
xorg.xcbutilrenderutil
|
||||
libsForQt5.qt5.qtbase
|
||||
libsForQt5.qt5.qtmultimedia
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtmultimedia
|
||||
gst_all_1.gst-plugins-base
|
||||
fontconfig
|
||||
freetype
|
||||
libGL
|
||||
glib
|
||||
alsa-lib
|
||||
pulseaudio
|
||||
gst_all_1.gst-plugins-base
|
||||
xorg.libXtst
|
||||
gtk3
|
||||
atk
|
||||
pango
|
||||
@@ -62,33 +63,32 @@ stdenv.mkDerivation rec {
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -r ./* $out/
|
||||
find $out -type d -exec chmod 755 {} \;
|
||||
find $out -type f -exec chmod 644 {} \;
|
||||
find $out -type f -executable -exec chmod 755 {} \;
|
||||
chmod 755 $out/WindTerm
|
||||
mkdir -p $out/bin/ $out/share/applications/ $out/share/pixmaps/ $out/share/licenses/${pname}/
|
||||
cat > $out/profiles.config <<EOF
|
||||
mkdir -p $out/app $out/share/applications $out/share/pixmaps $out/share/licenses/windterm
|
||||
cp --recursive --no-preserve=mode . $out/app/windterm
|
||||
cat > $out/app/windterm/profiles.config <<EOF
|
||||
${builtins.toJSON profiles}
|
||||
EOF
|
||||
mv $out/license.txt $out/share/licenses/${pname}/license.txt
|
||||
mv $out/windterm.desktop $out/share/applications/windterm.desktop
|
||||
mv $out/windterm.png $out/share/pixmaps/windterm.png
|
||||
substituteInPlace $out/share/applications/windterm.desktop \
|
||||
--replace-fail "Exec=/usr/bin/windterm" "Exec=windterm"
|
||||
install -Dm644 $out/app/windterm/license.txt $out/share/licenses/windterm/license.txt
|
||||
install -Dm644 $out/app/windterm/windterm.png $out/share/pixmaps/windterm.png
|
||||
substituteInPlace $out/app/windterm/windterm.desktop \
|
||||
--replace-fail "/usr/bin/" ""
|
||||
install -Dm644 $out/app/windterm/windterm.desktop $out/share/applications/windterm.desktop
|
||||
chmod +x $out/app/windterm/WindTerm
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapper $out/WindTerm $out/bin/windterm \
|
||||
--prefix QT_PLUGIN_PATH : "$out/lib" \
|
||||
postFixup = ''
|
||||
mkdir $out/bin
|
||||
makeWrapper $out/app/windterm/WindTerm $out/bin/windterm \
|
||||
--prefix QT_PLUGIN_PATH : $out/app/windterm/lib \
|
||||
''${qtWrapperArgs[@]}
|
||||
'';
|
||||
|
||||
@@ -101,4 +101,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,211 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
flutter327,
|
||||
keybinder3,
|
||||
nodejs,
|
||||
pnpm_9,
|
||||
python3Packages,
|
||||
writableTmpDirAsHomeHook,
|
||||
buildGoModule,
|
||||
pkg-config,
|
||||
autoPatchelfHook,
|
||||
xorg,
|
||||
libxkbcommon,
|
||||
libayatana-appindicator,
|
||||
gtk3,
|
||||
desktop-file-utils,
|
||||
xdg-utils,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.0.0-beta.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Wox-launcher";
|
||||
repo = "Wox";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ghrvBOTR2v7i50OrwfwbwwFFF4uBQuEPxhXimdcFUJI=";
|
||||
};
|
||||
|
||||
metaCommon = {
|
||||
description = "Cross-platform launcher that simply works";
|
||||
homepage = "https://github.com/Wox-launcher/Wox";
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
maintainers = with lib.maintainers; [ emaryn ];
|
||||
};
|
||||
|
||||
ui-flutter = flutter327.buildFlutterApplication {
|
||||
pname = "wox-ui-flutter";
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/wox.ui.flutter/wox";
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
gitHashes.window_manager = "sha256-OGVrby09QsCvXnkLdEcCoZBO2z/LXY4xFBVdRHnvKEQ=";
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [ keybinder3 ];
|
||||
|
||||
meta = metaCommon // {
|
||||
mainProgram = "wox";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
};
|
||||
|
||||
plugin-host-nodejs = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wox-plugin-host-nodejs";
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/wox.plugin.host.nodejs";
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpm_9.configHook
|
||||
];
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
version
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-4Xj6doUHFoZSwel+cPnr2m3rfvlxNmQCppm5gXGIEtU=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pnpm run build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 dist/index.js $out/node-host.js
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = metaCommon;
|
||||
});
|
||||
|
||||
plugin-python = python3Packages.buildPythonApplication rec {
|
||||
pname = "wox-plugin";
|
||||
inherit version src;
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/wox.plugin.python";
|
||||
|
||||
build-system = with python3Packages; [ hatchling ];
|
||||
|
||||
meta = metaCommon;
|
||||
};
|
||||
|
||||
plugin-host-python = python3Packages.buildPythonApplication rec {
|
||||
pname = "wox-plugin-host-python";
|
||||
inherit version src;
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/wox.plugin.host.python";
|
||||
|
||||
build-system = with python3Packages; [ hatchling ];
|
||||
|
||||
nativeBuildInputs = [ writableTmpDirAsHomeHook ];
|
||||
|
||||
buildInputs = with python3Packages; [
|
||||
loguru
|
||||
websockets
|
||||
plugin-python
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
loguru
|
||||
websockets
|
||||
plugin-python
|
||||
];
|
||||
|
||||
meta = metaCommon // {
|
||||
mainProgram = "run";
|
||||
};
|
||||
};
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "wox";
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/wox.core";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace plugin/host/host_python.go \
|
||||
--replace-fail 'n.findPythonPath(ctx), path.Join(util.GetLocation().GetHostDirectory(), "python-host.pyz")' '"env", "${plugin-host-python}/bin/run"'
|
||||
substituteInPlace plugin/host/host_nodejs.go \
|
||||
--replace-fail "/usr/bin/node" "${lib.getExe nodejs}"
|
||||
substituteInPlace util/deeplink.go \
|
||||
--replace-fail "update-desktop-database" "${desktop-file-utils}/bin/update-desktop-database" \
|
||||
--replace-fail "xdg-mime" "${xdg-utils}/bin/xdg-mime" \
|
||||
--replace-fail "Exec=%s" "Exec=wox"
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-n3lTx1od4EvWdTSe3sIsUStp2qcuSWMqztJZoNLrzQg=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoPatchelfHook
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
xorg.libX11
|
||||
xorg.libXtst
|
||||
libxkbcommon
|
||||
libayatana-appindicator
|
||||
gtk3
|
||||
];
|
||||
|
||||
env.CGO_ENABLED = 1;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X 'wox/util.ProdEnv=true'"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p resource/ui/flutter resource/hosts
|
||||
cp -r ${ui-flutter}/app/${ui-flutter.pname} resource/ui/flutter/wox
|
||||
cp ${plugin-host-nodejs}/node-host.js resource/hosts/node-host.js
|
||||
'';
|
||||
|
||||
# XOpenDisplay failure!
|
||||
# XkbGetKeyboard failed to locate a valid keyboard!
|
||||
doCheck = false;
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "wox";
|
||||
exec = "wox %U";
|
||||
icon = "wox";
|
||||
desktopName = "Wox";
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 ../assets/app.png $out/share/pixmaps/wox.png
|
||||
'';
|
||||
|
||||
meta = metaCommon // {
|
||||
mainProgram = "wox";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,4 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
@@ -10,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wsmancli";
|
||||
version = "2.6.2";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Openwsman";
|
||||
repo = "wsmancli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A2PVhQuKVTZ/nDKyy+vZVBNLB/3xujBYBzUEWcTIYYg=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-pTA5p5+Fuiw2lQaaSKnp/29HMy8NZNTFwP5K/+sJ9OU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -33,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
touch AUTHORS NEWS README
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Openwsman command-line client";
|
||||
longDescription = ''
|
||||
Openwsman provides a command-line tool, wsman, to perform basic
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.5.4.24";
|
||||
version = "0.5.4.25";
|
||||
pname = "xarchiver";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ib";
|
||||
repo = "xarchiver";
|
||||
rev = version;
|
||||
hash = "sha256-OTm53kUZa/65JHRAiN3VWEGWhKwzstNZ1dxwTSPZ04g=";
|
||||
hash = "sha256-pLNAgyYqujk+xvHZjq98kzTG47G4C2JvSTDoS7UTNeo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "xdgmenumaker";
|
||||
version = "2.3";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gapan";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "uSSKiceHurk+qGVnaYa4uJEuq9FQROdhcotQxPBgPIs=";
|
||||
sha256 = "rh1rRgbw8uqii4oN3XXNNKsWam1d8TY0qGceHERlG1k=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ felixsinger ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "xfel";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,38 +1,112 @@
|
||||
{
|
||||
appimageTools,
|
||||
fetchurl,
|
||||
lib,
|
||||
rustPlatform,
|
||||
cargo-tauri,
|
||||
npmHooks,
|
||||
fetchFromGitHub,
|
||||
fetchNpmDeps,
|
||||
pkg-config,
|
||||
python3,
|
||||
nodejs,
|
||||
webkitgtk_4_1,
|
||||
glib,
|
||||
gtk3,
|
||||
libsoup_2_4,
|
||||
openssl,
|
||||
pango,
|
||||
cairo,
|
||||
pixman,
|
||||
protobuf,
|
||||
perl,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
}:
|
||||
appimageTools.wrapType2 rec {
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "yaak";
|
||||
version = "2025.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mountain-loop/yaak/releases/download/v${version}/${pname}_${version}_amd64.AppImage";
|
||||
hash = "sha256-daUB2BW0y+6TYL6V591Yx/9JtgLdyuKEhCPjfG5L4WQ=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mountain-loop";
|
||||
repo = "yaak";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gD6gp7Qtf162zpRY0b3+g98GSH2aY07s2Auv4+lmbXQ=";
|
||||
};
|
||||
|
||||
contents = appimageTools.extract {
|
||||
inherit pname version src;
|
||||
postExtract = ''
|
||||
substituteInPlace $out/yaak.desktop --replace-fail 'yaak-app' 'yaak'
|
||||
'';
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-4D7ETUOLixpFB4luqQlwkGR/C6Ke6+ZmPg3dKKkrw7c=";
|
||||
};
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -Dm444 ${contents}/yaak.desktop $out/share/applications/yaak.desktop
|
||||
for size in "32x32" "128x128" "256x256@2"; do
|
||||
install -Dm444 ${contents}/usr/share/icons/hicolor/$size/apps/yaak-app.png $out/share/icons/hicolor/$size/apps/yaak.png
|
||||
done
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
cargoHash = "sha256-YxOSfSyn+gUsw0HeKrkXZg568X9CAY1UWKnGHHWCC78=";
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
npmHooks.npmConfigHook
|
||||
pkg-config
|
||||
nodejs
|
||||
python3
|
||||
protobuf
|
||||
perl
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
openssl
|
||||
libsoup_2_4
|
||||
webkitgtk_4_1
|
||||
pango
|
||||
cairo
|
||||
pixman
|
||||
];
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src-tauri/tauri.conf.json \
|
||||
--replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false'
|
||||
substituteInPlace package.json \
|
||||
--replace-fail '"bootstrap:vendor-node": "node scripts/vendor-node.cjs",' "" \
|
||||
--replace-fail '"bootstrap:vendor-protoc": "node scripts/vendor-protoc.cjs",' ""
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p src-tauri/vendored/node
|
||||
ln -s ${nodejs}/bin/node src-tauri/vendored/node/yaaknode-x86_64-unknown-linux-gnu
|
||||
mkdir -p src-tauri/vendored/protoc
|
||||
ln -s ${protobuf}/bin/protoc src-tauri/vendored/protoc/yaakprotoc-x86_64-unknown-linux-gnu
|
||||
ln -s ${protobuf}/include src-tauri/vendored/protoc/include
|
||||
'';
|
||||
|
||||
# Permission denied (os error 13)
|
||||
# write to src-tauri/vendored/protoc/include
|
||||
doCheck = false;
|
||||
|
||||
preInstall = "pushd src-tauri";
|
||||
|
||||
postInstall = "popd";
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/yaak-app \
|
||||
--inherit-argv0 \
|
||||
--set-default WEBKIT_DISABLE_DMABUF_RENDERER 1
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Desktop API client for organizing and executing REST, GraphQL, and gRPC requests";
|
||||
homepage = "https://yaak.app/";
|
||||
changelog = "https://github.com/mountain-loop/yaak/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ redyf ];
|
||||
mainProgram = "yaak";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "ytt";
|
||||
version = "0.51.1";
|
||||
version = "0.51.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carvel-dev";
|
||||
repo = "ytt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MVkgZDHFkjtOuBDm/VjUU2QXMR7HdcNJwqD4mMBHt48=";
|
||||
sha256 = "sha256-vFD0CKEVbaOiETSsDQeBJV1flekvS893wPYc6iHxxRE=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -11,17 +11,26 @@ stdenv.mkDerivation rec {
|
||||
inherit version src;
|
||||
inherit (src) passthru;
|
||||
|
||||
prePatch = ''
|
||||
if [ -d printing ]; then pushd printing; fi
|
||||
'';
|
||||
|
||||
patches = [
|
||||
(replaceVars ./printing.patch {
|
||||
inherit pdfium-binaries;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
popd || true
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
cp -a ./* $out/
|
||||
cp -r . $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user