Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
+1
-1
@@ -1416,7 +1416,7 @@ lib.mapAttrs mkLicense (
|
||||
|
||||
tsl = {
|
||||
shortName = "TSL";
|
||||
fullName = "Timescale License Agreegment";
|
||||
fullName = "Timescale License Agreement";
|
||||
url = "https://github.com/timescale/timescaledb/blob/main/tsl/LICENSE-TIMESCALE";
|
||||
free = false;
|
||||
};
|
||||
|
||||
@@ -5799,12 +5799,6 @@
|
||||
name = "Daniil Berendeev";
|
||||
keys = [ { fingerprint = "60D7 0EE0 3BD4 A415 B255 1938 6556 0668 006B 4906"; } ];
|
||||
};
|
||||
danbst = {
|
||||
email = "abcz2.uprola@gmail.com";
|
||||
github = "danbst";
|
||||
githubId = 743057;
|
||||
name = "Danylo Hlynskyi";
|
||||
};
|
||||
danbulant = {
|
||||
name = "Daniel Bulant";
|
||||
email = "danbulant@gmail.com";
|
||||
@@ -25294,6 +25288,11 @@
|
||||
githubId = 20484159;
|
||||
keys = [ { fingerprint = "F246 425A 7650 6F37 0552 BA8D DEA9 C405 09D9 65F5"; } ];
|
||||
};
|
||||
squishykid = {
|
||||
github = "squishykid";
|
||||
githubId = 2177912;
|
||||
name = "squishykid";
|
||||
};
|
||||
srgom = {
|
||||
github = "SRGOM";
|
||||
githubId = 8103619;
|
||||
|
||||
@@ -23,6 +23,8 @@ in
|
||||
services.spotifyd = {
|
||||
enable = lib.mkEnableOption "spotifyd, a Spotify playing daemon";
|
||||
|
||||
package = lib.mkPackageOption pkgs "spotifyd" { };
|
||||
|
||||
config = lib.mkOption {
|
||||
default = "";
|
||||
type = lib.types.lines;
|
||||
@@ -43,6 +45,7 @@ in
|
||||
<https://docs.spotifyd.rs/configuration/index.html#config-file>.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
@@ -64,7 +67,7 @@ in
|
||||
description = "spotifyd, a Spotify playing daemon";
|
||||
environment.SHELL = "/bin/sh";
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}";
|
||||
ExecStart = "${cfg.package}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}";
|
||||
Restart = "always";
|
||||
RestartSec = 12;
|
||||
DynamicUser = true;
|
||||
|
||||
@@ -14,7 +14,6 @@ in
|
||||
{
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [
|
||||
danbst
|
||||
anthonyroussel
|
||||
];
|
||||
};
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
name = "containers-reloadable";
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ danbst ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [
|
||||
mbbx6spp
|
||||
danbst
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "zig.vim";
|
||||
version = "0-unstable-2026-01-24";
|
||||
version = "0-unstable-2026-02-13";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "ziglang";
|
||||
repo = "zig.vim";
|
||||
rev = "2f53c35bee0d64a1d417d47c894a3cbb6663dff4";
|
||||
hash = "sha256-vrtcUAp/YWpZtf6lyg2l0GR62YdHprAb8sAHzZ89F48=";
|
||||
rev = "f65b43b90cbc3e179b3146d2237f503783119ab8";
|
||||
hash = "sha256-4Ssde+vLYn/NnL24sDW6Z+yDN2dWKaOFgrFYm1oVQjg=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
|
||||
@@ -3093,8 +3093,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "compare-folders";
|
||||
publisher = "moshfeu";
|
||||
version = "0.25.3";
|
||||
hash = "sha256-QrSh8/AycC5nKbZ1+E3V/lJu/7Skket8b05yPnZg68s=";
|
||||
version = "0.27.0";
|
||||
hash = "sha256-v4ZIcrYa+5RXSX0OM5atXMcmN/EgAH6qqWS1vksxXpI=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -4340,8 +4340,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "sonarsource";
|
||||
name = "sonarlint-vscode";
|
||||
version = "4.42.0";
|
||||
hash = "sha256-jWw5vbORdi/qW8L4D1qbue8tdeiyof01FzJtcZUKs3Y=";
|
||||
version = "4.43.0";
|
||||
hash = "sha256-cpd8+fbp57l+XYBuDnz95lmKzJ8IUHu937KWHsLXrPk=";
|
||||
};
|
||||
meta.license = lib.licenses.lgpl3Only;
|
||||
};
|
||||
@@ -4788,8 +4788,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "emacs-mcx";
|
||||
publisher = "tuttieee";
|
||||
version = "0.107.1";
|
||||
hash = "sha256-x2WoDoYE4at2G8yuefc5evHRpCiJXh5WTTkNzW454N0=";
|
||||
version = "0.107.2";
|
||||
hash = "sha256-Id8pKACGLtRXas1Tb2dZrw+ZrZvAQLbWcI3Q1gYpXos=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "dosbox-pure";
|
||||
version = "0-unstable-2026-02-05";
|
||||
version = "0-unstable-2026-02-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schellingb";
|
||||
repo = "dosbox-pure";
|
||||
rev = "6fe60a669e8781d738150ad2353b87c1e1de7dd4";
|
||||
hash = "sha256-6hIevmWusjg8Wr9A5ov6RLovirtOIEhHtEYLQ7EHVh0=";
|
||||
rev = "f587236b2d016f4f16d672e9ce2829bdf507bf9b";
|
||||
hash = "sha256-OS6iY8b8pvqkJpDQO9DHRUh7ckjov5t1GZldOR+qg0Y=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
makeWrapper,
|
||||
pkg-config,
|
||||
nixosTests,
|
||||
supportFlags,
|
||||
pnameSuffix ? "",
|
||||
patches,
|
||||
moltenvk,
|
||||
buildScript ? null,
|
||||
configureFlags ? [ ],
|
||||
mainProgram ? "wine",
|
||||
|
||||
# Staging support
|
||||
useStaging ? false,
|
||||
autoconf,
|
||||
@@ -31,6 +31,39 @@
|
||||
perl,
|
||||
python3,
|
||||
gitMinimal,
|
||||
|
||||
# Support flags
|
||||
gettextSupport ? false,
|
||||
fontconfigSupport ? false,
|
||||
alsaSupport ? false,
|
||||
gtkSupport ? false,
|
||||
openglSupport ? false,
|
||||
tlsSupport ? false,
|
||||
gstreamerSupport ? false,
|
||||
cupsSupport ? false,
|
||||
dbusSupport ? false,
|
||||
openclSupport ? false,
|
||||
cairoSupport ? false,
|
||||
odbcSupport ? false,
|
||||
netapiSupport ? false,
|
||||
cursesSupport ? false,
|
||||
vaSupport ? false,
|
||||
pcapSupport ? false,
|
||||
v4lSupport ? false,
|
||||
saneSupport ? false,
|
||||
gphoto2Support ? false,
|
||||
krb5Support ? false,
|
||||
pulseaudioSupport ? false,
|
||||
udevSupport ? false,
|
||||
xineramaSupport ? false,
|
||||
vulkanSupport ? false,
|
||||
sdlSupport ? false,
|
||||
usbSupport ? false,
|
||||
mingwSupport ? stdenv.hostPlatform.isDarwin,
|
||||
waylandSupport ? false,
|
||||
x11Support ? false,
|
||||
ffmpegSupport ? false,
|
||||
embedInstallers ? false,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -47,26 +80,23 @@ let
|
||||
};
|
||||
} ./setup-hook-darwin.sh;
|
||||
|
||||
# Building Wine with these flags isn’t supported on Darwin. Using any of them will result in an evaluation failures
|
||||
# Building Wine with these flags isn't supported on Darwin. Using any of them will result in an evaluation failures
|
||||
# because they will put Darwin in `meta.badPlatforms`.
|
||||
darwinUnsupportedFlags = [
|
||||
"alsaSupport"
|
||||
"cairoSupport"
|
||||
"dbusSupport"
|
||||
"fontconfigSupport"
|
||||
"gtkSupport"
|
||||
"netapiSupport"
|
||||
"pulseaudioSupport"
|
||||
"udevSupport"
|
||||
"v4lSupport"
|
||||
"vaSupport"
|
||||
"waylandSupport"
|
||||
"x11Support"
|
||||
"xineramaSupport"
|
||||
];
|
||||
|
||||
badPlatforms = lib.optional (
|
||||
!supportFlags.mingwSupport || lib.any (flag: supportFlags.${flag}) darwinUnsupportedFlags
|
||||
!mingwSupport
|
||||
|| alsaSupport
|
||||
|| cairoSupport
|
||||
|| dbusSupport
|
||||
|| fontconfigSupport
|
||||
|| gtkSupport
|
||||
|| netapiSupport
|
||||
|| pulseaudioSupport
|
||||
|| udevSupport
|
||||
|| v4lSupport
|
||||
|| vaSupport
|
||||
|| waylandSupport
|
||||
|| x11Support
|
||||
|| xineramaSupport
|
||||
) "x86_64-darwin";
|
||||
|
||||
# Staging patches (from src.staging when useStaging is true)
|
||||
@@ -101,7 +131,6 @@ stdenv.mkDerivation (
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs =
|
||||
with supportFlags;
|
||||
lib.optionals useStaging [
|
||||
autoconf
|
||||
hexdump
|
||||
@@ -134,7 +163,6 @@ stdenv.mkDerivation (
|
||||
)
|
||||
)
|
||||
++ toBuildInputs pkgArches (
|
||||
with supportFlags;
|
||||
pkgs:
|
||||
[
|
||||
pkgs.freetype
|
||||
@@ -242,11 +270,11 @@ stdenv.mkDerivation (
|
||||
|
||||
configureFlags =
|
||||
prevConfigFlags
|
||||
++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ]
|
||||
++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ]
|
||||
++ lib.optionals (
|
||||
(stdenv.hostPlatform.isDarwin && !supportFlags.xineramaSupport) || !supportFlags.x11Support
|
||||
) [ "--without-x" ];
|
||||
++ lib.optionals waylandSupport [ "--with-wayland" ]
|
||||
++ lib.optionals vulkanSupport [ "--with-vulkan" ]
|
||||
++ lib.optionals ((stdenv.hostPlatform.isDarwin && !xineramaSupport) || !x11Support) [
|
||||
"--without-x"
|
||||
];
|
||||
|
||||
# Wine locates a lot of libraries dynamically through dlopen(). Add
|
||||
# them to the RPATH so that the user doesn't have to set them in
|
||||
@@ -255,10 +283,10 @@ stdenv.mkDerivation (
|
||||
map (path: "-rpath " + path) (
|
||||
map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ finalAttrs.buildInputs)
|
||||
# libpulsecommon.so is linked but not found otherwise
|
||||
++ lib.optionals supportFlags.pulseaudioSupport (
|
||||
++ lib.optionals pulseaudioSupport (
|
||||
map (x: "${lib.getLib x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))
|
||||
)
|
||||
++ lib.optionals supportFlags.waylandSupport (
|
||||
++ lib.optionals waylandSupport (
|
||||
map (x: "${lib.getLib x}/share/wayland-protocols") (
|
||||
toBuildInputs pkgArches (pkgs: [ pkgs.wayland-protocols ])
|
||||
)
|
||||
@@ -281,13 +309,13 @@ stdenv.mkDerivation (
|
||||
let
|
||||
links = prefix: pkg: "ln -s ${pkg} $out/${prefix}/${pkg.name}";
|
||||
in
|
||||
lib.optionalString supportFlags.embedInstallers ''
|
||||
lib.optionalString embedInstallers ''
|
||||
mkdir -p $out/share/wine/gecko $out/share/wine/mono/
|
||||
${lib.strings.concatStringsSep "\n" (
|
||||
(map (links "share/wine/gecko") geckos) ++ (map (links "share/wine/mono") monos)
|
||||
)}
|
||||
''
|
||||
+ lib.optionalString supportFlags.gstreamerSupport ''
|
||||
+ lib.optionalString gstreamerSupport ''
|
||||
# Wrapping Wine is tricky.
|
||||
# https://github.com/NixOS/nixpkgs/issues/63170
|
||||
# https://github.com/NixOS/nixpkgs/issues/28486
|
||||
@@ -320,8 +348,8 @@ stdenv.mkDerivation (
|
||||
"bindnow"
|
||||
"stackclashprotection"
|
||||
]
|
||||
++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify"
|
||||
++ lib.optional (supportFlags.mingwSupport) "format";
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin "fortify"
|
||||
++ lib.optional mingwSupport "format";
|
||||
|
||||
passthru = {
|
||||
inherit pkgArches;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
# };
|
||||
# Make additional configurations on demand:
|
||||
# wine.override { wineBuild = "wine32"; wineRelease = "staging"; };
|
||||
{
|
||||
args@{
|
||||
lib,
|
||||
stdenv,
|
||||
callPackage,
|
||||
@@ -50,6 +50,18 @@
|
||||
let
|
||||
sources = callPackage ./sources.nix { };
|
||||
|
||||
supportFlags = lib.filterAttrs (
|
||||
name: _:
|
||||
!builtins.elem name [
|
||||
"lib"
|
||||
"stdenv"
|
||||
"callPackage"
|
||||
"darwin"
|
||||
"wineRelease"
|
||||
"wineBuild"
|
||||
]
|
||||
) args;
|
||||
|
||||
# Map user-facing release names to sources, pname suffix, and staging flag
|
||||
releaseInfo = {
|
||||
stable = {
|
||||
@@ -77,47 +89,7 @@ let
|
||||
};
|
||||
|
||||
baseWine = lib.getAttr wineBuild (
|
||||
callPackage ./packages.nix (
|
||||
releaseInfo.${wineRelease}
|
||||
// {
|
||||
supportFlags = {
|
||||
inherit
|
||||
alsaSupport
|
||||
cairoSupport
|
||||
cupsSupport
|
||||
cursesSupport
|
||||
dbusSupport
|
||||
embedInstallers
|
||||
fontconfigSupport
|
||||
gettextSupport
|
||||
gphoto2Support
|
||||
gstreamerSupport
|
||||
gtkSupport
|
||||
krb5Support
|
||||
mingwSupport
|
||||
netapiSupport
|
||||
odbcSupport
|
||||
openclSupport
|
||||
openglSupport
|
||||
pcapSupport
|
||||
pulseaudioSupport
|
||||
saneSupport
|
||||
sdlSupport
|
||||
tlsSupport
|
||||
udevSupport
|
||||
usbSupport
|
||||
v4lSupport
|
||||
vaSupport
|
||||
vulkanSupport
|
||||
waylandSupport
|
||||
x11Support
|
||||
ffmpegSupport
|
||||
xineramaSupport
|
||||
;
|
||||
};
|
||||
inherit moltenvk;
|
||||
}
|
||||
)
|
||||
callPackage ./packages.nix (releaseInfo.${wineRelease} // supportFlags)
|
||||
);
|
||||
in
|
||||
if wineRelease == "yabridge" then
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
src,
|
||||
pnameSuffix ? "",
|
||||
useStaging ? false,
|
||||
supportFlags,
|
||||
# Staging native build deps
|
||||
autoconf,
|
||||
hexdump,
|
||||
perl,
|
||||
python3,
|
||||
gitMinimal,
|
||||
}:
|
||||
...
|
||||
}@args:
|
||||
|
||||
let
|
||||
inherit (src)
|
||||
@@ -27,118 +27,110 @@ let
|
||||
gecko64
|
||||
mono
|
||||
;
|
||||
|
||||
# Args to pass through to base.nix (support flags, etc.)
|
||||
baseArgs = removeAttrs args [
|
||||
"stdenv_32bit"
|
||||
"lib"
|
||||
"pkgs"
|
||||
"pkgsi686Linux"
|
||||
"pkgsCross"
|
||||
"callPackage"
|
||||
"replaceVars"
|
||||
];
|
||||
in
|
||||
{
|
||||
wine32 = pkgsi686Linux.callPackage ./base.nix {
|
||||
pname = "wine";
|
||||
inherit
|
||||
src
|
||||
version
|
||||
supportFlags
|
||||
patches
|
||||
moltenvk
|
||||
pnameSuffix
|
||||
useStaging
|
||||
wine32 = pkgsi686Linux.callPackage ./base.nix (
|
||||
baseArgs
|
||||
// {
|
||||
pname = "wine";
|
||||
inherit version patches;
|
||||
# Forcing these `nativeBuildInputs` used in the `staging` to come
|
||||
# from ambient `pkgs`, rather than being provided by
|
||||
# `pkgsi686Linux.callPackage` for that platform.
|
||||
autoconf
|
||||
hexdump
|
||||
perl
|
||||
python3
|
||||
gitMinimal
|
||||
;
|
||||
pkgArches = [ pkgsi686Linux ];
|
||||
geckos = [ gecko32 ];
|
||||
mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ];
|
||||
monos = [ mono ];
|
||||
platforms = [
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
};
|
||||
wine64 = callPackage ./base.nix {
|
||||
pname = "wine64";
|
||||
inherit
|
||||
src
|
||||
version
|
||||
supportFlags
|
||||
patches
|
||||
moltenvk
|
||||
pnameSuffix
|
||||
useStaging
|
||||
;
|
||||
pkgArches = [ pkgs ];
|
||||
mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
|
||||
geckos = [ gecko64 ];
|
||||
monos = [ mono ];
|
||||
configureFlags = [ "--enable-win64" ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
];
|
||||
mainProgram = "wine";
|
||||
};
|
||||
wineWow = callPackage ./base.nix {
|
||||
pname = "wine-wow";
|
||||
inherit
|
||||
src
|
||||
version
|
||||
supportFlags
|
||||
patches
|
||||
moltenvk
|
||||
pnameSuffix
|
||||
useStaging
|
||||
;
|
||||
stdenv = stdenv_32bit;
|
||||
pkgArches = [
|
||||
pkgs
|
||||
pkgsi686Linux
|
||||
];
|
||||
geckos = [
|
||||
gecko32
|
||||
gecko64
|
||||
];
|
||||
mingwGccs = with pkgsCross; [
|
||||
mingw32.buildPackages.gcc
|
||||
mingwW64.buildPackages.gcc
|
||||
];
|
||||
monos = [ mono ];
|
||||
buildScript = replaceVars ./builder-wow.sh {
|
||||
# pkgconfig has trouble picking the right architecture
|
||||
pkgconfig64remove = lib.makeSearchPathOutput "dev" "lib/pkgconfig" [
|
||||
pkgs.glib
|
||||
pkgs.gst_all_1.gstreamer
|
||||
inherit
|
||||
autoconf
|
||||
hexdump
|
||||
perl
|
||||
python3
|
||||
gitMinimal
|
||||
;
|
||||
pkgArches = [ pkgsi686Linux ];
|
||||
geckos = [ gecko32 ];
|
||||
mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ];
|
||||
monos = [ mono ];
|
||||
platforms = [
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
};
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "wine";
|
||||
};
|
||||
wineWow64 = callPackage ./base.nix {
|
||||
pname = "wine-wow64";
|
||||
inherit
|
||||
src
|
||||
version
|
||||
patches
|
||||
moltenvk
|
||||
pnameSuffix
|
||||
useStaging
|
||||
;
|
||||
supportFlags = supportFlags // {
|
||||
mingwSupport = true;
|
||||
}; # Required because we request "--enable-archs=x86_64"
|
||||
pkgArches = [ pkgs ];
|
||||
mingwGccs = with pkgsCross; [
|
||||
mingw32.buildPackages.gcc
|
||||
mingwW64.buildPackages.gcc
|
||||
];
|
||||
geckos = [ gecko64 ];
|
||||
monos = [ mono ];
|
||||
configureFlags = [ "--enable-archs=x86_64,i386" ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
];
|
||||
mainProgram = "wine";
|
||||
};
|
||||
}
|
||||
);
|
||||
wine64 = callPackage ./base.nix (
|
||||
baseArgs
|
||||
// {
|
||||
pname = "wine64";
|
||||
inherit version patches;
|
||||
pkgArches = [ pkgs ];
|
||||
mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
|
||||
geckos = [ gecko64 ];
|
||||
monos = [ mono ];
|
||||
configureFlags = [ "--enable-win64" ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
];
|
||||
mainProgram = "wine";
|
||||
}
|
||||
);
|
||||
wineWow = callPackage ./base.nix (
|
||||
baseArgs
|
||||
// {
|
||||
pname = "wine-wow";
|
||||
inherit version patches;
|
||||
stdenv = stdenv_32bit;
|
||||
pkgArches = [
|
||||
pkgs
|
||||
pkgsi686Linux
|
||||
];
|
||||
geckos = [
|
||||
gecko32
|
||||
gecko64
|
||||
];
|
||||
mingwGccs = with pkgsCross; [
|
||||
mingw32.buildPackages.gcc
|
||||
mingwW64.buildPackages.gcc
|
||||
];
|
||||
monos = [ mono ];
|
||||
buildScript = replaceVars ./builder-wow.sh {
|
||||
# pkgconfig has trouble picking the right architecture
|
||||
pkgconfig64remove = lib.makeSearchPathOutput "dev" "lib/pkgconfig" [
|
||||
pkgs.glib
|
||||
pkgs.gst_all_1.gstreamer
|
||||
];
|
||||
};
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "wine";
|
||||
}
|
||||
);
|
||||
wineWow64 = callPackage ./base.nix (
|
||||
baseArgs
|
||||
// {
|
||||
pname = "wine-wow64";
|
||||
inherit version patches;
|
||||
mingwSupport = true; # Required because we request "--enable-archs=x86_64"
|
||||
pkgArches = [ pkgs ];
|
||||
mingwGccs = with pkgsCross; [
|
||||
mingw32.buildPackages.gcc
|
||||
mingwW64.buildPackages.gcc
|
||||
];
|
||||
geckos = [ gecko64 ];
|
||||
monos = [ mono ];
|
||||
configureFlags = [ "--enable-archs=x86_64,i386" ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
];
|
||||
mainProgram = "wine";
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -63,14 +63,14 @@
|
||||
"vendorHash": "sha256-AO6reoqxDcPAMXKlqjJLGmhsgFrekaQXjMPm9fxhpFA="
|
||||
},
|
||||
"argoproj-labs_argocd": {
|
||||
"hash": "sha256-xIEl9SsiwJp3X7hyVPE/Z9qHGTL9ZotvzIz7Zx5bdEc=",
|
||||
"hash": "sha256-2QatWxaR5lO4+0RxUMOQjyLp8XG6O0vwCYc8jHKL+48=",
|
||||
"homepage": "https://registry.terraform.io/providers/argoproj-labs/argocd",
|
||||
"owner": "argoproj-labs",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-argocd",
|
||||
"rev": "v7.12.5",
|
||||
"rev": "v7.13.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-gVzj5x95MNgCbxwqiqakrUnhF/x+vXnAurv4pUt8kV4="
|
||||
"vendorHash": "sha256-OBXAl3MRAtnYYATHD0UWEuB1dJozG7al9csGYLClaYw="
|
||||
},
|
||||
"auth0_auth0": {
|
||||
"hash": "sha256-d93MvkFn2+slFh2yvllcwthVTY15ezLn+q8Jm3MPQ+0=",
|
||||
@@ -652,13 +652,13 @@
|
||||
"vendorHash": "sha256-GlkqFg9Bgs+Hi59PYAxqq3YW9ji1qeuX4vz59wQ4pRw="
|
||||
},
|
||||
"hashicorp_tfe": {
|
||||
"hash": "sha256-U58uWRmLMI9XfYT89wfNuwhok+PaWCanz23RjQYyL98=",
|
||||
"hash": "sha256-+FIiatVTff/MNk1Ik0vZDii7yjeWQLO5BLqSrs2bGME=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-tfe",
|
||||
"rev": "v0.73.0",
|
||||
"rev": "v0.74.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-n+by9Z0JhLOk/td8Or5IUQIapy9TTHnf9QJSVddTL2Y="
|
||||
"vendorHash": "sha256-GAwAGw8N4B/jCtcR2ok3g/0j//CHK9yPaBj+otJLjKc="
|
||||
},
|
||||
"hashicorp_time": {
|
||||
"hash": "sha256-ZArYfbzbrkxGlL1BRFM7PN3hLzdssIL4COsUBdLVMYY=",
|
||||
@@ -1418,13 +1418,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"vancluever_acme": {
|
||||
"hash": "sha256-Fjn1eNqB0Ye5MRg8+YsPwMBdkvsVELTzf2wvHluFzN8=",
|
||||
"hash": "sha256-hviw2syXALi3B47jwfvEn61sOOZ1qvUMWJE7Ob6M36U=",
|
||||
"homepage": "https://registry.terraform.io/providers/vancluever/acme",
|
||||
"owner": "vancluever",
|
||||
"repo": "terraform-provider-acme",
|
||||
"rev": "v2.43.0",
|
||||
"rev": "v2.44.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-LAM2pzTIRdspYnXboDA+iGwt7uaI+/ItXPAgOJUELps="
|
||||
"vendorHash": "sha256-FSyJ5ZCaGbMZbDop/Pj8TKaUAeOBNz/RSfV/rkVYbD0="
|
||||
},
|
||||
"venafi_venafi": {
|
||||
"hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=",
|
||||
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
||||
description = "Pass mouse wheel commands to secondary screens (screen, less, nano, etc)";
|
||||
homepage = "https://aur.archlinux.org/packages/urxvt-vtwheel";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ danbst ];
|
||||
maintainers = [ ];
|
||||
platforms = with lib.platforms; unix;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "ananicy-rules-cachyos";
|
||||
version = "0-unstable-2026-02-10";
|
||||
version = "0-unstable-2026-02-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CachyOS";
|
||||
repo = "ananicy-rules";
|
||||
rev = "061314309227b08b5acf8ff2963fc3ce976539e9";
|
||||
hash = "sha256-Kn+m6evpaB4r/a11+6ItfhnCveB8iC6ZJGgkvvPWulc=";
|
||||
rev = "e9108a0d71d7197d42f0315d8bc72147737ebc4a";
|
||||
hash = "sha256-SgcmCsHnZtsMzYeVfb4tUkm9+KARVTZP+weOLHoYdtc=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "auth0-cli";
|
||||
version = "1.27.0";
|
||||
version = "1.27.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "auth0";
|
||||
repo = "auth0-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DrQCbuVFfbhobF3lppQg/a0J/ZSMuP+wbLrMsLcKSRE=";
|
||||
hash = "sha256-Se3jLcMU+KDkaF5UY18KWs/Q+YK3782e7cKc9BxaYqY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Us6NJiSfOK1BBRyrYil26HGaZAgum6k3B5LdV60rCeA=";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "autosuspend";
|
||||
version = "10.0.0";
|
||||
version = "10.1.0";
|
||||
pyproject = true;
|
||||
|
||||
outputs = [
|
||||
@@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
owner = "languitar";
|
||||
repo = "autosuspend";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-o9Jpb4i2/SJ3s3h5sclNjpaN/UFk1YbpPf7b3rGXLRg=";
|
||||
hash = "sha256-4mByuJ75hd5TEoKxVglAHlYXZSlbAldMwnIianSw8O4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "aws-vault";
|
||||
version = "7.9.4";
|
||||
version = "7.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ByteNess";
|
||||
repo = "aws-vault";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Tdi2kGoJ0ZwEnBvjkjZuoTTIdmsJjdMi75gwBmy+5N4=";
|
||||
hash = "sha256-MVeYKeFpGKk0asO7u5RE3arpX3x4EpF4xRCav5oj9J4=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-rY7UbAgv+dLnZBLFptPp7D+gYBsCj7QYM4VvH/HBdq4=";
|
||||
vendorHash = "sha256-6JgcU+NRQSQjoGxF0ByaY2h9/HZUdg8BdbHazz5m8VM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -44,7 +44,7 @@ appimageTools.wrapAppImage {
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
|
||||
install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications
|
||||
install -m 444 -D ${src}/bazecor.png -t $out/share/pixmaps
|
||||
install -m 444 -D ${src}/bazecor.png -t $out/share/icons/hicolor/512x512/apps
|
||||
|
||||
mkdir -p $out/lib/udev/rules.d
|
||||
install -m 444 -D ${./60-dygma.rules} $out/lib/udev/rules.d/60-dygma.rules
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.1.7";
|
||||
version = "2.1.9";
|
||||
|
||||
jdk = zulu25.override { enableJavaFX = true; };
|
||||
|
||||
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: rec {
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb";
|
||||
hash = "sha256-kNQbTZoHFR2qFw/Jjc9iaEews/oUOYoJanmbVH/vs44=";
|
||||
hash = "sha256-E7GV4YGbF0Nj6aWVqJNUUpwLH1G5v5bEQamHP7OUzQY=";
|
||||
|
||||
# Verify the upstream Debian package prior to extraction.
|
||||
# See https://bisq.wiki/Bisq_2#Installation
|
||||
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: rec {
|
||||
|
||||
signature = fetchurl {
|
||||
url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc";
|
||||
hash = "sha256-Cl9EIp+ycD8Tp/bx5dXQK206jZzrYJkI/U9ItfXDRWw=";
|
||||
hash = "sha256-bNZNRbm9uNGfLzGvshXNaRLUNX38Uz58GGy6WqJwV1E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -54,7 +54,7 @@ flutter329.buildFlutterApplication rec {
|
||||
postInstall = ''
|
||||
sed -i 's#Icon=.*/bluebubbles.png#Icon=bluebubbles#g' snap/gui/bluebubbles.desktop
|
||||
install -Dm0644 snap/gui/bluebubbles.desktop $out/share/applications/bluebubbles.desktop
|
||||
install -Dm0644 snap/gui/bluebubbles.png $out/share/pixmaps/bluebubbles.png
|
||||
install -Dm0644 snap/gui/bluebubbles.png -t $out/share/icons/hicolor/1024x1024/apps
|
||||
'';
|
||||
|
||||
extraWrapProgramArgs = ''
|
||||
|
||||
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
|
||||
postInstall = ''
|
||||
patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/boilr
|
||||
install -Dpm 0644 flatpak/io.github.philipk.boilr.desktop $out/share/applications/boilr.desktop
|
||||
install -Dpm 0644 resources/io.github.philipk.boilr.png $out/share/pixmaps/io.github.philipk.boilr.png
|
||||
install -Dpm 0644 resources/io.github.philipk.boilr.png -t $out/share/icons/hicolor/32x32/apps
|
||||
'';
|
||||
|
||||
dontPatchELF = true;
|
||||
|
||||
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
install -Dm755 {.,$out/bin}/Bugdom
|
||||
wrapProgram $out/bin/Bugdom --run "cd $out/share/bugdom"
|
||||
install -Dm644 $src/packaging/io.jor.bugdom.desktop $out/share/applications/io.jor.bugdom.desktop
|
||||
install -Dm644 $src/packaging/io.jor.bugdom.png $out/share/pixmaps/io.jor.bugdom.png
|
||||
install -Dm644 $src/packaging/io.jor.bugdom.png -t $out/share/icons/hicolor/512x512/apps
|
||||
''
|
||||
)
|
||||
+ ''
|
||||
|
||||
@@ -51,7 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ zig_0_13 ]}
|
||||
'';
|
||||
|
||||
CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)";
|
||||
env.CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)";
|
||||
|
||||
cargoBuildFlags = [ "--features=skip-build-banner" ];
|
||||
cargoCheckFlags = [ "--features=skip-build-banner" ];
|
||||
|
||||
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cp -r ${desktopItem}/share/applications $out/share/applications
|
||||
|
||||
install -D ${finalAttrs.src} $out/share/ccemux/ccemux.jar
|
||||
install -D ${desktopIcon} $out/share/pixmaps/ccemux.png
|
||||
install -D ${desktopIcon} $out/share/icons/hicolor/256x256/apps/ccemux.png
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/ccemux \
|
||||
--add-flags "-jar $out/share/ccemux/ccemux.jar"
|
||||
|
||||
@@ -40,7 +40,7 @@ flutter332.buildFlutterApplication rec {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm0644 assets/logo.png $out/share/pixmaps/chatmcp.png
|
||||
install -Dm0644 assets/logo.png $out/share/icons/hicolor/1024x1024/apps/chatmcp.png
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
else
|
||||
"cp -r dist/linux-unpacked/{resources,LICENSE*} $out/opt/cherry-studio"
|
||||
}
|
||||
install -Dm644 build/icon.png $out/share/pixmaps/cherry-studio.png
|
||||
install -Dm644 build/icon.png $out/share/icons/hicolor/1024x1024/apps/cherry-studio.png
|
||||
makeWrapper ${lib.getExe electron} $out/bin/cherry-studio \
|
||||
--inherit-argv0 \
|
||||
--add-flags $out/opt/cherry-studio/resources/app.asar \
|
||||
|
||||
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -D misc/chromium-bsu.png $out/share/pixmaps/chromium-bsu.png
|
||||
install -D misc/chromium-bsu.png -t $out/share/icons/hicolor/64x64/apps
|
||||
install -D misc/chromium-bsu.desktop $out/share/applications/chromium-bsu.desktop
|
||||
'';
|
||||
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clapgrep";
|
||||
version = "25.10";
|
||||
version = "26.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luleyleo";
|
||||
repo = "clapgrep";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Y7XwS4jOj8WHi3ntLwPne86/ZVkdBaWrDtPmUcUG4XE=";
|
||||
hash = "sha256-8OG3yVfmvAJN/e07r/2rij0tairE/hOdERDwqDt8fbk=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{
|
||||
"version": "2.4.31",
|
||||
"version": "2.5.17",
|
||||
"vscodeVersion": "1.105.1",
|
||||
"sources": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/linux/x64/Cursor-2.4.31-x86_64.AppImage",
|
||||
"hash": "sha256-4cEa5SsbE2QFfmcndnVI5QQIS9DPjFQ6u/iQO9P8SEk="
|
||||
"url": "https://downloads.cursor.com/production/7b98dcb824ea96c9c62362a5e80dbf0d1aae4775/linux/x64/Cursor-2.5.17-x86_64.AppImage",
|
||||
"hash": "sha256-tUVqfxkUUMXGFzI2lGgoIDuQxI9LSrspDuz4xPGpQig="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/linux/arm64/Cursor-2.4.31-aarch64.AppImage",
|
||||
"hash": "sha256-b66KmFN92HZRyZnlFVMxCCgX0bWBktfKojtnXF7c+Qg="
|
||||
"url": "https://downloads.cursor.com/production/7b98dcb824ea96c9c62362a5e80dbf0d1aae4775/linux/arm64/Cursor-2.5.17-aarch64.AppImage",
|
||||
"hash": "sha256-yXr/sNyhsGbO1Coj7jI/LyRtyNfRuzOlaLuMAXNAI7g="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/darwin/x64/Cursor-darwin-x64.dmg",
|
||||
"hash": "sha256-JQq73IqSAlkedhCuxr+uIpWPEAslnMPxciDDQYHWU6o="
|
||||
"url": "https://downloads.cursor.com/production/7b98dcb824ea96c9c62362a5e80dbf0d1aae4775/darwin/x64/Cursor-darwin-x64.dmg",
|
||||
"hash": "sha256-w738cXHYcckDtnOYYcuL3xxUH/rAcHS/nQG78npJ6IQ="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/darwin/arm64/Cursor-darwin-arm64.dmg",
|
||||
"hash": "sha256-xXzWWDfU00IDx3vqnB0A4mItSyvfRqasUhqOAj8U5aE="
|
||||
"url": "https://downloads.cursor.com/production/7b98dcb824ea96c9c62362a5e80dbf0d1aae4775/darwin/arm64/Cursor-darwin-arm64.dmg",
|
||||
"hash": "sha256-zHQJb/FNV2jLMrtDzMSMVs09+FvZj1ndSWB7HnB9lsU="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,8 +20,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
buildAndTestSubdir = "crates/codebook-lsp";
|
||||
cargoHash = "sha256-hxPgYGBq+KZfEyFiHQG31cNEN6A6hUgKRgZXIHOGalw=";
|
||||
|
||||
CARGO_PROFILE_RELEASE_LTO = "fat";
|
||||
CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
|
||||
env = {
|
||||
CARGO_PROFILE_RELEASE_LTO = "fat";
|
||||
CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
|
||||
};
|
||||
|
||||
# Integration tests require internet access for dictionaries
|
||||
doCheck = false;
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "discordo";
|
||||
version = "0-unstable-2026-02-09";
|
||||
version = "0-unstable-2026-02-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayn2op";
|
||||
repo = "discordo";
|
||||
rev = "4c61e7c67a78d0906ffa77794deeb45e53d659d2";
|
||||
hash = "sha256-3UHQJDi+9TW7yD2yWfD+1hr8iSvyd1HLGqbtk0iYlVg=";
|
||||
rev = "f1650a0df751e40a589ceda4ec19626e109bac2b";
|
||||
hash = "sha256-+1XK5Zri7DiKzaqsFHYjzde1XEFlp4cj878+FzLaibg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8Le/d6sXXH0dCORWLOFUjHlbGcKr0yqQ2l8GQzLaYt0=";
|
||||
vendorHash = "sha256-eltE7RkxqjYMWMv8/YmCC+WlntBTF8zO7UE0MQsG8Is=";
|
||||
|
||||
env.CGO_ENABLED = 1;
|
||||
|
||||
|
||||
@@ -28,13 +28,13 @@ buildGoModule (
|
||||
in
|
||||
{
|
||||
pname = "dms-shell";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AvengeMedia";
|
||||
repo = "DankMaterialShell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-O9NIJqfuSjwY//7OyFH3FqxRHe5M0vmmsXcryOi/bAE=";
|
||||
hash = "sha256-abNemkJQxp8E9bCNyTlAcFxKx+t1Wsc49J5NRZuyCgs=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/core";
|
||||
|
||||
@@ -26,6 +26,6 @@ buildGoModule (finalAttrs: {
|
||||
mainProgram = "dolt";
|
||||
homepage = "https://github.com/dolthub/dolt";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ danbst ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -78,7 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
zlib
|
||||
];
|
||||
|
||||
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER = "gcc";
|
||||
env.CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER = "gcc";
|
||||
|
||||
preBuild = ''
|
||||
# `SANDBOX` defined by upstream to disable build-time network access
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
installShellFiles,
|
||||
git,
|
||||
stdenv,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
@@ -29,11 +30,16 @@ buildGoModule (finalAttrs: {
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=github.com/entireio/cli/cmd/entire/cli/buildinfo.Version=${finalAttrs.version}"
|
||||
"-X=github.com/entireio/cli/cmd/entire/cli/buildinfo.Commit=${finalAttrs.src.rev}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
nativeCheckInputs = [ git ];
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd entire \
|
||||
@@ -50,9 +56,12 @@ buildGoModule (finalAttrs: {
|
||||
of how code was written in your repo.
|
||||
'';
|
||||
homepage = "https://github.com/entireio/cli";
|
||||
changelog = "https://github.com/entireio/cli/releases/tag/v${finalAttrs.version}";
|
||||
changelog = "https://github.com/entireio/cli/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sheeeng ];
|
||||
maintainers = with lib.maintainers; [
|
||||
sheeeng
|
||||
squishykid
|
||||
];
|
||||
mainProgram = "entire";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -184,11 +184,11 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "145.0.7632.75";
|
||||
version = "145.0.7632.109";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-4hFjRhkURRq1NXdAUPesS32t/NyG9eb784/sW75DlCU=";
|
||||
hash = "sha256-VNvx/3l3gzj8HjeeK3v/Hj05E9t2PvsiP8pnIOq1AEA=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@@ -302,11 +302,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "145.0.7632.76";
|
||||
version = "145.0.7632.110";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/n6e44i3vvn55x7sajqc7tgrlx4_145.0.7632.76/GoogleChrome-145.0.7632.76.dmg";
|
||||
hash = "sha256-auSCvJ0r3OyXjDICmgFAeD/MFveOmEZD3fnuryI5ozU=";
|
||||
url = "http://dl.google.com/release2/chrome/odn6jvyow6owsodlm42m33k7ta_145.0.7632.110/GoogleChrome-145.0.7632.110.dmg";
|
||||
hash = "sha256-siBn+vaSvvgrMEF1Da74nu1WGvyM1QUggarrEuqcGy4=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -24,12 +24,14 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [ zstd ];
|
||||
|
||||
nativeCheckInputs = lib.optionals finalAttrs.doCheck [
|
||||
nativeCheckInputs = lib.optionals finalAttrs.finalPackage.doCheck [
|
||||
python3
|
||||
perl
|
||||
];
|
||||
|
||||
inherit (sharness) SHARNESS_TEST_SRCDIR;
|
||||
env = {
|
||||
inherit (sharness) SHARNESS_TEST_SRCDIR;
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
version = "3.6.5";
|
||||
version = "3.6.6";
|
||||
pname = "grafana-loki";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "loki";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-f9YijC8MH+vPxh6N/LKQIhsSWM6uEqIyHY+5J3mu+aQ=";
|
||||
hash = "sha256-Mdopa7Nhdcwn4VBz/R5zI3Zccuht2hIdnAeCsAS6B+0=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -20,14 +20,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "incus-ui-canonical";
|
||||
version = "0.19.4";
|
||||
version = "0.19.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zabbly";
|
||||
repo = "incus-ui-canonical";
|
||||
# only use tags prefixed by incus- they are the tested fork versions
|
||||
tag = "incus-${finalAttrs.version}";
|
||||
hash = "sha256-B/05tQbiqpi5gzoHjFVTS7CHwuO2xSHHSu76/fNjRug=";
|
||||
hash = "sha256-dwQshNQrP/3AWsFtDeMpUIm3l3Oqjj1jkKw98KT4u9M=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "infrastructure-agent";
|
||||
version = "1.72.2";
|
||||
version = "1.72.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "newrelic";
|
||||
repo = "infrastructure-agent";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-GcQ/UUznuWdAtOyCC4qLQfItm81zwryV2gDDlYKFONI=";
|
||||
hash = "sha256-qhw21kOspIyAyFQYXy56NhGCSesjkPrhagXfcfyiBRQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-H41FxeJLrlaL/KbcBAS1WuMfVn6d+4So3egXb6E46/o=";
|
||||
|
||||
@@ -14,7 +14,7 @@ in
|
||||
inherit useVSCodeRipgrep;
|
||||
commandLineArgs = extraCommandLineArgs;
|
||||
|
||||
version = "0.9.2";
|
||||
version = "0.9.47";
|
||||
pname = "kiro";
|
||||
|
||||
# You can find the current VSCode version in the About dialog:
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"x86_64-linux": {
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.9.2/tar/kiro-ide-0.9.2-stable-linux-x64.tar.gz",
|
||||
"hash": "sha256-/dMABkSiselaWuLQOnxB4dCt0VnLMzKn2LkKMLSG9MM="
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.9.47/tar/kiro-ide-0.9.47-stable-linux-x64.tar.gz",
|
||||
"hash": "sha256-30hUVXqudiwKAKQp8BtVBpjniGEMEH6CafPbjH5x+30="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.9.2/kiro-ide-0.9.2-stable-darwin-x64.dmg",
|
||||
"hash": "sha256-3y2pmmjETqcTuQ85Nz/pK0m+UjjF+TzU+vhbuCsVzp8="
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.9.47/kiro-ide-0.9.47-stable-darwin-x64.dmg",
|
||||
"hash": "sha256-K78V0LTO1HlQSW8+Ot0ysYvDm9O4wRghBw89MlpQbMg="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.9.2/kiro-ide-0.9.2-stable-darwin-arm64.dmg",
|
||||
"hash": "sha256-YN8OT3w9ztMP+He53VBHVVA+0Yp8FBHZRpizEFQ84AU="
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.9.47/kiro-ide-0.9.47-stable-darwin-arm64.dmg",
|
||||
"hash": "sha256-ovEsvLyfb8iI7hlrSyFjkJrzPxX5F/eltDcROKZfw2M="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kuttl";
|
||||
version = "0.24.0";
|
||||
version = "0.25.0";
|
||||
cli = "kubectl-kuttl";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kudobuilder";
|
||||
repo = "kuttl";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-Hkq1VukyImRLSQrOtH7IJyt2S8Zl+SNiWJfX4HpiOI4=";
|
||||
sha256 = "sha256-ptF6T83PZY3avFnFeMdS6voZXRYVXFDxER03rNEX+s0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-et/52c++8pgVgguCbPidVg0zFm9p7SVYI97N8sQ2KYQ=";
|
||||
vendorHash = "sha256-UgFf+iKtJDeBxILCfshgqTU9ecALLyJwwOULsTKcjjk=";
|
||||
|
||||
subPackages = [ "cmd/kubectl-kuttl" ];
|
||||
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "lichess-bot";
|
||||
version = "2026.1.28.1";
|
||||
version = "2026.2.13.1";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lichess-bot-devs";
|
||||
repo = "lichess-bot";
|
||||
rev = "6bc42182f959b83cda1e711fb752179807834e13";
|
||||
hash = "sha256-kSNGOyL9vNDWOD80a3LOCf+DTWv2poS2EQ+xce8knTs=";
|
||||
rev = "960bcad4ec5069547cc5fcfd496c47a70280ff56";
|
||||
hash = "sha256-Dc6R9OufJCcTN32Hx2BVauTwaO9/gWRq24hJ4pWRObY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mesos-dns";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "m3scluster";
|
||||
repo = "mesos-dns";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-o0I+pTgN9fb//Q1s9UfpVLUzq5DQVR/qKsr6CYypvsc=";
|
||||
hash = "sha256-922FWRqKGBFB8zQf9nAtlym3b7Fjcg+uaIqEKeRZSro=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-l1y3CaGG1ykJnGit81D+E+jB4RUYneQzRMTvOPCH+jk=";
|
||||
|
||||
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cargoHash = "sha256-08pvkBa2PD7/uko1OOBg6/dCcOM3z9Cp//8mylFCMcE=";
|
||||
|
||||
CARGO_CRATE_NAME = "mhost";
|
||||
env.CARGO_CRATE_NAME = "mhost";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -12,24 +12,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nbytes";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nodejs";
|
||||
repo = "nbytes";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lsd1Qrv1HEz/5ry10s7Pq7unoh3y9ZmwCaT+6nTlxkc=";
|
||||
hash = "sha256-10l/YrvZPwEdEh/Q170WhZUQzdFEpjy7zeKKzYfyoYc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Use `gtest` from Nixpkgs to allow an offline build
|
||||
./use-nix-googletest.patch
|
||||
# Add support for pkgconfig for use as a shared lib
|
||||
# TODO: remove when included in the next release
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/nodejs/nbytes/commit/00f48a0620cef800054d4aab061f09d89990a1b9.patch?full_index=1";
|
||||
hash = "sha256-uOPEI70Dq446K56BSFHVyxDHNaYY5OASu3QeWGCLQmI=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -123,6 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# almost cross-compiles, however fails with
|
||||
# ** (process:9234): WARNING **: Failed to load shared library '/nix/store/...-networkmanager-aarch64-unknown-linux-gnu-1.38.2/lib/libnm.so.0' referenced by the typelib: /nix/store/...-networkmanager-aarch64-unknown-linux-gnu-1.38.2/lib/libnm.so.0: cannot open shared object file: No such file or directory
|
||||
"-Ddocs=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
|
||||
"-Dman=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
|
||||
"-Dtests=no"
|
||||
"-Dcrypto=gnutls"
|
||||
"-Dmobile_broadband_provider_info_database=${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml"
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
quickshell,
|
||||
|
||||
# runtime deps
|
||||
bluez,
|
||||
brightnessctl,
|
||||
cava,
|
||||
cliphist,
|
||||
@@ -29,6 +30,7 @@
|
||||
json-glib,
|
||||
gobject-introspection,
|
||||
|
||||
bluetoothSupport ? true,
|
||||
brightnessctlSupport ? true,
|
||||
cavaSupport ? true,
|
||||
cliphistSupport ? true,
|
||||
@@ -45,6 +47,7 @@ let
|
||||
wget
|
||||
(python3.withPackages (pp: lib.optional calendarSupport pp.pygobject3))
|
||||
]
|
||||
++ lib.optional bluetoothSupport bluez
|
||||
++ lib.optional brightnessctlSupport brightnessctl
|
||||
++ lib.optional cavaSupport cava
|
||||
++ lib.optional cliphistSupport cliphist
|
||||
@@ -65,13 +68,13 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "noctalia-shell";
|
||||
version = "4.4.3";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "noctalia-dev";
|
||||
repo = "noctalia-shell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5HqCE5qfW6ItA+ZeFGfTT7/+12QYp/1j93EPdn+nlK0=";
|
||||
hash = "sha256-Y5P0RYO9NKxa4UZBoGmmxtz3mEwJrBOfvdLJRGjV2Os=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-square";
|
||||
version = "26.01.11";
|
||||
version = "26.02.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = "numix-icon-theme-square";
|
||||
rev = version;
|
||||
sha256 = "sha256-fj7CaEUms7w+apaXW+6zMwqCwaLWlU2RJalGzFIaDNg=";
|
||||
sha256 = "sha256-7UDjXJtmHI3FKAvuvHtppqkVIfochwXSvfaM50Mm3R8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
||||
@@ -22,8 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cargoHash = "sha256-v+OfQEfAwHxX+FfC0UK2F8/e2tJKaI3zQpg+3hk2hV4=";
|
||||
|
||||
CARGO_PROFILE_RELEASE_LTO = "fat";
|
||||
CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
|
||||
env = {
|
||||
CARGO_PROFILE_RELEASE_LTO = "fat";
|
||||
CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
pkg-config
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "openfga";
|
||||
version = "1.11.4";
|
||||
version = "1.11.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openfga";
|
||||
repo = "openfga";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-MhxDlJzAScmf8J42WrsgVzSasiIhzqprrU9TqoY2bzk=";
|
||||
hash = "sha256-5VS3sx4sHiJvWFDFw929Q5n6OZfCSHPgqtHgLEEeqHQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-m2ddB7yfZmTwWKvf/lTzmc2D4lR1JXc5sFlRgAi+q+s=";
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
lndir,
|
||||
}:
|
||||
let
|
||||
version = "2.20.6";
|
||||
version = "2.20.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "paperless-ngx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rTkkvSkgYQtT9KglXsyf4SWwjoJWtX5YwcVUbEbLac0=";
|
||||
hash = "sha256-NVlV+iHtUx05EIuHx/WePRf558DH977oZ7C8iNW0QR4=";
|
||||
};
|
||||
|
||||
python = python3.override {
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "patch2pr";
|
||||
version = "0.41.0";
|
||||
version = "0.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluekeyes";
|
||||
repo = "patch2pr";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-mln6MVPZRbW2XgTaVAGiK87MkHPPEzFgHaNnacKym8g=";
|
||||
hash = "sha256-3VrUp9JmZLHIknXneMa5IixRkjWFzTLanVGhSagSams=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nLpS0JbdqFMK2+ycZZC93HWPCS0+k7tyl1pB/T6fPjA=";
|
||||
vendorHash = "sha256-zpyyz0C+lJKFjKgaUnO3R5kmujIXCzM16UvcXcNQnVw=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pihole-web";
|
||||
version = "6.4";
|
||||
version = "6.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pi-hole";
|
||||
repo = "web";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zIuDqDL6JO8JLr+u+XWBRxweK67KBztvqUp00MshbYQ=";
|
||||
hash = "sha256-0nhMbOEZ4Q4XxOvskcEbDkK4HqdosgAzdRF4sT9+zjQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "pik";
|
||||
version = "0.28.1";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jacek-kurlit";
|
||||
repo = "pik";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-pDfqqQcYrK78OylwOiKc/Orul03MjdZxEHhpr8obm84=";
|
||||
hash = "sha256-SXSMYvpFLT4sYb1UxC4SoOXL5J2V0/hSL5p2Wa/Ba00=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/2E5VZt2/xWtPy4Zpo8lVn4sXR4Gq6+NJkKpNM7hOVg=";
|
||||
cargoHash = "sha256-+7sUlqi3cv3GksVMMCgrcbGgkCIQZCWEco5LpXo7p2w=";
|
||||
|
||||
passthru.tests.version = testers.testVersion { package = pik; };
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Fetch CLI workspace dependencies
|
||||
deps_json=$(pnpm list --filter ./packages/cli --prod --depth Infinity --json)
|
||||
deps=$(jq -r '[.. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json")
|
||||
deps=$(jq -r '[del(.. | .unsavedDependencies?) | .. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json")
|
||||
|
||||
# Remove unnecessary external dependencies
|
||||
find . -name node_modules -type d -prune -exec rm -rf {} +
|
||||
|
||||
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Fetch CLI workspace dependencies
|
||||
deps_json=$(pnpm list --filter ./packages/cli --prod --depth Infinity --json)
|
||||
deps=$(jq -r '[.. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json")
|
||||
deps=$(jq -r '[del(.. | .unsavedDependencies?) | .. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json")
|
||||
|
||||
# Remove unnecessary external dependencies
|
||||
find . -name node_modules -type d -prune -exec rm -rf {} +
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "protoc-gen-validate";
|
||||
version = "1.3.0";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = "protoc-gen-validate";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-225D0iHM+fTYIu/+HPkGZ8IcqbP4FMkf7Lw1wI02rZw=";
|
||||
sha256 = "sha256-4KmYDfitAYLfdgTUg3SlQLjWoYBnGOuF7C3xHWm/lNM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-R9zcjoMiq69pPbXAahOp1RJNvlgsASuCwbxkwLbMomg=";
|
||||
vendorHash = "sha256-r4oT4Jd21hQccvGEqOXpEKqUy6lvMKN+vF8e2KxY6oQ=";
|
||||
|
||||
excludedPackages = [ "tests" ];
|
||||
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pspg";
|
||||
version = "5.8.15";
|
||||
version = "5.8.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okbob";
|
||||
repo = "pspg";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-wYGU9vaAgY87RTbOXOGBVV37ZN/+NceXWgoEaY95md4=";
|
||||
sha256 = "sha256-7x1hTEl2WoOXZTbPfb/t0w4tl09paDD/uIPuyhLlMbk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
# DO NOT EDIT! This file is generated automatically by update.sh
|
||||
{ }:
|
||||
{
|
||||
version = "3.220.0";
|
||||
version = "3.221.0";
|
||||
pulumiPkgs = {
|
||||
x86_64-linux = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.220.0-linux-x64.tar.gz";
|
||||
sha256 = "1zs5mpy4rcgv0fadbb6pv95kq75152rpngch676j2n63w2awa03g";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.221.0-linux-x64.tar.gz";
|
||||
sha256 = "1bdrblxcyai88a52qw2zq998ar0yl3fk83l7b7w98gqmnj8nywzy";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-linux-amd64.tar.gz";
|
||||
sha256 = "02ffwlprcqn8n7ghpmb6s33gfg03vizvah4zxkqi69dp6q3l3hws";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.49.0-linux-amd64.tar.gz";
|
||||
sha256 = "0rz3bfdpy20f82cj2ja5nag829l01cy5kpc2qshl1i6sh70f2q0y";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-linux-amd64.tar.gz";
|
||||
@@ -57,8 +57,8 @@
|
||||
sha256 = "1k0ssdiby049ycl0q2bym94vx3apnxqkay61iyv3b0ssh6447zp0";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.57.0-linux-amd64.tar.gz";
|
||||
sha256 = "0b7naqlw20v2hllc48y485ypcaw2qsi5ng0kwmm0zg6zdjx6and7";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.58.0-linux-amd64.tar.gz";
|
||||
sha256 = "0v533qvfsibdmw17p0byk1xcl290kljryd6fd6j0mkg3gyw7gbx0";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-linux-amd64.tar.gz";
|
||||
@@ -73,8 +73,8 @@
|
||||
sha256 = "0lh7qzaxqplnc6liqvgccczyl7fhgnnmxv1ivwf88pmrpzq2l1n0";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.11.0-linux-amd64.tar.gz";
|
||||
sha256 = "0yaxcpc5zrl31jyrwl7yfyva27nxsjcgx6cinvhq3rhisknsz8xp";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.12.0-linux-amd64.tar.gz";
|
||||
sha256 = "167mfp0h67s3ma5idl81mlqpsbflnrs4z7xg035clwg0lwq6m00j";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-linux-amd64.tar.gz";
|
||||
@@ -89,8 +89,8 @@
|
||||
sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.0-linux-amd64.tar.gz";
|
||||
sha256 = "0324c2x4x7gfyg3xis3fi7qy8j1ccw8871b8qyh09cndwlh4ghg1";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-linux-amd64.tar.gz";
|
||||
sha256 = "19k79m8dhkiy4x4rs6dq4zkfczjsnmc0mvbh57b5l52imsv7ks7m";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.25.0-linux-amd64.tar.gz";
|
||||
@@ -163,12 +163,12 @@
|
||||
];
|
||||
x86_64-darwin = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.220.0-darwin-x64.tar.gz";
|
||||
sha256 = "1vly2arzfn69a92v5mpf6yc1a15rnc4bh1f20zpcsq7mvfdjrfr1";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.221.0-darwin-x64.tar.gz";
|
||||
sha256 = "0szvz9wwvr6ijv45sbmkxawnbyph8pknnly99bf909ra3kr5y9vc";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1zjs31cdhc9wryxigf5x1r88hkcvqsizkxdwydd1cn2svlc1pkik";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.49.0-darwin-amd64.tar.gz";
|
||||
sha256 = "14zxzrjcmyjg0fvdmm9jf4lb4zx6vlj125j2hy0m99yy1ngqrw4c";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-darwin-amd64.tar.gz";
|
||||
@@ -215,8 +215,8 @@
|
||||
sha256 = "0bj5mb05sakzmar8g5bymamfyixkdl99ccw4xglb4syxhv97cp91";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.57.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1bxvgri8ics1x84kh7l7lqw558x1pgbxhp6c9ph0ma56acbhv2x7";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.58.0-darwin-amd64.tar.gz";
|
||||
sha256 = "12pr6haz9s304aws4id4csvalh2ifqack5mp7lz3l2f8gy6aa4xb";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-darwin-amd64.tar.gz";
|
||||
@@ -231,8 +231,8 @@
|
||||
sha256 = "1qr6395rkb2bfd2qi3aifi1z78mlp5kap5kb605j9l0ml5q4ybb4";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.11.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1a6xw351y2x1aadbrww4j8zwyfvhbs71wbyrkkp8br806yq0ysdp";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.12.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1y5bhjzv7pcnk6h2rhl0lib8nlvbfdh87ilgfydy757gn99wqi03";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-darwin-amd64.tar.gz";
|
||||
@@ -247,8 +247,8 @@
|
||||
sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1zpc8gdjgj7if0cv1vmn9m2p4x0mc9ab6a1x3k16xmq0qcd4by2p";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-darwin-amd64.tar.gz";
|
||||
sha256 = "04rmlydspvgbcgn7qd9sk0bd70axz2rmpiydfw383352bxrinlvs";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.25.0-darwin-amd64.tar.gz";
|
||||
@@ -321,12 +321,12 @@
|
||||
];
|
||||
aarch64-linux = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.220.0-linux-arm64.tar.gz";
|
||||
sha256 = "0sznqiqc5n3y8spdixmp3fb4dcprchcc75mssmb3gk6q8c7yw016";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.221.0-linux-arm64.tar.gz";
|
||||
sha256 = "0dvsymd37g9vxli5mzh9fy3kzi7yaq5qcd343zys87c5idx0gbxs";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-linux-arm64.tar.gz";
|
||||
sha256 = "0l2chxskd3lafgg7b04zv8y9p4hm3q29v1vjlky99anbcg0wjknw";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.49.0-linux-arm64.tar.gz";
|
||||
sha256 = "18km9lhzyvvlcx97yyxnh0mfrfr9sc6c9ypj6asksvjz3fsmgjkb";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-linux-arm64.tar.gz";
|
||||
@@ -373,8 +373,8 @@
|
||||
sha256 = "0wzfnvckhl1xq66j2kic3hzi1spvyz2mi2cj8rbhywilb429llhk";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.57.0-linux-arm64.tar.gz";
|
||||
sha256 = "161jv9dxwihgigyc6y349l4dyqax54p44ayb14mdrnxjjiy8wlmz";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.58.0-linux-arm64.tar.gz";
|
||||
sha256 = "107i65fd2j5f08bwzwdjjhdhvn7ghy64m63mzbjrqssawma0r3wc";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-linux-arm64.tar.gz";
|
||||
@@ -389,8 +389,8 @@
|
||||
sha256 = "1vl4mszkbh0m2vf55rx5bb5bkjd72nf4npmp21878fdhyrq23p3r";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.11.0-linux-arm64.tar.gz";
|
||||
sha256 = "08178lhqkxcl2016xhd7zhiqzhm8cvj9kzmbaz187h0cj1db697q";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.12.0-linux-arm64.tar.gz";
|
||||
sha256 = "1a57fvnl1wixghs4gvv534rj5qy8z9zjb1nc6gg02ayn4q5720cy";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-linux-arm64.tar.gz";
|
||||
@@ -405,8 +405,8 @@
|
||||
sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.0-linux-arm64.tar.gz";
|
||||
sha256 = "00hk4bl7vdw39ygxzzgp1a90fa2gm4x0phvppfg748m8dm0wp1mb";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-linux-arm64.tar.gz";
|
||||
sha256 = "094pmichc66fnd38vfn4hb2dl3v88vqfx00smk0b19fdbrafcp5j";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.25.0-linux-arm64.tar.gz";
|
||||
@@ -479,12 +479,12 @@
|
||||
];
|
||||
aarch64-darwin = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.220.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0pjvlyllqg9pbs2w5am10nza67wwnhbdyhir2zld45zfyak9sbjb";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.221.0-darwin-arm64.tar.gz";
|
||||
sha256 = "14k0q3q5mkni934gxrbg44hwhwy6knhzjk6hr6n0qi1i87r28c2d";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-darwin-arm64.tar.gz";
|
||||
sha256 = "027y13r0f84kqcpfirwzyilnsmbn9240dsbdk1jl97m04zp0djhn";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.49.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1295bxz4n7mmi0ijiq6nx1hv7n9vbwcwi0wfrj27fbipwpkbk2wb";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-darwin-arm64.tar.gz";
|
||||
@@ -531,8 +531,8 @@
|
||||
sha256 = "0nw2mcn03mnrvlhc3ykf43im1nmnwc5c2707nqzl9fwxhm25dhc9";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.57.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0gi3cnlcyqy2aq7vxi4kpgl1bfqbax58fawjxg93qjr405g9ilih";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.58.0-darwin-arm64.tar.gz";
|
||||
sha256 = "08j85v5i4f5jj0kg816bhxc20br8a9i6hd3i1x0p7g7qvm7ypjvr";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-darwin-arm64.tar.gz";
|
||||
@@ -547,8 +547,8 @@
|
||||
sha256 = "068bdlp98cp1lfhbigkw16hqyflb95kh7my2s8wgb7hjnf580xwv";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.11.0-darwin-arm64.tar.gz";
|
||||
sha256 = "17mdijhdi1w8b00y5rn86l61jd3ib8p7xda3zhhc8b288c9qwjlk";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.12.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0d77pwhqmvm4g4ix86g566jakja6y59b0s57mxnffyfsvirm2m61";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-darwin-arm64.tar.gz";
|
||||
@@ -563,8 +563,8 @@
|
||||
sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.0-darwin-arm64.tar.gz";
|
||||
sha256 = "18k8g8dh9rkmkn9d68m21wh27g5ynliafzs8ljg6svkg0vmiyw7k";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-darwin-arm64.tar.gz";
|
||||
sha256 = "150kg8brpsazpdd6laywwvbrjmzl4n3w7saf9vidiwsv01zpl90m";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.25.0-darwin-arm64.tar.gz";
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
rainfrog,
|
||||
}:
|
||||
let
|
||||
version = "0.3.15";
|
||||
version = "0.3.16";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit version;
|
||||
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "achristmascarl";
|
||||
repo = "rainfrog";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XW2jMiQif0Q9IV8rDw44n/7OTfPkO+XpAb0AVobddDM=";
|
||||
hash = "sha256-Bz1YNR3/RnCZgU4rZWU6ATclkuUamYE3Umja4qXlmXk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+B5hPtgXoe3mNiOsarivk8sZ6RS6re3Cw/LO4fzuX9o=";
|
||||
cargoHash = "sha256-qpUUInE0XmyAXWZcqXNyNHy5SDKR+M7DG2YRNlr8rug=";
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
|
||||
@@ -20,26 +20,26 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rclone-ui";
|
||||
version = "3.4.1";
|
||||
version = "3.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rclone-ui";
|
||||
repo = "rclone-ui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-d4qJtb8eDZ2txeZxGuweK4tuZaq7E7cRNW5wHdNBalY=";
|
||||
hash = "sha256-aDwtRZGs2JhD2xbzVR3wDdSIjWied9BKknt5WETefvU=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
forceGitDeps = true;
|
||||
hash = "sha256-xnF7c3g3CpMlW3s1UbJHN+R5K+dzV9/IFZ8T/LoT3fk=";
|
||||
hash = "sha256-iyO9Eg+rWV3T50uWyrPHjGcvREnMgSyr0Gq8dxOMPWg=";
|
||||
};
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
cargoHash = "sha256-lemjmsxZsplfC1/nFn84be0JXuKcub5ORkQLL5HQCHY=";
|
||||
cargoHash = "sha256-sCsH+jjHMR3zsPoFfDq2vVuTc8PvYuR/3ZY5bcW7X0o=";
|
||||
|
||||
# Disable tauri bundle updater, can be removed when #389107 is merged
|
||||
patches = [ ./remove_updater.patch ];
|
||||
|
||||
@@ -5,17 +5,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rinf_cli";
|
||||
version = "8.9.0";
|
||||
version = "8.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cunarist";
|
||||
repo = "rinf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UHYYpNlhXRYysQlo3EWDUe4Fwp7PMifrQuZcMAGJp6Q=";
|
||||
hash = "sha256-N34Lys5P/3Os2yEl8x1LOJXhcTxp07V8J3B+DMlK3qk=";
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/rust_crate_cli";
|
||||
|
||||
cargoHash = "sha256-T1reyeoaGBb+Wyn8WX/u7Kf9B01GwWUcYntb7PlIfCk=";
|
||||
cargoHash = "sha256-vnJloz0wUsJbLbAoiIMNxSUZmibRIF/eLIuqkEXbZp8=";
|
||||
|
||||
meta = {
|
||||
description = "Framework for creating cross-platform Rust apps leveraging Flutter";
|
||||
|
||||
@@ -58,8 +58,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.mesonBool "gfxstream" withGfxstream)
|
||||
];
|
||||
|
||||
CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
|
||||
"CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc.targetPrefix}cc";
|
||||
env = {
|
||||
CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
|
||||
"CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc.targetPrefix}cc";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
cd rutabaga_gfx/ffi
|
||||
|
||||
@@ -31,9 +31,12 @@ appimageTools.wrapType2 {
|
||||
''
|
||||
mkdir -p $out/etc/udev/rules.d
|
||||
cp ${appimageContents}/resources/linux-x64/99-SaleaeLogic.rules $out/etc/udev/rules.d/
|
||||
mkdir -p $out/share/pixmaps
|
||||
mkdir $out/share
|
||||
ln -s ${desktopItem}/share/applications $out/share/
|
||||
cp ${appimageContents}/usr/share/icons/hicolor/256x256/apps/Logic.png $out/share/pixmaps/Logic.png
|
||||
for size in 16 32 48 64 128 256; do
|
||||
install -Dm644 -t $out/share/icons/hicolor/"$size"x"$size"/apps \
|
||||
${appimageContents}/usr/share/icons/hicolor/"$size"x"$size"/apps/Logic.png
|
||||
done
|
||||
'';
|
||||
|
||||
extraPkgs =
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "scalr-cli";
|
||||
version = "0.17.6";
|
||||
version = "0.17.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Scalr";
|
||||
repo = "scalr-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-TcgNWtyXadbrE43ZmTLC+d9eXUzgp7zhHxjf2vTsuBk=";
|
||||
hash = "sha256-ZGq76TPMNrlyuHs5yUgw3pJ+a2wVNwBTTSgzIofD4io=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TUf+0Z0yBDOpzMuETn+FCAPXWvQltjRhwQ3Xz0X6YOI=";
|
||||
|
||||
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
CARGO_FEATURE_USE_SYSTEM_LIBS = true;
|
||||
env.CARGO_FEATURE_USE_SYSTEM_LIBS = true;
|
||||
|
||||
meta = {
|
||||
description = "Modern Prolog implementation written mostly in Rust";
|
||||
|
||||
@@ -57,7 +57,7 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 internal/icon/seabird.svg $out/share/pixmaps/dev.skynomads.Seabird.svg
|
||||
install -Dm644 internal/icon/seabird.svg $out/share/icons/hicolor/scalable/dev.skynomads.Seabird.svg
|
||||
'';
|
||||
|
||||
desktopItems = [ "dev.skynomads.Seabird.desktop" ];
|
||||
|
||||
@@ -239,7 +239,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/lib/soh.elf $out/bin/soh
|
||||
install -Dm644 ../soh/macosx/sohIcon.png $out/share/pixmaps/soh.png
|
||||
install -Dm644 ../soh/macosx/sohIcon.png $out/share/icons/hicolor/1024x1024/apps/soh.png
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# Recreate the macOS bundle (without using cpack)
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20260208";
|
||||
version = "20260217";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = "signalbackup-tools";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-rRj8r2uJ6hbvhqzmjOdjBMGj/FlSbnI3tucnCn6oji4=";
|
||||
hash = "sha256-Pd9Hqepm/vxUSKePymi2V6UG8UB3Aj0Jz/UORdYn1J8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -44,7 +44,7 @@ flutter332.buildFlutterApplication rec {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 assets/logo.png $out/share/pixmaps/simple-live-app.png
|
||||
install -Dm644 assets/logo.png $out/share/icons/hicolor/1024x1024/apps/simple-live-app.png
|
||||
'';
|
||||
|
||||
extraWrapProgramArgs = ''
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sioyek";
|
||||
version = "2.0.0-unstable-2026-02-04";
|
||||
version = "2.0.0-unstable-2026-02-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahrm";
|
||||
repo = "sioyek";
|
||||
rev = "bd081b343ec43a702429e934901902ddc51f8b66";
|
||||
hash = "sha256-OmOHIk38s1CVno4LHQegWRZUbMf3KEsOD2VaFCEM55E=";
|
||||
rev = "7b2b26547da4b644d646686a53b087d26ac7413f";
|
||||
hash = "sha256-5ObudXMbUD37LbbtGKW9SDxPHaZx6QBMh+66fyY3NGo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "snx-rs";
|
||||
version = "5.0.5";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ancwrd1";
|
||||
repo = "snx-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-M0F5mJAVPWjT00jmgRC5rlWlN5Q5G5B63DETwJz0TfU=";
|
||||
hash = "sha256-whmZM6OYdHtcTJzzR4aqDMBVpFuRvJKLFVGCQNDjRw8=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
cargoHash = "sha256-zOKXs4bw1JF2uZN0qvID2lYtH4/d5hOihENFSeq9oe8=";
|
||||
cargoHash = "sha256-gAOxwmsPo0XpFxNe3EObNlgiTJ0krMAlVaTDorrYUqg=";
|
||||
|
||||
doInstallCheck = true;
|
||||
versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
alsa-lib,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
imagemagick,
|
||||
libx11,
|
||||
libxcomposite,
|
||||
libxcursor,
|
||||
@@ -60,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmake
|
||||
pkg-config
|
||||
copyDesktopItems
|
||||
imagemagick
|
||||
ninja
|
||||
];
|
||||
|
||||
@@ -113,7 +115,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
install -Dm555 PAPU_artefacts/Release/Standalone/PAPU $out/bin
|
||||
|
||||
install -Dm444 $src/plugin/Resources/icon.png $out/share/pixmaps/PAPU.png
|
||||
mkdir -p $out/share/icons/hicolor/256x256/apps
|
||||
magick $src/plugin/Resources/icon.png -resize 256x256 $out/share/icons/hicolor/256x256/apps/PAPU.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
alsa-lib,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
imagemagick,
|
||||
libxtst,
|
||||
libxrandr,
|
||||
libxinerama,
|
||||
@@ -73,6 +74,7 @@ stdenv.mkDerivation {
|
||||
cmake
|
||||
pkg-config
|
||||
copyDesktopItems
|
||||
imagemagick
|
||||
ninja
|
||||
];
|
||||
|
||||
@@ -147,7 +149,8 @@ stdenv.mkDerivation {
|
||||
|
||||
install -Dm755 SID_artefacts/Release/Standalone/SID $out/bin
|
||||
|
||||
install -Dm444 $src/plugin/Resources/icon.png $out/share/pixmaps/SID.png
|
||||
mkdir -p $out/share/icons/hicolor/256x256/apps
|
||||
magick $src/plugin/Resources/icon.png -resize 256x256 $out/share/icons/hicolor/256x256/apps/SID.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cd ../linux
|
||||
./install.sh "$out"
|
||||
|
||||
install -Dm444 $src/images/sonobus_logo_96.png $out/share/pixmaps/sonobus.png
|
||||
install -Dm444 $src/images/sonobus_logo_96.png $out/share/icons/hicolor/96x96/apps/sonobus.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -252,7 +252,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cp -r ../yamls $out/share/spaghettikart/
|
||||
cp -r ../meta $out/share/spaghettikart/
|
||||
install -Dm644 -t $out/share/spaghettikart {spaghetti.o2r,config.yml,gamecontrollerdb.txt}
|
||||
install -Dm644 ../icon.png $out/share/pixmaps/spaghettikart.png
|
||||
install -Dm644 ../icon.png $out/share/icons/hicolor/256x256/apps/spaghettikart.png
|
||||
install -Dm644 -t $out/share/licenses/spaghettikart/libgfxd ${libgfxd}/LICENSE
|
||||
install -Dm644 -t $out/share/licenses/spaghettikart/libultraship ../libultraship/LICENSE
|
||||
install -Dm644 -t $out/share/licenses/spaghettikart/thread_pool ${thread_pool}/LICENSE.txt
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sqlcl";
|
||||
version = "25.4.1.022.0618";
|
||||
version = "25.4.2.044.1837";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip";
|
||||
hash = "sha256-txfYOqGnraLKOOfIvls2nqai+fUMX9tV4Y0mO0ceyrk=";
|
||||
hash = "sha256-VHLCJZWSGEJVih1hyCLmv94YoWgEPNdKoVvHDCgDpQw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,72 +1,136 @@
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
asar,
|
||||
fetchurl,
|
||||
fetchzip,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
fetchPnpmDeps,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
desktopToDarwinBundle,
|
||||
pnpmConfigHook,
|
||||
makeWrapper,
|
||||
electron,
|
||||
removeReferencesTo,
|
||||
copyDesktopItems,
|
||||
pnpm_10,
|
||||
nodejs,
|
||||
electron_38,
|
||||
zip,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
let
|
||||
electron = electron_38;
|
||||
stdenv = stdenvNoCC;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stoat-desktop";
|
||||
version = "1.1.12";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/stoatchat/for-desktop/releases/download/v${version}/Stoat-linux-x64-${version}.zip";
|
||||
hash = "sha256-S3uJ4ADzDgrpKVxBdEpz73Q6bqOakzk9bObaoRZopbM=";
|
||||
stripRoot = false;
|
||||
src = fetchFromGitHub {
|
||||
owner = "stoatchat";
|
||||
repo = "for-desktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Q1FKQBxtlrGmdfx7gLd0aQx/5Pqd4atFdMykxK997Rw=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
postPatch = ''
|
||||
# Disable auto-updates
|
||||
substituteInPlace src/main.ts \
|
||||
--replace-fail "updateElectronApp();" ""
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
pnpmConfigHook
|
||||
removeReferencesTo
|
||||
makeWrapper
|
||||
asar
|
||||
copyDesktopItems
|
||||
nodejs
|
||||
pnpm_10
|
||||
zip
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
desktopToDarwinBundle
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
set -euo pipefail
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 3;
|
||||
pnpm = pnpm_10;
|
||||
hash = "sha256-m0EuM8qTCFLxxO0RNze5WgMkuHZXeIi+U/Jiuv91eCg=";
|
||||
};
|
||||
|
||||
mkdir -p "$out/bin" "$out/share/applications" "$out/share/stoat-desktop"
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
asarPath="$(find "$src" -type f -path '*/resources/app.asar' -print -quit || true)"
|
||||
if [ -z "$asarPath" ]; then
|
||||
echo "ERROR: could not find resources/app.asar in $src" >&2
|
||||
exit 1
|
||||
fi
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
resDir="$(dirname "$asarPath")"
|
||||
appDir="$(dirname "$resDir")"
|
||||
export npm_config_nodedir=${electron.headers}
|
||||
|
||||
cp -a "$resDir" "$out/share/stoat-desktop/resources"
|
||||
if [ -d "$appDir/locales" ]; then
|
||||
cp -a "$appDir/locales" "$out/share/stoat-desktop/locales"
|
||||
fi
|
||||
# override the detected electron version
|
||||
substituteInPlace node_modules/@electron-forge/core-utils/dist/electron-version.js \
|
||||
--replace-fail "return version" "return '${electron.version}'"
|
||||
|
||||
mkdir -p "$out/share/icons/hicolor/scalable/apps"
|
||||
install -m644 ${
|
||||
fetchurl {
|
||||
url = "https://raw.githubusercontent.com/stoatchat/assets/628eb2f8255c215148007f4227d2e0d5d1a67582/desktop/icon.svg";
|
||||
hash = "sha256-EMDwnAtfTZqhw8hMGTbMjZUrnVkP+2HkyHlSy6pZmik=";
|
||||
}
|
||||
} "$out/share/icons/hicolor/scalable/apps/stoat-desktop.svg"
|
||||
# create the electron archive to be used by electron-packager
|
||||
cp -r ${electron.dist} electron-dist
|
||||
chmod -R u+w electron-dist
|
||||
|
||||
runHook postInstall
|
||||
pushd electron-dist
|
||||
zip -0Xqr ../electron.zip .
|
||||
popd
|
||||
|
||||
rm -r electron-dist
|
||||
|
||||
# force @electron/packager to use our electron instead of downloading it
|
||||
substituteInPlace node_modules/@electron/packager/dist/packager.js \
|
||||
--replace-fail "await this.getElectronZipPath(downloadOpts)" "'$(pwd)/electron.zip'"
|
||||
|
||||
|
||||
pnpm make \
|
||||
--arch "${stdenv.hostPlatform.node.arch}" \
|
||||
--platform "${stdenv.hostPlatform.node.platform}" \
|
||||
--targets "@electron-forge/maker-zip"
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = lib.concatStringsSep "\n" [
|
||||
"runHook preInstall"
|
||||
# Make freedesktop stuff, then the convert hook should make them for Darwin
|
||||
''
|
||||
install -Dm444 "assets/desktop/icon.svg" "$out/share/icons/hicolor/scalable/apps/stoat-desktop.svg"
|
||||
''
|
||||
(lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
# remove references to nodejs
|
||||
find out/*/resources/app/node_modules -type f -executable -exec remove-references-to -t ${nodejs} '{}' \;
|
||||
|
||||
mkdir -p "$out/share/stoat-desktop"
|
||||
cp -r out/*/resources{,.pak} "$out/share/stoat-desktop"
|
||||
|
||||
makeWrapper ${lib.getExe electron} "$out/bin/stoat-desktop" \
|
||||
--add-flag $out/share/stoat-desktop/resources/app.asar \
|
||||
--set ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
'')
|
||||
(lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p "$out/Applications"
|
||||
cp -r out/*/Stoat.app
|
||||
|
||||
makeWrapper "$out/Applications/Stoat.app/Contents/MacOS/stoat-desktop" "$out/bin/stoat-desktop" \
|
||||
--set ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--inherit-argv0
|
||||
'')
|
||||
"runHook postInstall"
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "Stoat";
|
||||
exec = "stoat-desktop %u";
|
||||
icon = "stoat-desktop";
|
||||
exec = "${finalAttrs.meta.mainProgram} %u";
|
||||
icon = "${finalAttrs.meta.mainProgram}";
|
||||
desktopName = "Stoat";
|
||||
genericName = meta.description;
|
||||
genericName = "Chat Client";
|
||||
categories = [
|
||||
"Network"
|
||||
"Chat"
|
||||
@@ -76,24 +140,18 @@ stdenvNoCC.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron "$out/bin/stoat-desktop" \
|
||||
--add-flags "$out/share/stoat-desktop/resources/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Open source user-first chat platform";
|
||||
homepage = "https://stoat.chat/";
|
||||
changelog = "https://github.com/stoatchat/for-desktop/releases/tag/v${version}";
|
||||
changelog = "https://github.com/stoatchat/for-desktop/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
heyimnova
|
||||
magistau
|
||||
v3rm1n0
|
||||
RossSmyth
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
mainProgram = "stoat-desktop";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "systemd-manager-tui";
|
||||
version = "1.2.0";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Matheus-git";
|
||||
repo = "systemd-manager-tui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/KtvQBye5Z7xfCO57YhM/s+XOAT4ZIBU6Ycu398haXw=";
|
||||
hash = "sha256-hPsHsa4eY7kOxKj9YiDK3uQyVOp2/JcR53ygFZXrkO4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-g6ES+A73E6k/TPw73azeYXj5R91Y98Im1enYKDqKTVk=";
|
||||
cargoHash = "sha256-/8QN/QU6Ayx8FAI4bwaWqOoL9fYIT5m65908zXpm3gk=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/Matheus-git/systemd-manager-tui";
|
||||
|
||||
@@ -101,8 +101,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postInstall = lib.optionalString buildClient (
|
||||
lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
# Convert and install desktop icon
|
||||
mkdir -p $out/share/pixmaps
|
||||
icotool --extract --index 1 --output $out/share/pixmaps/teeworlds.png $src/other/icons/teeworlds.ico
|
||||
mkdir -p $out/share/icons/hicolor/256x256/apps
|
||||
icotool --extract --index 1 --output $out/share/icons/hicolor/256x256/apps/teeworlds.png $src/other/icons/teeworlds.ico
|
||||
|
||||
# Install menu item
|
||||
install -D $src/other/teeworlds.desktop $out/share/applications/teeworlds.desktop
|
||||
|
||||
@@ -73,9 +73,9 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out/opt/termius
|
||||
cp -r ./ $out/opt/termius
|
||||
|
||||
mkdir -p "$out/share/applications" "$out/share/pixmaps"
|
||||
mkdir -p $out/share/applications
|
||||
cp "${desktopItem}/share/applications/"* "$out/share/applications"
|
||||
cp meta/gui/icon.png $out/share/pixmaps/termius-app.png
|
||||
install -Dm644 meta/gui/icon.png $out/share/icons/hicolor/1024x1024/termius-app.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -111,8 +111,7 @@ buildNpmPackage rec {
|
||||
ln -s $out/opt/threema/$dir $out/opt/threema/dist/src/$dir
|
||||
done
|
||||
|
||||
mkdir -p $out/share/pixmaps
|
||||
cp $out/opt/threema/assets/icons/svg/consumer.svg $out/share/pixmaps/threema.svg
|
||||
install -Dm644 $out/opt/threema/assets/icons/svg/consumer.svg $out/share/icons/hicolor/scalable/threema.svg
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/threema \
|
||||
--add-flags $out/opt/threema/dist/src/main.js
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
fetchNpmDeps,
|
||||
imagemagick,
|
||||
npmHooks,
|
||||
nodejs,
|
||||
wails,
|
||||
@@ -48,6 +49,7 @@ buildGoModule (finalAttrs: {
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
copyDesktopItems
|
||||
imagemagick
|
||||
];
|
||||
|
||||
buildInputs = [ webkitgtk_4_1 ];
|
||||
@@ -79,7 +81,8 @@ buildGoModule (finalAttrs: {
|
||||
runHook preInstall
|
||||
|
||||
install -Dm 0755 build/bin/tiny-rdm $out/bin/tiny-rdm
|
||||
install -Dm 0644 frontend/src/assets/images/icon.png $out/share/pixmaps/tiny-rdm.png
|
||||
mkdir -p $out/share/icons/hicolor/96x96/apps
|
||||
magick frontend/src/assets/images/icon.png -resize 96x96 $out/share/icons/hicolor/96x96/apps/tiny-rdm.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -37,7 +37,7 @@ appimageTools.wrapAppImage {
|
||||
# Add desktop convencience stuff
|
||||
extraInstallCommands = ''
|
||||
install -D --mode 0644 ${appimageContents}/todoist.desktop -t $out/share/applications
|
||||
install -D --mode 0644 ${appimageContents}/todoist.png -t $out/share/pixmaps
|
||||
install -D --mode 0644 ${appimageContents}/todoist.png -t $out/share/icons/hicolor/512x512/apps
|
||||
substituteInPlace $out/share/applications/todoist.desktop \
|
||||
--replace-fail "Exec=AppRun" "Exec=todoist-electron --" \
|
||||
--replace-fail "Exec=todoist" "Exec=todoist-electron --"
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
installShellFiles,
|
||||
openssl,
|
||||
dbus,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tokstat";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pbek";
|
||||
repo = "tokstat";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-J144les0gxAFt34+r2hcikIyLKm+A1p8zNg+FljZ41o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-llS2UrJ9B+JSNkBUYioEEbe36lGgIr3ifjBXgPhTRnE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
dbus
|
||||
];
|
||||
|
||||
# For keyring support
|
||||
PKG_CONFIG_PATH = lib.optionalString stdenv.hostPlatform.isLinux "${dbus.dev}/lib/pkgconfig";
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
# Generate shell completions
|
||||
installShellCompletion --cmd tokstat \
|
||||
--bash <($out/bin/tokstat --generate bash 2>/dev/null) \
|
||||
--fish <($out/bin/tokstat --generate fish 2>/dev/null) \
|
||||
--zsh <($out/bin/tokstat --generate zsh 2>/dev/null)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "CLI application to monitor token quotas across multiple AI providers";
|
||||
homepage = "https://github.com/pbek/tokstat";
|
||||
changelog = "https://github.com/pbek/tokstat/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ pbek ];
|
||||
mainProgram = "tokstat";
|
||||
};
|
||||
})
|
||||
@@ -1,4 +1,5 @@
|
||||
{
|
||||
imagemagick,
|
||||
stdenv,
|
||||
symlinkJoin,
|
||||
torcs-without-data,
|
||||
@@ -20,7 +21,11 @@ let
|
||||
|
||||
installTargets = "export datainstall";
|
||||
postInstall = ''
|
||||
install -D -m644 Ticon.png $out/share/pixmaps/torcs.png
|
||||
mkdir -p $out/share/icons/hicolor/64x64/apps
|
||||
${imagemagick}/bin/magick Ticon.png -resize 64x64 $out/share/icons/hicolor/64x64/apps/torcs.png
|
||||
|
||||
substituteInPlace torcs.desktop \
|
||||
--replace-fail "Icon=torcs.png" "Icon=torcs"
|
||||
install -D -m644 torcs.desktop $out/share/applications/torcs.desktop
|
||||
'';
|
||||
|
||||
|
||||
@@ -76,7 +76,6 @@ python3Packages.buildPythonApplication {
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
danbst
|
||||
gbtb
|
||||
];
|
||||
};
|
||||
|
||||
@@ -45,11 +45,9 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 -t $out/share/applications assets/transito.desktop
|
||||
install -Dm644 -t $out/share/pixmaps assets/transito.png
|
||||
for icon in assets/transito_*.png
|
||||
do
|
||||
for icon in assets/transito_*.png; do
|
||||
name=$(basename $icon .png)
|
||||
install -Dm644 -t $out/share/icons/hicolor/''${name#transito_}/apps $icon
|
||||
install -Dm644 $icon $out/share/icons/hicolor/''${name#transito_}/apps/transito.png
|
||||
done
|
||||
'';
|
||||
|
||||
|
||||
@@ -64,8 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
EOF
|
||||
chmod +x $out/bin/trigger-rally
|
||||
|
||||
mkdir -p $out/share/pixmaps/
|
||||
ln -s $out/share/games/trigger-rally/icon/trigger-rally-icons.svg $out/share/pixmaps/trigger.svg
|
||||
install -Dm644 $out/share/games/trigger-rally/icon/trigger-rally-icons.svg $out/share/icons/hicolor/scalable/trigger.svg
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "twilio-cli";
|
||||
version = "6.2.3";
|
||||
version = "6.2.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-a5eTxtcC3cGZ+8MMMfE9UKrxAQ7pfivWMss4NMKbf9s=";
|
||||
hash = "sha256-ty5KBMXOo8MHF++xTFDC5IK+zAhXKEJ4XRAF/HHjkX0=";
|
||||
};
|
||||
|
||||
buildInputs = [ nodejs-slim ];
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "unpoller";
|
||||
version = "2.33.0";
|
||||
version = "2.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unpoller";
|
||||
repo = "unpoller";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-RPhM1oAQhwyNr4CjtxhrhVxw5NfO0lzOq3kx2OqzlwY=";
|
||||
hash = "sha256-zsWPXO0JgzMJwCvpWA/UzyXyrNJL2wFDstrVKeAZvPo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Z7Wb4nQMPr3og0wWWJp3jU8lTR6hhxMz7XENkanIgQg=";
|
||||
vendorHash = "sha256-yh2ErDf3YMvA+y52LfdB8u+uR/tW29h35UGB9r5bh8E=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "uv";
|
||||
version = "0.10.2";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7huzemS9BLCOmfzr2cSd8Tc4PtTJV0peYQ5FN2VaPKw=";
|
||||
hash = "sha256-+6u8rmTLwZlEvbnF7Ng/06uYcs6HJGAEyOhEwzYVHVE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kSpRcliQpCCjpZUSCwd9THszOSmdXDIooJA4ZPtRjvo=";
|
||||
cargoHash = "sha256-jpaOD98n0FBnYzexDiLhtHLRLmzSOZN38KKzcc+o5WQ=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
||||
@@ -22,16 +22,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "voxinput";
|
||||
version = "0.9.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "richiejp";
|
||||
repo = "VoxInput";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0fdzL8J84XNpriuIUfMUzYpopyDqNMwCYAlzw68pMN4=";
|
||||
hash = "sha256-Zb3tz8YuS2VJWXbr8+yBuL89vlDXadFowSzWuZ5a0WI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ngb5fXHeQLDhCFHICH7Uj57GOQcMPxF2eIJaDIhl7S0=";
|
||||
vendorHash = "sha256-NMuHvhN1A6TQ18Z1H8k8Sy7Py9744Xv95MZz0QvExQY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -6,20 +6,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wasm-tools";
|
||||
version = "1.245.0";
|
||||
version = "1.245.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = "wasm-tools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hGWKDy84Ok7uwzuMA2lg+Osd9JomMUXqInVSl4j+C94=";
|
||||
hash = "sha256-0x3RcGd8OB/XNvKnHihvc0DOnCqB3gxTQAxLK7HIWMI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
|
||||
auditable = false;
|
||||
|
||||
cargoHash = "sha256-K7b6Ine3/reAjQc6WwWXWHK2gR74u8MaY4rE0jDjFVs=";
|
||||
cargoHash = "sha256-5CIKmfa/hqR1Ge7reiTzyx0D4JMjBsxg2xqxzzZxl4s=";
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"wasm-tools"
|
||||
|
||||
@@ -81,10 +81,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook preInstall
|
||||
''
|
||||
+ lib.optionalString stdenv.isLinux ''
|
||||
mkdir -p $out/{bin,opt/Weasis,share/{applications,pixmaps}}
|
||||
mkdir -p $out/{bin,opt/Weasis,share/{applications,icons/hicolor/64x64/apps}}
|
||||
|
||||
mv weasis-${platform}-jdk${lib.versions.major jdk25.version}-${finalAttrs.version}/Weasis/* $out/opt/Weasis
|
||||
mv $out/opt/Weasis/lib/*.png $out/share/pixmaps/
|
||||
mv $out/opt/Weasis/lib/*.png $out/share/icons/hicolor/64x64/apps
|
||||
|
||||
for bin in $out/opt/Weasis/bin/*; do
|
||||
makeWrapper $bin $out/bin/$(basename $bin) \
|
||||
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mkdir -p "$out/share/whatsapp-electron"
|
||||
cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/whatsapp-electron"
|
||||
|
||||
install -D assets/whatsapp-icon-512x512.png $out/share/pixmaps/whatsapp.png
|
||||
install -D assets/whatsapp-icon-512x512.png $out/share/icons/hicolor/512x512/apps/whatsapp.png
|
||||
install -D assets/whatsapp-icon-512x512.svg $out/share/icons/hicolor/scalable/apps/whatsapp.svg
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
xdotool,
|
||||
makeDesktopItem,
|
||||
libayatana-appindicator,
|
||||
imagemagick,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
@@ -32,6 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
pkg-config
|
||||
imagemagick
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -52,7 +54,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 icon-192.png $out/share/pixmaps/windsend-rs.png
|
||||
mkdir -p $out/share/icons/hicolor/128x128/apps
|
||||
magick icon-192.png -resize 128x128 $out/share/icons/hicolor/128x128/apps/windsend-rs.png
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user