mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge release-26.05 into staging-next-26.05
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
c73f5373d4
90 changed files with 302 additions and 428 deletions
|
|
@ -56,38 +56,29 @@ in
|
|||
'';
|
||||
apply =
|
||||
steam:
|
||||
steam.override (
|
||||
prev:
|
||||
{
|
||||
extraEnv =
|
||||
(lib.optionalAttrs (cfg.extraCompatPackages != [ ]) {
|
||||
STEAM_EXTRA_COMPAT_TOOLS_PATHS = extraCompatPaths;
|
||||
})
|
||||
// (lib.optionalAttrs cfg.extest.enable {
|
||||
LD_PRELOAD = "${pkgs.pkgsi686Linux.extest}/lib/libextest.so";
|
||||
})
|
||||
// (prev.extraEnv or { });
|
||||
extraLibraries =
|
||||
pkgs:
|
||||
let
|
||||
prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ];
|
||||
additionalLibs =
|
||||
with config.hardware.graphics;
|
||||
if pkgs.stdenv.hostPlatform.is64bit then
|
||||
[ package ] ++ extraPackages
|
||||
else
|
||||
[ package32 ] ++ extraPackages32;
|
||||
in
|
||||
prevLibs ++ additionalLibs;
|
||||
extraPkgs = p: (cfg.extraPackages ++ lib.optionals (prev ? extraPkgs) (prev.extraPkgs p));
|
||||
}
|
||||
// lib.optionalAttrs (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice) {
|
||||
buildFHSEnv = pkgs.buildFHSEnv.override {
|
||||
# use the setuid wrapped bubblewrap
|
||||
bubblewrap = "${config.security.wrapperDir}/..";
|
||||
};
|
||||
}
|
||||
);
|
||||
steam.override (prev: {
|
||||
extraEnv =
|
||||
(lib.optionalAttrs (cfg.extraCompatPackages != [ ]) {
|
||||
STEAM_EXTRA_COMPAT_TOOLS_PATHS = extraCompatPaths;
|
||||
})
|
||||
// (lib.optionalAttrs cfg.extest.enable {
|
||||
LD_PRELOAD = "${pkgs.pkgsi686Linux.extest}/lib/libextest.so";
|
||||
})
|
||||
// (prev.extraEnv or { });
|
||||
extraLibraries =
|
||||
pkgs:
|
||||
let
|
||||
prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ];
|
||||
additionalLibs =
|
||||
with config.hardware.graphics;
|
||||
if pkgs.stdenv.hostPlatform.is64bit then
|
||||
[ package ] ++ extraPackages
|
||||
else
|
||||
[ package32 ] ++ extraPackages32;
|
||||
in
|
||||
prevLibs ++ additionalLibs;
|
||||
extraPkgs = p: (cfg.extraPackages ++ lib.optionals (prev ? extraPkgs) (prev.extraPkgs p));
|
||||
});
|
||||
description = ''
|
||||
The Steam package to use. Additional libraries are added from the system
|
||||
configuration to ensure graphics work properly.
|
||||
|
|
@ -218,16 +209,6 @@ in
|
|||
enable32Bit = true;
|
||||
};
|
||||
|
||||
security.wrappers = lib.mkIf (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice) {
|
||||
# needed or steam fails
|
||||
bwrap = {
|
||||
owner = "root";
|
||||
group = "root";
|
||||
source = "${pkgs.bubblewrap}/bin/bwrap";
|
||||
setuid = true;
|
||||
};
|
||||
};
|
||||
|
||||
programs.steam.extraPackages = cfg.fontPackages;
|
||||
|
||||
programs.gamescope.enable = lib.mkDefault cfg.gamescopeSession.enable;
|
||||
|
|
|
|||
|
|
@ -887,7 +887,7 @@ rec {
|
|||
# Docs in doc/build-helpers/fetchers.chapter.md
|
||||
# See https://nixos.org/manual/nixpkgs/unstable/#requirefile
|
||||
requireFile = lib.extendMkDerivation {
|
||||
constructDrv = stdenv.mkDerivation;
|
||||
constructDrv = stdenvNoCC.mkDerivation;
|
||||
|
||||
excludeDrvArgNames = [
|
||||
"hash"
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ recurseIntoAttrs {
|
|||
symlinkJoin = recurseIntoAttrs (callPackage ./symlink-join.nix { });
|
||||
overriding = callPackage ../test-overriding.nix { };
|
||||
inherit references;
|
||||
requireFile = callPackage ./requireFile.nix { };
|
||||
writeCBin = callPackage ./writeCBin.nix { };
|
||||
writeClosure-union = callPackage ./writeClosure-union.nix {
|
||||
inherit (references) samples;
|
||||
|
|
|
|||
22
pkgs/build-support/trivial-builders/test/requireFile.nix
Normal file
22
pkgs/build-support/trivial-builders/test/requireFile.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{
|
||||
pkgsStatic,
|
||||
lib,
|
||||
requireFile,
|
||||
emptyFile,
|
||||
}:
|
||||
let
|
||||
name = "this-is-a-test";
|
||||
requireFileTest =
|
||||
requireFile:
|
||||
requireFile {
|
||||
inherit name;
|
||||
url = "this-is-a-test";
|
||||
hash = lib.fakeHash;
|
||||
};
|
||||
requireFile-native = requireFileTest requireFile;
|
||||
requireFile-static = requireFileTest pkgsStatic.requireFile;
|
||||
in
|
||||
assert lib.assertMsg (
|
||||
requireFile-native.name == name && requireFile-static.name == name
|
||||
) "requireFile derivation name must be the same across different package sets";
|
||||
emptyFile
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blackfire";
|
||||
version = "2.29.7";
|
||||
version = "2026.6.0";
|
||||
|
||||
src =
|
||||
passthru.sources.${stdenv.hostPlatform.system}
|
||||
|
|
@ -60,23 +60,23 @@ stdenv.mkDerivation rec {
|
|||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
|
||||
sha256 = "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=";
|
||||
hash = "sha256-JPhh7LNiLZXLN5iycNobZ/uJQjOhKqqYSw9P78+/BKk=";
|
||||
};
|
||||
"i686-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
|
||||
sha256 = "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=";
|
||||
hash = "sha256-uoqUDJ/bexqaRlf5Y692OGm91W1ErlS8Q8/l9MlsHwU=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
|
||||
sha256 = "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=";
|
||||
hash = "sha256-kL9s17Bnt8UYj3IiX2b7e3OWSsRLq5TSzdK6OdByD40=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
|
||||
sha256 = "TvxIm4plE7nnTIkJNfCzxzr2r0B2Aqlxdveb1M+sqL4=";
|
||||
hash = "sha256-p9D87uaDVu25SG4cclmzaq9oKaFDlIy8/XLx3rHuIQ4=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
|
||||
sha256 = "oNDNIPBqvaARz9W967bxuvo2bpPORiHci3sryGqznsU=";
|
||||
hash = "sha256-ppCSvk259NNlujl9olyRlmwRdNbLu/uRs+gq71S79B8=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://blackfire.io/";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ spk ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
|
|
|
|||
|
|
@ -16,57 +16,57 @@ let
|
|||
phpMajor = lib.versions.majorMinor php.version;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
||||
version = "1.92.51";
|
||||
version = "2026.5.0";
|
||||
|
||||
hashes = {
|
||||
"x86_64-linux" = {
|
||||
system = "amd64";
|
||||
hash = {
|
||||
"8.1" = "sha256-HxVqkPupo3LrKfbQGOqoxpGJjFN17Jlkdya4BjBsBVw=";
|
||||
"8.2" = "sha256-ssbMa4Wa27nwhJZ16FT+qrB4LH/HztOtCx+MI+i16Pg=";
|
||||
"8.3" = "sha256-p9SXxHQGmsjtSeRFt9vYS5XK6nouT7qbqmlWbEpb2Hk=";
|
||||
"8.4" = "sha256-ArI/SNjPIbjwEBMHvKCdSOkth8qqBWT6W0RnoWyWA+o=";
|
||||
"8.5" = "sha256-5e4f9iEn5QPZY6Z+05O7QxTwaW+cjmP6nB5fkpValoM=";
|
||||
"8.1" = "sha256-FQzmRL1Dk4HBnrfbfOclDWGvqflFXTUMK8b1NLIb880=";
|
||||
"8.2" = "sha256-e2+hVsoBXt8gURRvGC4bgAkLpB1GriefokAjFFUuO8c=";
|
||||
"8.3" = "sha256-C/NsbJ8XlkBPlZ0lPeNL4SWxfVWSLxvQYDxTVf2PfyA=";
|
||||
"8.4" = "sha256-gqEV9thI/oe38/dyrGZxhPtv4+ufzMDXJL0zgt8IbOA=";
|
||||
"8.5" = "sha256-kw57CBFOcRpaToXD/V2veXjcQnVaM3uTLC3tgrKyNzc=";
|
||||
};
|
||||
};
|
||||
"i686-linux" = {
|
||||
system = "i386";
|
||||
hash = {
|
||||
"8.1" = "sha256-mTw8v5DaP7D5qb3XwRZvx8XH4bTiuu2xzzo82KsrrZU=";
|
||||
"8.2" = "sha256-Vtb0DVfPBC0JtK1XOPQ8KmA0Jq0pBBA3jkDaCV7icGg=";
|
||||
"8.3" = "sha256-vnL8gfA6ejMcpnfKXalSOvl7vixwQLJBC3DTO4Dafow=";
|
||||
"8.4" = "sha256-x9/BcZPJib0hal6M2vUVk1cLmN1gc3k6hypViTqForo=";
|
||||
"8.5" = "sha256-aVmQ8vHS/oQeb44RyV5hggOt+VXLqP7wKDxgfpbopQQ=";
|
||||
"8.1" = "sha256-Cccapa4s6Wvo/MOjReCbbJY4H1HNe5uF8Fe4UX8ftFs=";
|
||||
"8.2" = "sha256-1k8m4Mram806XIbR4x0Kf6IH7rvhbLbaqPgM9v1SHS4=";
|
||||
"8.3" = "sha256-Si0boOO5BRDKARZbAbPPrxRIaUjwViQLepZ5tNvkjGk=";
|
||||
"8.4" = "sha256-BOjlJy48fS2SWK28Lcd9/MVhciDEaBJe6mRIhTa9JhI=";
|
||||
"8.5" = "sha256-OBySA7eGI+YqvMnsOlr7p6RznqYq7DJptnYjhMfqk2Q=";
|
||||
};
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
system = "arm64";
|
||||
hash = {
|
||||
"8.1" = "sha256-S41qr5wU2dsK0IBsR/mTALguPQU+SKYVTLP7DwGQo40=";
|
||||
"8.2" = "sha256-eQkvDRxwQNXlkZ9XzcSRfkKjp/CTZGaFwolXq6TZWaE=";
|
||||
"8.3" = "sha256-GBjjx0cSJjYCOdDiArUPA4iqOcgpk3y9o0wi6b6UJgM=";
|
||||
"8.4" = "sha256-s4zcHogsOy1GjTAGJuO6i7S6dp/lmRVzbjJk3/t8Zn4=";
|
||||
"8.5" = "sha256-/lFwv6p9izXj7X+pqZe9clcp+wSYtzIPnwqeE/HFqNk=";
|
||||
"8.1" = "sha256-Od+c9X4yg4xW9aAI0x1CacUNp7PdJl1KRIi++m4DLY8=";
|
||||
"8.2" = "sha256-ZI2n0lXkwUg8BvpjdhqHz1F3Z7dlX+oGv6IsjRVzzWA=";
|
||||
"8.3" = "sha256-6NMvylxdwPpbmIN5EDVcBuplP2kEQDyY+fD23k89k48=";
|
||||
"8.4" = "sha256-356ECFSrqu5kJX/qP+SNtKl7bsGGD/ROJd9vgEX5wSM=";
|
||||
"8.5" = "sha256-z7GMQ9wqIr2/BKi3G2Wf3cZBtU/ZC+uKMcbnmYfmm8w=";
|
||||
};
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
system = "arm64";
|
||||
hash = {
|
||||
"8.1" = "sha256-+ko465G24UELdMmEg4ZqOA9p0/0DSs3p+On6Gg2IVMM=";
|
||||
"8.2" = "sha256-TERILY6E1vnl+L6t+oel+1H3HTHWTTeEb1rVXtriJ8w=";
|
||||
"8.3" = "sha256-R5Ue3erVCe1gOPk1SuDRXGA05WPm1IisHCnbXfmjFcw=";
|
||||
"8.4" = "sha256-qqbmZa4qd7Ck87GylHeHP9m3K47DAEiTxlKdtXEnzVo=";
|
||||
"8.5" = "sha256-3d9glqfXCMXwtLZm8fuj9DVzCIczynX7MRxnbMC7/NE=";
|
||||
"8.1" = "sha256-vlb6HCz9KqSL+bSuVixiHVgVVkEAuCaoR7ww0/ZSdR8=";
|
||||
"8.2" = "sha256-3XVHonZ7UW3LENuKgywyZ5q3Mo/6XBhnbiuARRGqPAg=";
|
||||
"8.3" = "sha256-Dw+L0Bo/6BeFi+w3sm5kekR0mXoMUcsCuEksCdFpVA0=";
|
||||
"8.4" = "sha256-i5R+vUn08yNWvPaJGRRHBPAbpxdqDmvPq3l9NPCuqxg=";
|
||||
"8.5" = "sha256-vyBbyS8Y1mD+zFO01bMbim8Riq45+ns9YA4k41KQup8=";
|
||||
};
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
system = "amd64";
|
||||
hash = {
|
||||
"8.1" = "sha256-XvV6x8LKjR4j081PIdKpYCVl+ayXOmPsXf+gsMeFOro=";
|
||||
"8.2" = "sha256-qxFWj1HpWokwzsFTiRhi4vw67H8yLwu1xbhja+fAxqY=";
|
||||
"8.3" = "sha256-ffrwc48MZzX0MJHbaDmWQpday1LicOxhR2+fwylItD0=";
|
||||
"8.4" = "sha256-P8j8gc8lZRbuVd1UmSpYmle88h50vhJfNxTZp3v9/Sg=";
|
||||
"8.5" = "sha256-zy24hLCTajY+BVdkJCiXoy8abhQ82Ntw7Wuqn6zJKOQ=";
|
||||
"8.1" = "sha256-0xf09E58+kOGZbfpUeaCNdeeJx/Sv4QazfgcdV3Fqho=";
|
||||
"8.2" = "sha256-BU3INTjuVXJ+WB16Q/6I1I5y0k+7sR158vKOiuh6H4w=";
|
||||
"8.3" = "sha256-TBTuabrEpQR7ff+ULjZCD99a1xX4KNjTWlMQTJ1l6NU=";
|
||||
"8.4" = "sha256-45R0CrE6MZ4RU4HslaF5/jbMOz32fCMnzj8R1F9tu34=";
|
||||
"8.5" = "sha256-40+kki7h6DLQemLyoKOSdd8hmQXJE+Yt4rcC4V706vs=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "Blackfire Profiler PHP module";
|
||||
homepage = "https://blackfire.io/";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ spk ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
|
|
|
|||
|
|
@ -3,24 +3,24 @@
|
|||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.91.168";
|
||||
version = "1.91.171";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-lH1AvdAkhpQtaGdMtbKfnm8bA4w5DpgM7fEEWsSVcoA=";
|
||||
hash = "sha256-a2FTFaICNqeoKwz8YKs4F16IFNibcyhCAFcpUdwPdqU=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-5xW0HhDM9cgh7h0hQ+B0NxaHw7DObLSXzgwixo+jNtc=";
|
||||
hash = "sha256-fiMT0JzhaGUlqgb1XO6L3yIpCna+An33c7bbVmEQBKE=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-kE4/GSEL4dDTy4aqqg6JqyzNIlCcIDGdPxAgCAPEN3Q=";
|
||||
hash = "sha256-o08YNk4iIzQezFcnOutVbHl4X4D7aDbaJZsUij6CWp4=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-ocRwDMegXcGMFRQSVVTNjT/OlHlNiTHYCjHWJSaz1Z8=";
|
||||
hash = "sha256-eOLBGLPcd8/WfZa/ndXPQSI1MtjND8593HXyU34mITE=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -20,17 +20,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-applets";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-applets";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-JeV29myWGiLagaFOGAtK1MAIJVxYINe5TuNiArfBq54=";
|
||||
hash = "sha256-o+rEO+IA337fhpq6TsH+UZEN7kb/PqydlKo77NyCRcM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gA+dpodk6u8dv9VaKNi/xzI8ys39iztQdia+eGkzXs4=";
|
||||
cargoHash = "sha256-tbGuyqdDTsKYpKxeAuachwbPHTPhmb9Sg3qzxHYosjo=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -11,17 +11,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-applibrary";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-applibrary";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-IgRKdhs07FK8G4yRb+0d8JFKZv3Zkq/tp2pC4epkxaM=";
|
||||
hash = "sha256-mzHSLZK6HienbPRPetSj+XbPWCnpihEvMx9W9lJWpbA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uR0wm2+zmcec3esfYwgq4pRqSHkZnd3O8XhgnANf/1Q=";
|
||||
cargoHash = "sha256-qGx/3w78mgIMqRo1wJA+ULFHWdNW2LKe2Sej4f9KbVs=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-bg";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -20,17 +20,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-comp";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-comp";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-sjWNWpwq3fWA7HQV6faP1VTFGfs/e0G0UgHuKk44Kak=";
|
||||
hash = "sha256-3WPZk/o+cfq3wwKEuYejMh+pn2o823m98OO3crFaNX4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-G2/nVy9I4iGZiG3+uVMnnqj82Wg2s5/SmNyQERqDhXY=";
|
||||
cargoHash = "sha256-ki+unf58rXBCpj5PCpBcg/6FWo16+MdPQWae+w1YkJ8=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -16,17 +16,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-edit";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-edit";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-KqdAz5CG9Gdsw/yWHCDhLwXNvmcASyzA6jdpbfcy3pM=";
|
||||
hash = "sha256-almnWrJSV5xZoBDEuk0pfMZ/c00e0xpDNTTbcq+NCYM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-y7EpJrVq5dVP/t3UTsZrPbiHWGsFieLPo/DH0eM5OQE=";
|
||||
cargoHash = "sha256-/qcpAR2nvC/MYa5QuCLiZFQgos5SlYtspZsNuMLJFHk=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -12,17 +12,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-files";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-files";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-/5PPDs2rDEGOMShclh+ZnX28zuF3MbQ7W+Rze1xIPu4=";
|
||||
hash = "sha256-2vrk1hYL7E/vVWiLcOYY3O0cmYZyFG4bdkNDFuyA+cA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1sY/V+/hd4vzjiufdLR8BIG5FC0F2sLbe8M2VqbinEU=";
|
||||
cargoHash = "sha256-QPFGsn1J0lp5K4gLdar/Z5MmZg+VOoCZd1U8LUuLXqM=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-greeter";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-greeter";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-+bxBm/IlOW4XKZhJDlr7Bp5h3sGIdVbTz1If5XWXkek=";
|
||||
hash = "sha256-+6VOv6z61k48hURq4yRRMIFIE8ZrjYGapO5FybWKQTE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mfY2hsMxBooRjmTB2jgUIKyKHBpGfZ9Qslwv+2aEQyg=";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-icons";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-idle";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-initial-setup";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-initial-setup";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-kAxGSXQ4w9rrcrFwtSPp22kZ5Uw6WhZ442i82v3ALRw=";
|
||||
hash = "sha256-3nGPBWYDqPJN99WtzsAVERucwiVAFynuUk2gezZ/RJU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DESnl5NjakU4++Ep6CHxDZzHn+o0Gi0eREpXk5BN5iY=";
|
||||
|
|
|
|||
|
|
@ -11,17 +11,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-launcher";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-launcher";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-dJxa11PCXpyN4m+bulcVGpqi6tphcVqNn7H2CgMHzPc=";
|
||||
hash = "sha256-ZivzjufT2UlPi/En1AjGS8TfeFNdJDfDUd9cb2Begb8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wZgxlq9MVCeESH093MaQybVMyq50L7aYwj//2r/B0QM=";
|
||||
cargoHash = "sha256-WnZAPQR8hGGNC5S7hPmcGSMs9HrOw4/wqJR151eIgHY=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-notifications";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 8b6704e..64c1691 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1104,7 +1104,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-settings-airplane-mode-subscription"
|
||||
version = "1.0.7"
|
||||
-source = "git+https://github.com/pop-os/cosmic-settings#78644a32e3741f8f80e9b8ce65c3550c85f9c1f8"
|
||||
+source = "git+https://github.com/pop-os/cosmic-settings#81912bed6cdebe2719e29e6bd1453e7b977acb0e"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"iced_futures",
|
||||
@@ -1150,7 +1150,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-settings-pulse-subscription"
|
||||
version = "0.1.0"
|
||||
-source = "git+https://github.com/pop-os/cosmic-settings#78644a32e3741f8f80e9b8ce65c3550c85f9c1f8"
|
||||
+source = "git+https://github.com/pop-os/cosmic-settings#81912bed6cdebe2719e29e6bd1453e7b977acb0e"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"iced_futures",
|
||||
@@ -1162,7 +1162,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-settings-upower-subscription"
|
||||
version = "1.0.7"
|
||||
-source = "git+https://github.com/pop-os/cosmic-settings#78644a32e3741f8f80e9b8ce65c3550c85f9c1f8"
|
||||
+source = "git+https://github.com/pop-os/cosmic-settings#81912bed6cdebe2719e29e6bd1453e7b977acb0e"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"iced_futures",
|
||||
|
|
@ -15,17 +15,24 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-osd";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-osd";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-zQL4kr7QpGKHD8Jwqv5h/U+QrCiHW5MEYTz+2/Oo1zY=";
|
||||
hash = "sha256-jv28hxhQUcUDLnOwU3xQJwCU+s52pwDNs8Gf4I5Hp9k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1YRWWI2qhCI0GrxBAAkGT/AbtkTHgdbYsG8obriZ+zg=";
|
||||
cargoHash = "sha256-YwZXlhggrUddxour+/S1mSL3Fq1mzvFaOHArLSnfPvc=";
|
||||
|
||||
cargoPatches = [
|
||||
# A different reference to the `cargo-settings` crate was added in:
|
||||
# <https://github.com/pop-os/cosmic-osd/pull/204>
|
||||
# Remove this patch once upstream fixes their lockfile.
|
||||
./deduplicate-cosmic-settings-crate.patch
|
||||
];
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -11,17 +11,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-panel";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-panel";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-1yry1cA/friBzyE6LH3G6rd8ZzBPt5aTGWVzATO839Y=";
|
||||
hash = "sha256-MNOS7HMlyvU4zCZVINthgZgBsUn+LI1hUAEcwSq+zaE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vU++jreNHCRjxyyoj53LB2Sa7cdVUWGAvECcqoDofF8=";
|
||||
cargoHash = "sha256-6E+bAi1f6gOZh64wyvLMKZiZNlMexPV+ZzS3riOx9xM=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -18,17 +18,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-player";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-player";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-UBZArnQqCtEHJAzfHKSdJaSmyuaAokqqIDad5vXYIZo=";
|
||||
hash = "sha256-iDEyR+P+iXShH0YFtqxvPbbs9kgtYvAsuKchB6plnKI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-g/czcqTn6SPPkpM5jk4RCUGCd5o99gnMjddU0fhsYVI=";
|
||||
cargoHash = "sha256-YzT16Ej+AyLLj8uHuHxZvHWujcW8jLjVg/4MmPyorH4=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-randr";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -19,16 +19,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-reader";
|
||||
version = "0-unstable-2026-05-12";
|
||||
version = "0-unstable-2026-06-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-reader";
|
||||
rev = "0dde6aed2c51b16e48d2756ceeb0c92620442418";
|
||||
hash = "sha256-Is6SRWn7BbsT6GRsmPMDxQNzdGxSMXKM3hNVMV2NM7c=";
|
||||
rev = "31485419db10e12c2942029d673836343e4609dd";
|
||||
hash = "sha256-XZ5A7Qi+sxlUel1Fpr9wy8o0MD9mtyqFIwBN4Rf7CcU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-p0dg5RNXkzbi+/RB5k+jr34RNOp+Irahj0BiFUddfnk=";
|
||||
cargoHash = "sha256-DPGpGWzAgdpHp3qzksLtLnfqk+DJsaukdT2ekFFiGaM=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-screenshot";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-screenshot";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-0vJ2vnmM9IiP7llil8BQN/YU/fmlLIOoJTQpp8o/OrA=";
|
||||
hash = "sha256-DngKZDKfgVdSZLZAsPq+7p4r/go2Y6141LrCNGoxD1E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-q0RJST1yeqPBjU5MseNZIrZw+brfDtQLKiw7wyViflE=";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-session";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-settings-daemon";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-settings-daemon";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-CKJcVYLuLJNqvmgDM+ugVojgzmG7WAVEAGmEkUyTs3c=";
|
||||
hash = "sha256-A+nOAadFWU+KRW54dP2WW6P6fabIs4z1AqC37LSZjUI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
--replace-fail '/usr/share/themes/adw-gtk3' '${adw-gtk3}/share/themes/adw-gtk3'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-pvoCqFvMVqNTfdU5WidGijfFNsC9i2XNuNV33F8aKZw=";
|
||||
cargoHash = "sha256-bz+JasI3WE30sKKgjofVO/42Ml4YY9Dw3JxnZmZVQk4=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -27,17 +27,17 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-settings";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-settings";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-idENXrYf92iVuw2Gb+8725nXfSNKoFMraDRaC+KcE0o=";
|
||||
hash = "sha256-knA3qpFeRRlUMV91+LleaWxb1fexX2IJlMRD81fl7l4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-O6d47H+vcSn9G6EIMpSshfL+cBJWZMYXHHKsu2n/huk=";
|
||||
cargoHash = "sha256-2ZHuOmtBzXQ/KSBMKus9LbojfByYzzCjIkbGY8C85bU=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -15,17 +15,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-store";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-store";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-4jD9Rv4K0xaqNvepbWIJ7BP3XzMErda4wcafJkSilJ0=";
|
||||
hash = "sha256-JE8LcFlhG4e3QqobzUNfCw3Eg10+FrlVuQu+J+96/es=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uK9qXc6A1b1J/KOocUee2oVnVkubX0S7qtEwKcPwulI=";
|
||||
cargoHash = "sha256-+lOt+mSTKKsSm3UzGXq43ZjbktiCCV8dnHdvnnx2vqA=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -15,17 +15,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-term";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-term";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-AG/yQg9LNmbB2K0SWAl2DEIcphdihEVhMBeIx3i76tk=";
|
||||
hash = "sha256-nDTDGtaGRW0JM48/tbWO/NK1WhGkPwlsqfWrDGvFE9A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AYByonKIZWfNdaRIWijAv/8KUcO114hbZRH7Dx/MId8=";
|
||||
cargoHash = "sha256-0W1TU1NIcV9fx/vgKpPLqLO1fcdtbZX5Ds1uQWGJ2C8=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-wallpapers";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-workspaces-epoch";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-workspaces-epoch";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-TdV/HeqUjaQcjAUDf5IP1GVwpc1gJEuOnu3Y0MlZoVs=";
|
||||
hash = "sha256-u4p22qpxZPdBogzrJXGomqGGxgkpD0hdXf+3YNg2VIo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Z5dC3W8QoDBZWBjHwRj9MC8EScDjQwUiUcOPTRDToDA=";
|
||||
|
|
|
|||
|
|
@ -6,26 +6,27 @@
|
|||
lib,
|
||||
libayatana-appindicator,
|
||||
libcanberra-gtk3,
|
||||
lsfg-vk,
|
||||
meson,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
python3Packages,
|
||||
umu-launcher,
|
||||
lsfg-vk,
|
||||
vulkan-tools,
|
||||
wrapGAppsHook3,
|
||||
xdg-utils,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "faugus-launcher";
|
||||
version = "1.16.6";
|
||||
version = "1.20.4";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Faugus";
|
||||
repo = "faugus-launcher";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-VVLq11jq7fGKgQske/FnQEkwcneuKWOvXFr4eUGHYTw=";
|
||||
hash = "sha256-Kt6ZZ5yivbRzlgV+ovWiZVolxjmquAifJ/0lk1oL4fA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -42,24 +43,25 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
|||
dependencies = with python3Packages; [
|
||||
pillow
|
||||
psutil
|
||||
pygame
|
||||
pygobject3
|
||||
requests
|
||||
vdf
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace faugus_launcher.py \
|
||||
--replace-fail "PathManager.find_binary('faugus-run')" "'$out/bin/.faugus-run-wrapped'" \
|
||||
--replace-fail "PathManager.find_binary('faugus-proton-manager')" "'$out/bin/.faugus-proton-manager-wrapped'" \
|
||||
substituteInPlace faugus-launcher \
|
||||
--replace-fail "/usr/bin/python3" "${python3Packages.python.interpreter}"
|
||||
|
||||
substituteInPlace faugus/launcher.py \
|
||||
--replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'" \
|
||||
--replace-fail "/usr/lib/extensions/vulkan/lsfgvk/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \
|
||||
--replace-fail "/usr/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \
|
||||
--replace-fail 'Exec={faugus_run}' 'Exec=faugus-run'
|
||||
--replace-fail "/usr/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so"
|
||||
|
||||
substituteInPlace faugus_run.py \
|
||||
substituteInPlace faugus/runner.py \
|
||||
--replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'"
|
||||
|
||||
substituteInPlace faugus_shortcut.py \
|
||||
substituteInPlace faugus/shortcut.py \
|
||||
--replace-fail "/usr/lib/extensions/vulkan/lsfgvk/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \
|
||||
--replace-fail "/usr/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so"
|
||||
'';
|
||||
|
|
@ -69,16 +71,19 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
|||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
--suffix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH"
|
||||
--suffix PATH : "${
|
||||
lib.makeBinPath [
|
||||
icoextract
|
||||
imagemagick
|
||||
libcanberra-gtk3
|
||||
umu-launcher
|
||||
vulkan-tools
|
||||
xdg-utils
|
||||
]
|
||||
}"
|
||||
)
|
||||
wrapProgram $out/bin/faugus-launcher ''${makeWrapperArgs[@]}
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
foks,
|
||||
pcsclite,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
buildPackages,
|
||||
}:
|
||||
let
|
||||
templFoks = buildPackages.templ.overrideAttrs (old: {
|
||||
pname = "templ-foks";
|
||||
version = "0.3.833";
|
||||
src = old.src.override {
|
||||
hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8=";
|
||||
};
|
||||
vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM=";
|
||||
});
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "foks-server";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foks-proj";
|
||||
repo = "go-foks";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UZ4BZ2/S44hnG+uLHtWR/qqQtr6tbbQbQOgIrN4ciT0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+ysHa5KNhoxtoXPgOWC9ZDJKYqF+84s7oyxRib2S6a8=";
|
||||
|
||||
postPatch = ''
|
||||
cd ./server/web/templates
|
||||
templ generate
|
||||
cd -
|
||||
'';
|
||||
postInstall = ''
|
||||
ln -s $out/bin/{foks-server,git-remote-foks}
|
||||
'';
|
||||
|
||||
subPackages = [ "server/foks-server" ];
|
||||
excludedPackages = [ "server" ];
|
||||
|
||||
buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ pcsclite ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
templFoks
|
||||
foks
|
||||
];
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "Federated key management and distribution system";
|
||||
homepage = "https://foks.pub";
|
||||
downloadPage = "https://github.com/foks-proj/go-foks";
|
||||
changelog = "https://github.com/foks-proj/go-foks/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ poptart ];
|
||||
mainProgram = "foks";
|
||||
};
|
||||
})
|
||||
|
|
@ -1,54 +1,72 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
buildPackages,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
|
||||
pcsclite,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
templ,
|
||||
buildPackages,
|
||||
foks, # self
|
||||
|
||||
server ? false,
|
||||
}:
|
||||
let
|
||||
templFoks = buildPackages.templ.overrideAttrs (old: {
|
||||
pname = "templ-foks";
|
||||
version = "0.3.833";
|
||||
src = old.src.override {
|
||||
hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8=";
|
||||
};
|
||||
vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM=";
|
||||
});
|
||||
client = !server;
|
||||
pname = if server then "foks-server" else "foks";
|
||||
subPackages = if server then [ "server/foks-server" ] else [ "client/foks" ];
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "foks";
|
||||
version = "0.1.7";
|
||||
inherit pname;
|
||||
version = "0.1.8";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foks-proj";
|
||||
repo = "go-foks";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UZ4BZ2/S44hnG+uLHtWR/qqQtr6tbbQbQOgIrN4ciT0=";
|
||||
hash = "sha256-JY0ec+LNRQf0S8gTeazvQhvQ7LRM3zz1qvopGPaKM1k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+ysHa5KNhoxtoXPgOWC9ZDJKYqF+84s7oyxRib2S6a8=";
|
||||
vendorHash = "sha256-W0lyLy7k3xin8VSdxNgeh1FpHprOKIDduHIW3Oqk1LY=";
|
||||
|
||||
postPatch = ''
|
||||
cd ./server/web/templates
|
||||
${templFoks}/bin/templ generate
|
||||
templ generate
|
||||
cd -
|
||||
'';
|
||||
postInstall = ''
|
||||
|
||||
inherit subPackages;
|
||||
excludedPackages = [ "server" ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
finalAttrs.passthru.templ
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString client ''
|
||||
ln -s $out/bin/{foks,git-remote-foks}
|
||||
'';
|
||||
|
||||
subPackages = [ "client/foks" ];
|
||||
excludedPackages = [ "server" ];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgramArg = "version";
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ pcsclite ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
__structuredAttrs = true;
|
||||
passthru = {
|
||||
templ = buildPackages.templ.overrideAttrs (old: {
|
||||
pname = "templ-foks";
|
||||
version = "0.3.833";
|
||||
src = old.src.override {
|
||||
hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8=";
|
||||
};
|
||||
vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM=";
|
||||
});
|
||||
server = foks.override { server = true; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Federated key management and distribution system";
|
||||
|
|
@ -56,7 +74,10 @@ buildGoModule (finalAttrs: {
|
|||
downloadPage = "https://github.com/foks-proj/go-foks";
|
||||
changelog = "https://github.com/foks-proj/go-foks/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ poptart ];
|
||||
mainProgram = "foks";
|
||||
maintainers = with lib.maintainers; [
|
||||
poptart
|
||||
phanirithvij
|
||||
];
|
||||
mainProgram = pname;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "jackett";
|
||||
version = "0.24.2021";
|
||||
version = "0.24.2066";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jackett";
|
||||
repo = "jackett";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/9NDFedtjMholM3Doqt/5hJ+Zw68DJheWNxZ0X+Kvuk=";
|
||||
hash = "sha256-hK7QfztI3kFJcOG9OTQ5/lOusFKnv8AyNfCaU9IhdKE=";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "p2pool";
|
||||
version = "4.14";
|
||||
version = "4.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SChernykh";
|
||||
repo = "p2pool";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-osVzCx5h52qbSG4iwd3r7lsxtkqakGDJp6W3Xfs0t4E=";
|
||||
hash = "sha256-PXJT+hFLD4LSy11/FvzDhi3RdsDYuzcxqr3nYn5XzDk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -51,16 +51,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rio";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raphamorim";
|
||||
repo = "rio";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fjPuB2/sEXsE8gnnvDLU5a6Qgac3crbs7v/kOlUhtZE=";
|
||||
hash = "sha256-ON7CJ1NDwLfjvLZ0ugN45LUjBGiwRNASiQwuDa6F1vM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4J9JppiaL377m2THRZhxCkDuHJggJBCHhnWaV1E0fIA=";
|
||||
cargoHash = "sha256-vSQ5heZZ8tYKeMABhZ8AziEAniavnAasH04BVlqYF4g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@ let
|
|||
in
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "sub-store-frontend";
|
||||
version = "2.17.31";
|
||||
version = "2.17.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sub-store-org";
|
||||
repo = "Sub-Store-Front-End";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-/L5qdjqXZ8MjEjOGT8e8vdS/F9uudkemboAVrYih0Zc=";
|
||||
hash = "sha256-tMmoq9y3NvuOoKhEN2/d0nrq2Y8+7VMYo6+OP/q67I8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
SDL2_ttf,
|
||||
boost,
|
||||
cmake,
|
||||
gettext,
|
||||
fetchFromGitHub,
|
||||
ffmpeg,
|
||||
fuzzylite,
|
||||
|
|
@ -30,16 +31,27 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pname = "vcmi";
|
||||
version = "1.7.4";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vcmi";
|
||||
repo = "vcmi";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-uzdnRKF0xb2B2r6kTzk6OEDGBdOwcu9eGYsvv4ALCF0=";
|
||||
# Disable git background maintenance for the whole prefetch, including submodule clones.
|
||||
# Upstream nix-prefetch-git only disables it on the outer repo (NixOS/nixpkgs#524215), so
|
||||
# submodule clones can still race with their own maintenance and break `.git` cleanup.
|
||||
preFetch = ''
|
||||
export GIT_CONFIG_GLOBAL="$TMPDIR/gitconfig"
|
||||
printf '[maintenance]\n\tauto = false\n' > "$GIT_CONFIG_GLOBAL"
|
||||
'';
|
||||
hash = "sha256-iV1twkoOJyUsUkq17mdTYk1YvfmUtLHdtR3H77BoNJk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gettext # msgfmt
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
|
|
@ -98,13 +110,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/vcmiclient";
|
||||
versionCheckProgramArg = "--version";
|
||||
versionCheckKeepEnvironment = [
|
||||
"XDG_CACHE_HOME"
|
||||
"XDG_CONFIG_HOME"
|
||||
"XDG_DATA_HOME"
|
||||
];
|
||||
preVersionCheck = ''
|
||||
cd $(mktemp -d)
|
||||
export \
|
||||
XDG_CACHE_HOME="$TMPDIR" \
|
||||
XDG_CONFIG_HOME="$TMPDIR" \
|
||||
|
|
|
|||
19
pkgs/by-name/wa/wasm-bindgen-cli_0_2_120/package.nix
Normal file
19
pkgs/by-name/wa/wasm-bindgen-cli_0_2_120/package.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{
|
||||
buildWasmBindgenCli,
|
||||
fetchCrate,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
buildWasmBindgenCli rec {
|
||||
src = fetchCrate {
|
||||
pname = "wasm-bindgen-cli";
|
||||
version = "0.2.120";
|
||||
hash = "sha256-Dkkx8Bhfk+y/jEz9Fzwytmv2N3Gj/7ST+5MlPRzzetU=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
inherit (src) pname version;
|
||||
hash = "sha256-5Zu/Sh9aBMxB+KGC1MHWJAQ8PuE40M6lsenkpFEwJ6A=";
|
||||
};
|
||||
}
|
||||
|
|
@ -17,17 +17,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "xdg-desktop-portal-cosmic";
|
||||
version = "1.0.13";
|
||||
version = "1.0.16";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "xdg-desktop-portal-cosmic";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-/mUSpPdv8cSJ2oAuwIAYXjpy0Zy9ERarWMUrLEKf9a0=";
|
||||
hash = "sha256-LwZqF3Yg4DMis21wtu1XMAoPTjJ39GPrf07K9Yc2YAg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/7jxEktXW1+4nFK7ZFUO3oJhmLNuKMwErnqwgjBQiao=";
|
||||
cargoHash = "sha256-wSwXzaU872KqcRgAIKRuQFvG9f/q4z0OysysLyYMwdg=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -13,17 +13,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "yarn-berry-${toString berryVersion}-fetcher";
|
||||
version = "1.2.3";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "cyberchaos.dev";
|
||||
owner = "yuka";
|
||||
repo = "yarn-berry-fetcher";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Qfhx1lwd050GabP2Xj0kRi4nIlOHUE4xbZO0kO0IJ8A=";
|
||||
hash = "sha256-4dT01SgTPwo9Vw7WIKtdRVP5+dd45YsTPOuf3V6SJg8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tOu1x8kmVCXKvthV0xyzisTb7BwOtfWTyu/cv4HRbpc=";
|
||||
cargoHash = "sha256-l8zTzr2y8i2ENb8iadIBz59YLmNwfDZcrbUqIUibFqg=";
|
||||
|
||||
env.YARN_ZIP_SUPPORTED_CACHE_VERSION = berryCacheVersion;
|
||||
env.LIBZIP_SYS_USE_PKG_CONFIG = 1;
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
From faa694a7171a06f83034fd869adc4cffa2ae0c18 Mon Sep 17 00:00:00 2001
|
||||
From: laurensmiers <laurensmiers@protonmail.com>
|
||||
Date: Wed, 22 Oct 2025 14:50:23 +0200
|
||||
Subject: [PATCH] fix: mb_init does not accept any parameter
|
||||
|
||||
Defined in mbchar.c:114 :
|
||||
```c
|
||||
void mb_init()
|
||||
/*
|
||||
* Initialize multi-byte character settings.
|
||||
* First called prior to setting the 'mcpp_mode'.
|
||||
* Will be called again each time the multibyte character encoding is changed.
|
||||
*/
|
||||
{
|
||||
```
|
||||
|
||||
It does not expect any parameters.
|
||||
---
|
||||
mcpp_main.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mcpp_main.c b/mcpp_main.c
|
||||
index 54a62b2..44265ad 100644
|
||||
--- a/mcpp_main.c
|
||||
+++ b/mcpp_main.c
|
||||
@@ -302,7 +302,7 @@ int mcpp_lib_main
|
||||
inc_dirp = &null; /* Initialize to current (null) directory */
|
||||
cur_fname = cur_fullname = "(predefined)"; /* For predefined macros */
|
||||
init_defines(); /* Predefine macros */
|
||||
- mb_init(TRUE); /* Should be initialized prior to get options */
|
||||
+ mb_init(); /* Should be initialized prior to get options */
|
||||
do_options( argc, argv, &in_file, &out_file); /* Command line options */
|
||||
|
||||
/* Open input file, "-" means stdin. */
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
From bd5ddbde9e4ed24101cdc86007f26e95f38dd5b1 Mon Sep 17 00:00:00 2001
|
||||
From: laurensmiers <laurensmiers@protonmail.com>
|
||||
Date: Wed, 22 Oct 2025 14:52:30 +0200
|
||||
Subject: [PATCH] fix: don't use reserved keyword for goto statement
|
||||
|
||||
Rename:
|
||||
- 'true' to 'exit_success'
|
||||
- 'false' to 'exit_fail'
|
||||
|
||||
Chose not to change the flow of the code by removing the goto's to
|
||||
avoid regressions.
|
||||
---
|
||||
system.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/system.c b/system.c
|
||||
index 646caf6..0a15aec 100644
|
||||
--- a/system.c
|
||||
+++ b/system.c
|
||||
@@ -1738,7 +1738,7 @@ static int open_file(
|
||||
if (! fullname) /* Non-existent or directory */
|
||||
return FALSE;
|
||||
if (included( fullname)) /* Once included */
|
||||
- goto true;
|
||||
+ goto exit_success;
|
||||
|
||||
if ((max_open != 0 && max_open <= include_nest)
|
||||
/* Exceed the known limit of open files */
|
||||
@@ -1765,12 +1765,12 @@ static int open_file(
|
||||
if ((fp = mcpp_fopen( fullname, "r")) == NULL) {
|
||||
file->fp = mcpp_fopen( cur_fullname, "r");
|
||||
fseek( file->fp, file->pos, SEEK_SET);
|
||||
- goto false;
|
||||
+ goto exit_fail;
|
||||
}
|
||||
if (max_open == 0) /* Remember the limit of the system */
|
||||
max_open = include_nest;
|
||||
} else if (fp == NULL) /* No read permission */
|
||||
- goto false;
|
||||
+ goto exit_fail;
|
||||
/* Truncate buffer of the includer to save memory */
|
||||
len = (int) (file->bptr - file->buffer);
|
||||
if (len) {
|
||||
@@ -1802,9 +1802,9 @@ static int open_file(
|
||||
if (mkdep && ((mkdep & MD_SYSHEADER) || ! infile->sys_header))
|
||||
put_depend( fullname); /* Output dependency line */
|
||||
|
||||
-true:
|
||||
+exit_success:
|
||||
return TRUE;
|
||||
-false:
|
||||
+exit_fail:
|
||||
free( fullname);
|
||||
return FALSE;
|
||||
}
|
||||
|
|
@ -16,21 +16,17 @@
|
|||
let
|
||||
mcpp' = mcpp.overrideAttrs (prevAttrs: rec {
|
||||
pname = "mcpp-zeroc-ice";
|
||||
version = "2.7.3";
|
||||
version = "2.7.2.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeroc-ice";
|
||||
repo = "mcpp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hZGU5mqMRTTHV2bR9uzM6ALj1sypjPxO5Ajg8aKzLxc=";
|
||||
hash = "sha256-FlzHpfYoHzbz5DfXgkr6Hf96xejRKd0Rr1TmzE5GyGg=";
|
||||
};
|
||||
|
||||
# zeroc-ice's fork diverges quite a bit from upstream mcpp, so prevAttrs.patches is not used here
|
||||
patches = [
|
||||
# See https://github.com/zeroc-ice/mcpp/pull/12
|
||||
./fix-mb_init.patch
|
||||
./fix-reserved-keywords.patch
|
||||
];
|
||||
patches = [ ];
|
||||
|
||||
installFlags = prevAttrs.installFlags or [ ] ++ [ "PREFIX=$(out)" ];
|
||||
});
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
mathcomp,
|
||||
mathcomp-finmap,
|
||||
mathcomp-bigenough,
|
||||
mathcomp-real-closed,
|
||||
hierarchy-builder,
|
||||
stdlib,
|
||||
single ? false,
|
||||
|
|
@ -104,6 +105,7 @@ let
|
|||
analysis-deps = [
|
||||
mathcomp.field
|
||||
mathcomp-bigenough
|
||||
mathcomp-real-closed
|
||||
];
|
||||
intra-deps = lib.optionals (package != "single") (map mathcomp_ packages.${package});
|
||||
pkgpath = lib.switch package [
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysmart";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "truenas";
|
||||
repo = "py-SMART";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-h9FBAoNYLs5XvLxSajyktCCcNgiT7mIp472C+fbqZFA=";
|
||||
hash = "sha256-A3SqSo7dUiHB3twlVxNb+7CWki1AZdxlYMQWDwCb9QQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rl_json";
|
||||
version = "0.16";
|
||||
version = "0.17.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RubyLane";
|
||||
repo = "rl_json";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-rXr7x9Cr+gD938+NEPguvYVWH5s9bKccMobuZsb0IQY=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-18WMNHzGn0Hio07zuuaINN85b82pNEIgeLjsRy9jQEs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -401,8 +401,6 @@ with pkgs;
|
|||
|
||||
dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { };
|
||||
|
||||
enochecker-test = callPackage ../development/tools/enochecker-test { };
|
||||
|
||||
inherit (gridlock) nyarr;
|
||||
|
||||
lshw-gui = lshw.override { withGUI = true; };
|
||||
|
|
@ -1428,8 +1426,6 @@ with pkgs;
|
|||
bitwarden-directory-connector
|
||||
;
|
||||
|
||||
bitwarden-menu = callPackage ../applications/misc/bitwarden-menu { };
|
||||
|
||||
blocksat-cli = with python3Packages; toPythonApplication blocksat-cli;
|
||||
|
||||
bucklespring-x11 = callPackage ../by-name/bu/bucklespring-libinput/package.nix { legacy = true; };
|
||||
|
|
@ -1744,16 +1740,12 @@ with pkgs;
|
|||
cairo = cairo.override { xcbSupport = true; };
|
||||
};
|
||||
|
||||
hyprshade = callPackage ../applications/window-managers/hyprwm/hyprshade { };
|
||||
|
||||
hyprlandPlugins = recurseIntoAttrs (
|
||||
callPackage ../applications/window-managers/hyprwm/hyprland-plugins { }
|
||||
);
|
||||
|
||||
intensity-normalization = with python3Packages; toPythonApplication intensity-normalization;
|
||||
|
||||
jellyfin-mpv-shim = callPackage ../applications/video/jellyfin-mpv-shim { };
|
||||
|
||||
klaus = with python3Packages; toPythonApplication klaus;
|
||||
|
||||
klipper = callPackage ../servers/klipper { };
|
||||
|
|
@ -1820,8 +1812,6 @@ with pkgs;
|
|||
|
||||
ocrmypdf = with python3.pkgs; toPythonApplication ocrmypdf;
|
||||
|
||||
online-judge-template-generator = callPackage ../tools/misc/online-judge-template-generator { };
|
||||
|
||||
online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools;
|
||||
|
||||
inherit (ocamlPackages) patdiff;
|
||||
|
|
@ -1832,8 +1822,6 @@ with pkgs;
|
|||
|
||||
psrecord = python3Packages.callPackage ../tools/misc/psrecord { };
|
||||
|
||||
remarkable-mouse = callPackage ../applications/misc/remarkable/remarkable-mouse { };
|
||||
|
||||
ropgadget = with python3Packages; toPythonApplication ropgadget;
|
||||
|
||||
scour = with python3Packages; toPythonApplication scour;
|
||||
|
|
@ -2004,8 +1992,6 @@ with pkgs;
|
|||
|
||||
blacken-docs = with python3Packages; toPythonApplication blacken-docs;
|
||||
|
||||
bluetooth_battery = callPackage ../applications/misc/bluetooth_battery { };
|
||||
|
||||
calyx-vpn = qt6Packages.callPackage ../tools/networking/bitmask-vpn {
|
||||
provider = "calyx";
|
||||
};
|
||||
|
|
@ -2083,8 +2069,6 @@ with pkgs;
|
|||
ngtcp2 = ngtcp2-gnutls;
|
||||
};
|
||||
|
||||
cve-bin-tool = callPackage ../tools/security/cve-bin-tool { };
|
||||
|
||||
dconf2nix = callPackage ../development/tools/haskell/dconf2nix { };
|
||||
|
||||
inherit (callPackages ../applications/networking/p2p/deluge { })
|
||||
|
|
@ -2440,8 +2424,6 @@ with pkgs;
|
|||
|
||||
infisical = callPackage ../development/tools/infisical { };
|
||||
|
||||
input-remapper = callPackage ../tools/inputmethods/input-remapper { };
|
||||
|
||||
internetarchive = with python3Packages; toPythonApplication internetarchive;
|
||||
|
||||
iocextract = with python3Packages; toPythonApplication iocextract;
|
||||
|
|
@ -2819,21 +2801,6 @@ with pkgs;
|
|||
|
||||
optimism = callPackage ../applications/blockchains/optimism { };
|
||||
|
||||
pandoc-acro = callPackage ../tools/misc/pandoc-acro { };
|
||||
|
||||
pandoc-imagine = callPackage ../tools/misc/pandoc-imagine { };
|
||||
|
||||
pandoc-include = callPackage ../tools/misc/pandoc-include { };
|
||||
|
||||
pandoc-drawio-filter = callPackage ../tools/misc/pandoc-drawio-filter { };
|
||||
|
||||
pandoc-plantuml-filter = callPackage ../tools/misc/pandoc-plantuml-filter { };
|
||||
|
||||
pandoc-eqnos = callPackage ../tools/misc/pandoc-eqnos { };
|
||||
pandoc-fignos = callPackage ../tools/misc/pandoc-fignos { };
|
||||
pandoc-secnos = callPackage ../tools/misc/pandoc-secnos { };
|
||||
pandoc-tablenos = callPackage ../tools/misc/pandoc-tablenos { };
|
||||
|
||||
pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { };
|
||||
|
||||
nsjail = callPackage ../tools/security/nsjail {
|
||||
|
|
@ -2906,8 +2873,6 @@ with pkgs;
|
|||
inherit (llvmPackages) stdenv;
|
||||
};
|
||||
|
||||
namespaced-openvpn = callPackage ../tools/networking/namespaced-openvpn { };
|
||||
|
||||
update-dotdee = with python3Packages; toPythonApplication update-dotdee;
|
||||
|
||||
update-nix-fetchgit = haskell.lib.compose.justStaticExecutables haskellPackages.update-nix-fetchgit;
|
||||
|
|
@ -2965,8 +2930,6 @@ with pkgs;
|
|||
polkitSupport = true;
|
||||
};
|
||||
|
||||
pdd = callPackage ../tools/misc/pdd { };
|
||||
|
||||
pdfminer = with python3Packages; toPythonApplication pdfminer-six;
|
||||
|
||||
pdfium-binaries-v8 = pdfium-binaries.override { withV8 = true; };
|
||||
|
|
@ -3077,8 +3040,6 @@ with pkgs;
|
|||
|
||||
recoll-nox = recoll.override { withGui = false; };
|
||||
|
||||
remote-exec = callPackage ../tools/misc/remote-exec { };
|
||||
|
||||
reptor = with python3.pkgs; toPythonApplication reptor;
|
||||
|
||||
inherit (callPackage ../development/misc/resholve { })
|
||||
|
|
@ -3105,8 +3066,6 @@ with pkgs;
|
|||
|
||||
ruby-lsp = rubyPackages.ruby-lsp;
|
||||
|
||||
s3cmd = callPackage ../tools/networking/s3cmd { };
|
||||
|
||||
s3-credentials = with python3Packages; toPythonApplication s3-credentials;
|
||||
|
||||
safety-cli = with python3.pkgs; toPythonApplication safety;
|
||||
|
|
@ -3155,8 +3114,6 @@ with pkgs;
|
|||
|
||||
strip-nondeterminism = perlPackages.strip-nondeterminism;
|
||||
|
||||
sumorobot-manager = callPackage ../applications/science/robotics/sumorobot-manager { };
|
||||
|
||||
sslscan = callPackage ../tools/security/sslscan {
|
||||
openssl = openssl.override { withZlib = true; };
|
||||
};
|
||||
|
|
@ -3253,8 +3210,6 @@ with pkgs;
|
|||
vimpager = callPackage ../tools/misc/vimpager { };
|
||||
vimpager-latest = callPackage ../tools/misc/vimpager/latest.nix { };
|
||||
|
||||
vimwiki-markdown = callPackage ../tools/misc/vimwiki-markdown { };
|
||||
|
||||
vkbasalt = callPackage ../tools/graphics/vkbasalt {
|
||||
vkbasalt32 = pkgsi686Linux.vkbasalt;
|
||||
};
|
||||
|
|
@ -3262,8 +3217,6 @@ with pkgs;
|
|||
voxtype-vulkan = callPackage ../by-name/vo/voxtype/package.nix { vulkanSupport = true; };
|
||||
voxtype-onnx = callPackage ../by-name/vo/voxtype/package.nix { onnxSupport = true; };
|
||||
|
||||
vpn-slice = callPackage ../tools/networking/vpn-slice { };
|
||||
|
||||
openconnectPackages = callPackage ../tools/networking/openconnect { };
|
||||
|
||||
inherit (openconnectPackages) openconnect openconnect_openssl;
|
||||
|
|
@ -5112,8 +5065,6 @@ with pkgs;
|
|||
|
||||
ansible-builder = with python3Packages; toPythonApplication ansible-builder;
|
||||
|
||||
yakut = callPackage ../development/tools/misc/yakut { };
|
||||
|
||||
### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS
|
||||
|
||||
inherit (callPackages ../development/tools/language-servers/nixd { }) nixf nixt nixd;
|
||||
|
|
@ -5144,8 +5095,6 @@ with pkgs;
|
|||
|
||||
apacheKafka = apacheKafka_4_2;
|
||||
|
||||
asn2quickder = callPackage ../development/tools/asn2quickder { };
|
||||
|
||||
libastyle = astyle.override { asLibrary = true; };
|
||||
|
||||
aws-adfs = with python3Packages; toPythonApplication aws-adfs;
|
||||
|
|
@ -5496,8 +5445,6 @@ with pkgs;
|
|||
haskellPackages.callPackage ../tools/misc/fffuu { }
|
||||
);
|
||||
|
||||
gdbgui = callPackage ../development/tools/misc/gdbgui { };
|
||||
|
||||
flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
|
||||
flex = callPackage ../development/tools/parsing/flex { };
|
||||
|
||||
|
|
@ -5565,8 +5512,6 @@ with pkgs;
|
|||
maven3 = maven;
|
||||
inherit (maven) buildMaven;
|
||||
|
||||
mavproxy = callPackage ../applications/science/robotics/mavproxy { };
|
||||
|
||||
python-matter-server =
|
||||
with python3Packages;
|
||||
toPythonApplication (
|
||||
|
|
@ -8148,8 +8093,6 @@ with pkgs;
|
|||
};
|
||||
busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { };
|
||||
|
||||
cm-rgb = callPackage ../tools/system/cm-rgb { };
|
||||
|
||||
conky = callPackage ../os-specific/linux/conky (
|
||||
{
|
||||
lua = lua5_4;
|
||||
|
|
@ -8158,8 +8101,6 @@ with pkgs;
|
|||
// config.conky or { }
|
||||
);
|
||||
|
||||
cpupower-gui = callPackage ../os-specific/linux/cpupower-gui { };
|
||||
|
||||
# Darwin package set
|
||||
#
|
||||
# Even though this is a set of packages not single package, use `callPackage`
|
||||
|
|
@ -8964,8 +8905,6 @@ with pkgs;
|
|||
|
||||
drawterm-wayland = callPackage ../by-name/dr/drawterm/package.nix { withWayland = true; };
|
||||
|
||||
droopy = callPackage ../applications/networking/droopy { };
|
||||
|
||||
evilwm = callPackage ../applications/window-managers/evilwm {
|
||||
patches = config.evilwm.patches or [ ];
|
||||
};
|
||||
|
|
@ -9276,8 +9215,6 @@ with pkgs;
|
|||
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
|
||||
};
|
||||
|
||||
pass2csv = callPackage ../tools/security/pass2csv { };
|
||||
|
||||
pinboard = with python3Packages; toPythonApplication pinboard;
|
||||
|
||||
pinboard-notes-backup = haskell.lib.compose.justStaticExecutables haskellPackages.pinboard-notes-backup;
|
||||
|
|
@ -9501,8 +9438,6 @@ with pkgs;
|
|||
shelfMultiBand = callPackage ../applications/audio/magnetophonDSP/shelfMultiBand { };
|
||||
};
|
||||
|
||||
matrix-commander = callPackage ../applications/networking/instant-messengers/matrix-commander { };
|
||||
|
||||
mediaelch-qt5 = callPackage ../by-name/me/mediaelch/package.nix { qtVersion = 5; };
|
||||
mediaelch-qt6 = mediaelch;
|
||||
|
||||
|
|
@ -9726,8 +9661,6 @@ with pkgs;
|
|||
|
||||
inherit (pidginPackages) pidgin;
|
||||
|
||||
plex-mpv-shim = callPackage ../applications/video/plex-mpv-shim { };
|
||||
|
||||
# perhaps there are better apps for this task? It's how I had configured my previous system.
|
||||
# And I don't want to rewrite all rules
|
||||
profanity = callPackage ../applications/networking/instant-messengers/profanity (
|
||||
|
|
@ -9839,6 +9772,8 @@ with pkgs;
|
|||
|
||||
rstudio-server = rstudio.override { server = true; };
|
||||
|
||||
foks-server = foks.server;
|
||||
|
||||
inherit (callPackages ../applications/radio/rtl-sdr { })
|
||||
rtl-sdr-librtlsdr
|
||||
rtl-sdr-osmocom
|
||||
|
|
@ -10348,8 +10283,6 @@ with pkgs;
|
|||
|
||||
ydiff = with python3.pkgs; toPythonApplication ydiff;
|
||||
|
||||
yokadi = callPackage ../applications/misc/yokadi { };
|
||||
|
||||
your-editor = callPackage ../applications/editors/your-editor { stdenv = gccStdenv; };
|
||||
|
||||
youtube-dl = with python3Packages; toPythonApplication youtube-dl;
|
||||
|
|
@ -11537,8 +11470,6 @@ with pkgs;
|
|||
hasktags = haskellPackages.hasktags;
|
||||
};
|
||||
|
||||
termpdfpy = callPackage ../applications/misc/termpdf.py { };
|
||||
|
||||
inherit (callPackage ../applications/networking/cluster/terraform { })
|
||||
mkTerraform
|
||||
terraform_1
|
||||
|
|
@ -11649,8 +11580,6 @@ with pkgs;
|
|||
|
||||
torcs-without-data = callPackage ../by-name/to/torcs/without-data.nix { };
|
||||
|
||||
nitrokey-app2 = callPackage ../tools/security/nitrokey-app2 { };
|
||||
|
||||
hy = with python3Packages; toPythonApplication hy;
|
||||
|
||||
ghc-standalone-archive =
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue