Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
a1cd7ca146
46 changed files with 315 additions and 194 deletions
|
|
@ -15960,6 +15960,15 @@
|
|||
github = "rumpelsepp";
|
||||
githubId = 1961699;
|
||||
};
|
||||
running-grass = {
|
||||
name = "Leo Liu";
|
||||
email = "467195537@qq.com";
|
||||
github = "running-grass";
|
||||
githubId = 17241154;
|
||||
keys = [{
|
||||
fingerprint = "5156 0FAB FF32 83EC BC8C EA13 9344 3660 9397 0138";
|
||||
}];
|
||||
};
|
||||
rushmorem = {
|
||||
email = "rushmore@webenchanter.com";
|
||||
github = "rushmorem";
|
||||
|
|
|
|||
|
|
@ -147,18 +147,6 @@ in
|
|||
description = lib.mdDoc "Whether Kubo should try to run the fs-repo-migration at startup.";
|
||||
};
|
||||
|
||||
ipfsMountDir = mkOption {
|
||||
type = types.str;
|
||||
default = "/ipfs";
|
||||
description = lib.mdDoc "Where to mount the IPFS namespace to";
|
||||
};
|
||||
|
||||
ipnsMountDir = mkOption {
|
||||
type = types.str;
|
||||
default = "/ipns";
|
||||
description = lib.mdDoc "Where to mount the IPNS namespace to";
|
||||
};
|
||||
|
||||
enableGC = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
|
|
@ -205,6 +193,18 @@ in
|
|||
];
|
||||
description = lib.mdDoc "Where Kubo listens for incoming p2p connections";
|
||||
};
|
||||
|
||||
Mounts.IPFS = mkOption {
|
||||
type = types.str;
|
||||
default = "/ipfs";
|
||||
description = lib.mdDoc "Where to mount the IPFS namespace to";
|
||||
};
|
||||
|
||||
Mounts.IPNS = mkOption {
|
||||
type = types.str;
|
||||
default = "/ipns";
|
||||
description = lib.mdDoc "Where to mount the IPNS namespace to";
|
||||
};
|
||||
};
|
||||
};
|
||||
description = lib.mdDoc ''
|
||||
|
|
@ -309,8 +309,8 @@ in
|
|||
systemd.tmpfiles.rules = [
|
||||
"d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -"
|
||||
] ++ optionals cfg.autoMount [
|
||||
"d '${cfg.ipfsMountDir}' - ${cfg.user} ${cfg.group} - -"
|
||||
"d '${cfg.ipnsMountDir}' - ${cfg.user} ${cfg.group} - -"
|
||||
"d '${cfg.settings.Mounts.IPFS}' - ${cfg.user} ${cfg.group} - -"
|
||||
"d '${cfg.settings.Mounts.IPNS}' - ${cfg.user} ${cfg.group} - -"
|
||||
];
|
||||
|
||||
# The hardened systemd unit breaks the fuse-mount function according to documentation in the unit file itself
|
||||
|
|
@ -320,8 +320,6 @@ in
|
|||
|
||||
services.kubo.settings = mkIf cfg.autoMount {
|
||||
Mounts.FuseAllowOther = lib.mkDefault true;
|
||||
Mounts.IPFS = lib.mkDefault cfg.ipfsMountDir;
|
||||
Mounts.IPNS = lib.mkDefault cfg.ipnsMountDir;
|
||||
};
|
||||
|
||||
systemd.services.ipfs = {
|
||||
|
|
@ -352,8 +350,8 @@ in
|
|||
ipfs --offline config replace -
|
||||
'';
|
||||
postStop = mkIf cfg.autoMount ''
|
||||
# After an unclean shutdown the fuse mounts at cfg.ipnsMountDir and cfg.ipfsMountDir are locked
|
||||
umount --quiet '${cfg.ipnsMountDir}' '${cfg.ipfsMountDir}' || true
|
||||
# After an unclean shutdown the fuse mounts at cfg.settings.Mounts.IPFS and cfg.settings.Mounts.IPNS are locked
|
||||
umount --quiet '${cfg.settings.Mounts.IPFS}' '${cfg.settings.Mounts.IPNS}' || true
|
||||
'';
|
||||
serviceConfig = {
|
||||
ExecStart = [ "" "${cfg.package}/bin/ipfs daemon ${kuboFlags}" ];
|
||||
|
|
@ -405,8 +403,8 @@ in
|
|||
(mkRenamedOptionModule [ "services" "ipfs" "defaultMode" ] [ "services" "kubo" "defaultMode" ])
|
||||
(mkRenamedOptionModule [ "services" "ipfs" "autoMount" ] [ "services" "kubo" "autoMount" ])
|
||||
(mkRenamedOptionModule [ "services" "ipfs" "autoMigrate" ] [ "services" "kubo" "autoMigrate" ])
|
||||
(mkRenamedOptionModule [ "services" "ipfs" "ipfsMountDir" ] [ "services" "kubo" "ipfsMountDir" ])
|
||||
(mkRenamedOptionModule [ "services" "ipfs" "ipnsMountDir" ] [ "services" "kubo" "ipnsMountDir" ])
|
||||
(mkRenamedOptionModule [ "services" "ipfs" "ipfsMountDir" ] [ "services" "kubo" "settings" "Mounts" "IPFS" ])
|
||||
(mkRenamedOptionModule [ "services" "ipfs" "ipnsMountDir" ] [ "services" "kubo" "settings" "Mounts" "IPNS" ])
|
||||
(mkRenamedOptionModule [ "services" "ipfs" "gatewayAddress" ] [ "services" "kubo" "settings" "Addresses" "Gateway" ])
|
||||
(mkRenamedOptionModule [ "services" "ipfs" "apiAddress" ] [ "services" "kubo" "settings" "Addresses" "API" ])
|
||||
(mkRenamedOptionModule [ "services" "ipfs" "swarmAddress" ] [ "services" "kubo" "settings" "Addresses" "Swarm" ])
|
||||
|
|
@ -421,5 +419,7 @@ in
|
|||
(mkRenamedOptionModule [ "services" "kubo" "gatewayAddress" ] [ "services" "kubo" "settings" "Addresses" "Gateway" ])
|
||||
(mkRenamedOptionModule [ "services" "kubo" "apiAddress" ] [ "services" "kubo" "settings" "Addresses" "API" ])
|
||||
(mkRenamedOptionModule [ "services" "kubo" "swarmAddress" ] [ "services" "kubo" "settings" "Addresses" "Swarm" ])
|
||||
(mkRenamedOptionModule [ "services" "kubo" "ipfsMountDir" ] [ "services" "kubo" "settings" "Mounts" "IPFS" ])
|
||||
(mkRenamedOptionModule [ "services" "kubo" "ipnsMountDir" ] [ "services" "kubo" "settings" "Mounts" "IPNS" ])
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -597,6 +597,8 @@ let
|
|||
"DHCP"
|
||||
"DHCPServer"
|
||||
"LinkLocalAddressing"
|
||||
"IPv6LinkLocalAddressGenerationMode"
|
||||
"IPv6StableSecretAddress"
|
||||
"IPv4LLRoute"
|
||||
"DefaultRouteOnDevice"
|
||||
"LLMNR"
|
||||
|
|
@ -648,6 +650,7 @@ let
|
|||
(assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6"])
|
||||
(assertValueOneOf "DHCPServer" boolValues)
|
||||
(assertValueOneOf "LinkLocalAddressing" ["yes" "no" "ipv4" "ipv6" "fallback" "ipv4-fallback"])
|
||||
(assertValueOneOf "IPv6LinkLocalAddressGenerationMode" ["eui64" "none" "stable-privacy" "random"])
|
||||
(assertValueOneOf "IPv4LLRoute" boolValues)
|
||||
(assertValueOneOf "DefaultRouteOnDevice" boolValues)
|
||||
(assertValueOneOf "LLMNR" (boolValues ++ ["resolve"]))
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osdlyrics";
|
||||
version = "0.5.14";
|
||||
version = "0.5.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osdlyrics";
|
||||
repo = "osdlyrics";
|
||||
rev = version;
|
||||
sha256 = "sha256-NVUQLmddXnpryt1AuHSwgPnWkgxWMBNJac09TJ12Yzo=";
|
||||
hash = "sha256-4jEF1LdMwaLNF6zvzAuGW8Iu4dzhrFLutX69LwSjTAI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -42,7 +42,6 @@ stdenv.mkDerivation rec {
|
|||
(python3.withPackages (pp: with pp; [
|
||||
chardet
|
||||
dbus-python
|
||||
future
|
||||
pycurl
|
||||
pygobject3
|
||||
]))
|
||||
|
|
@ -81,7 +80,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Standalone lyrics fetcher/displayer";
|
||||
homepage = "https://github.com/osdlyrics/osdlyrics";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ pedrohlc ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,45 +2,89 @@
|
|||
, fetchFromGitHub
|
||||
, buildNpmPackage
|
||||
, makeWrapper
|
||||
, electron_25
|
||||
, electron
|
||||
, python3
|
||||
, stdenv
|
||||
, stdenvNoCC
|
||||
, copyDesktopItems
|
||||
, moreutils
|
||||
, cacert
|
||||
, jq
|
||||
, nodePackages
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "youtube-music";
|
||||
version = "2.1.0";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "th-ch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aYEEUv+dybzcH0aNJlZ19XF++8cswFunrU0H+ZaKm4Y=";
|
||||
hash = "sha256-6ZiftpdCwxCkJzcHryVrUKzM+mM1eQpdLNFl0Dja59Q=";
|
||||
};
|
||||
|
||||
electron = electron_25;
|
||||
|
||||
in
|
||||
buildNpmPackage {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
inherit pname version src;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper python3 ]
|
||||
pnpmDeps = stdenvNoCC.mkDerivation {
|
||||
pname = "${finalAttrs.pname}-pnpm-deps";
|
||||
inherit (finalAttrs) src version ELECTRON_SKIP_BINARY_DOWNLOAD;
|
||||
|
||||
nativeBuildInputs = [ jq moreutils nodePackages.pnpm cacert ];
|
||||
|
||||
installPhase = ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
pnpm config set store-dir $out
|
||||
pnpm install --frozen-lockfile --ignore-script
|
||||
|
||||
rm -rf $out/v3/tmp
|
||||
for f in $(find $out -name "*.json"); do
|
||||
sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f
|
||||
jq --sort-keys . $f | sponge $f
|
||||
done
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
dontFixup = true;
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = {
|
||||
x86_64-linux = "sha256-Oy11V7FXfVhLUR9gX0sjQEFuVPFpbaVdT518oOSLcvA=";
|
||||
aarch64-linux = "sha256-6nXemaGiQjp2stjjKItPJ62VcH5Q5pRf63qKtl2haXI=";
|
||||
x86_64-darwin = "sha256-jSMAw+AMD63vqPckZjblw4EDngA4E8h0WlsZu3hUShY=";
|
||||
aarch64-darwin = "sha256-zujXURpIcw7IOw63AW167h6cywYXydhHZMzA2apGZAs=";
|
||||
}.${stdenv.system} or (throw "Unsupported platform");
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
[ makeWrapper python3 nodePackages.pnpm nodePackages.nodejs ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ];
|
||||
|
||||
npmDepsHash = "sha256-XGV0mTywYYxpMitojzIILB/Eu/8dfk/aCvUxIkx4SDQ=";
|
||||
makeCacheWritable = true;
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
};
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$(mktemp -d)
|
||||
export STORE_PATH=$(mktemp -d)
|
||||
|
||||
cp -Tr "$pnpmDeps" "$STORE_PATH"
|
||||
chmod -R +w "$STORE_PATH"
|
||||
|
||||
pnpm config set store-dir "$STORE_PATH"
|
||||
pnpm install --offline --frozen-lockfile --ignore-script
|
||||
patchShebangs node_modules/{*,.*}
|
||||
'';
|
||||
|
||||
postBuild = lib.optionalString stdenv.isDarwin ''
|
||||
cp -R ${electron}/Applications/Electron.app Electron.app
|
||||
chmod -R u+w Electron.app
|
||||
'' + ''
|
||||
npm exec electron-builder -- \
|
||||
pnpm build
|
||||
./node_modules/.bin/electron-builder \
|
||||
--dir \
|
||||
-c.electronDist=${if stdenv.isDarwin then "." else "${electron}/libexec/electron"} \
|
||||
-c.electronVersion=${electron.version}
|
||||
|
|
@ -83,7 +127,7 @@ buildNpmPackage {
|
|||
icon = "youtube-music";
|
||||
desktopName = "Youtube Music";
|
||||
startupWMClass = "Youtube Music";
|
||||
categories = ["AudioVideo"];
|
||||
categories = [ "AudioVideo" ];
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -93,6 +137,6 @@ buildNpmPackage {
|
|||
license = licenses.mit;
|
||||
maintainers = [ maintainers.aacebedo ];
|
||||
mainProgram = "youtube-music";
|
||||
platforms = platforms.all;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
let
|
||||
pname = "anytype";
|
||||
version = "0.35.25-beta";
|
||||
version = "0.36.0";
|
||||
name = "Anytype-${version}";
|
||||
nameExecutable = pname;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage";
|
||||
name = "Anytype-${version}.AppImage";
|
||||
sha256 = "sha256-55VT4t/SNl13Gdh7LG4SqLN9uo0cYDu0LnPFIuZ7Sm0=";
|
||||
sha256 = "sha256-Efoqy/izULDgd2Dc3ktVZNj9/U0vCtENm0NLr5VKQpQ=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit name src; };
|
||||
in
|
||||
|
|
@ -34,7 +34,7 @@ appimageTools.wrapType2 {
|
|||
description = "P2P note-taking tool";
|
||||
homepage = "https://anytype.io/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ running-grass ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kondo";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tbillington";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m00zRNnryty96+pmZ2/ZFk61vy7b0yiWpomWzAHUAMk=";
|
||||
hash = "sha256-OqOmOujnyLTqwzNvLWudQi+xa5v37JTtyUXaItnpnfs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hG4bvcGYNwdNX9Wsdw30i3a3Ttxud+quNZpolgVKXQE=";
|
||||
cargoHash = "sha256-WF4GHj/5VYrTUh1E3t29zbpSLjJ6g7RWVpLYqg9msZg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Save disk space by cleaning unneeded files from software projects";
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
, iconv
|
||||
, cppunit
|
||||
, syncthing
|
||||
, xdg-utils
|
||||
, webviewSupport ? true
|
||||
, jsSupport ? true
|
||||
, kioPluginSupport ? stdenv.isLinux
|
||||
|
|
@ -95,6 +96,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ lib.optionals (!webviewSupport) ["-DWEBVIEW_PROVIDER:STRING=none"]
|
||||
;
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix PATH : ${lib.makeBinPath [ xdg-utils ]}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Martchus/syncthingtray";
|
||||
description = "Tray application and Dolphin/Plasma integration for Syncthing";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "civo";
|
||||
version = "1.0.69";
|
||||
version = "1.0.70";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "civo";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gecvS7Vwg1TQTjbDsKrwnf5/eA7XOnIvb6xw8MZDUkU=";
|
||||
sha256 = "sha256-QhCyGeK/j3oKjJM1XhCcXXAKK+jnTksmpoDox8vjF8Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cJIdF+zujftCIBzzzUpXLUWXCP4+n+gSaPJsatEQuOs=";
|
||||
vendorHash = "sha256-BE5CxzpY82VBn7/YlHr8FQy7UOzcVQe23naUU/9SxZ4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
# SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags.
|
||||
let rev = "bd5465d6b2b2b92b517f4c6074008d22338ff509";
|
||||
let rev = "6f9e27f1795f10475c9f6f5decdff692e1e228da";
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "sonobuoy";
|
||||
version = "0.56.14"; # Do not forget to update `rev` above
|
||||
version = "0.57.1"; # Do not forget to update `rev` above
|
||||
|
||||
ldflags =
|
||||
let t = "github.com/vmware-tanzu/sonobuoy";
|
||||
|
|
@ -20,10 +20,10 @@ buildGoModule rec {
|
|||
owner = "vmware-tanzu";
|
||||
repo = "sonobuoy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YiVCdAdwdK9PcQ6VQQNAjLQq2X54vJmZfbHRjV2d8VQ=";
|
||||
hash = "sha256-e9C5ZwKqT3Fiko2HqrIpONVvjhT8KBBO7rQc3BJhl+A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Fqxkyl9AKZ7H4QSp2V/yztpeXHt57+LjpzzGtOPndX0=";
|
||||
vendorHash = "sha256-HE53eIEyhOI9ksEx1EKmv/txaTa7KDrNUMEVRMi4Wuo=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"version" = "1.11.51";
|
||||
"version" = "1.11.52";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "sha256-XsDXE8bny8gdojk6/NLcUGJcZlYM2hd9q5J36IDCdaU=";
|
||||
"desktopYarnHash" = "03iixkw5swgm71prckspbx23jnf4dkfv2gfzvi5v4mqwddwrfp1w";
|
||||
"webSrcHash" = "sha256-8LNPnaj4yCiZt9RSFQM37yhO/tcc2VSM7reRQX5w734=";
|
||||
"webYarnHash" = "03fmk30b6aq5lgabpmpcb8c4y8jqyzw52xh216fava5dhqvh0ib9";
|
||||
"desktopSrcHash" = "sha256-kAnEx9wfcpjRLWz3z5md/f0vJkToYW9s888U8SAaQJ4=";
|
||||
"desktopYarnHash" = "0w9hqiq1dwv6asl0bf5kvqjvm4nfpqvd0k4s0rd84fki5ysl3ijv";
|
||||
"webSrcHash" = "sha256-+jDymyX66oCSgklTiPqMi9uBFZWd5bga0SVqOc7HW8I=";
|
||||
"webYarnHash" = "1sj0d4m1dxcix3mzw3g3y2zj6g0pcxl87qmz7ppicxpjbkd77g1i";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
, libgee
|
||||
, libical
|
||||
, libportal-gtk4
|
||||
, libsoup_3
|
||||
, pantheon
|
||||
, sqlite
|
||||
, webkitgtk_6_0
|
||||
|
|
@ -23,13 +24,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "planify";
|
||||
version = "4.2.1";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alainm23";
|
||||
repo = "planify";
|
||||
rev = version;
|
||||
hash = "sha256-tcQNnfM690Je8sF19OSZ4GnXkhsSSrNHZ5EDXmMOW9Q=";
|
||||
hash = "sha256-YF4un5j7zv0ishcgt00XDGy0AhR/bo6HJj04t0qfxwU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -51,6 +52,7 @@ stdenv.mkDerivation rec {
|
|||
libgee
|
||||
libical
|
||||
libportal-gtk4
|
||||
libsoup_3
|
||||
pantheon.granite7
|
||||
sqlite
|
||||
webkitgtk_6_0
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, nixosTests, lib, edk2, util-linux, nasm, acpica-tools, llvmPackages
|
||||
, csmSupport ? false, seabios ? null
|
||||
, csmSupport ? false, seabios
|
||||
, fdSize2MB ? csmSupport
|
||||
, fdSize4MB ? false
|
||||
, secureBoot ? false
|
||||
|
|
@ -12,8 +12,6 @@
|
|||
, sourceDebug ? false
|
||||
}:
|
||||
|
||||
assert csmSupport -> seabios != null;
|
||||
|
||||
let
|
||||
|
||||
projectDscPath = if stdenv.isi686 then
|
||||
|
|
@ -68,7 +66,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
|
|||
env.PYTHON_COMMAND = "python3";
|
||||
|
||||
postPatch = lib.optionalString csmSupport ''
|
||||
cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
|
||||
cp ${seabios}/share/seabios/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
|
||||
'';
|
||||
|
||||
postFixup = (
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
{ lib, stdenv, fetchgit, acpica-tools, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "seabios";
|
||||
version = "1.16.2";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.seabios.org/seabios.git";
|
||||
rev = "rel-${version}";
|
||||
sha256 = "sha256-J2FuT+FXn9YoFLSfxDOxyKZvKrys59a6bP1eYvEXVNU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
|
||||
buildInputs = [ acpica-tools ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
hardeningDisable = [ "pic" "stackprotector" "fortify" ];
|
||||
|
||||
configurePhase = ''
|
||||
# build SeaBIOS for CSM
|
||||
cat > .config << EOF
|
||||
CONFIG_CSM=y
|
||||
CONFIG_QEMU_HARDWARE=y
|
||||
CONFIG_PERMIT_UNALIGNED_PCIROM=y
|
||||
EOF
|
||||
|
||||
make olddefconfig
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp out/Csm16.bin $out/Csm16.bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source implementation of a 16bit X86 BIOS";
|
||||
longDescription = ''
|
||||
SeaBIOS is an open source implementation of a 16bit X86 BIOS.
|
||||
It can run in an emulator or it can run natively on X86 hardware with the use of coreboot.
|
||||
SeaBIOS is the default BIOS for QEMU and KVM.
|
||||
'';
|
||||
homepage = "http://www.seabios.org";
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -122,7 +122,7 @@ callPackage (import ./generic.nix (rec {
|
|||
++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional"
|
||||
++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional"
|
||||
|
||||
++ optional (withSeabios) "--with-system-seabios=${seabios}"
|
||||
++ optional (withSeabios) "--with-system-seabios=${seabios}/share/seabios"
|
||||
++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios"
|
||||
|
||||
++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd"
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ in buildGoModule rec {
|
|||
|
||||
preFixup = ''
|
||||
mkdir -p $out/lib
|
||||
ln -s "${phpEmbedWithZts}/lib/php.ini" "$out/lib/php.ini"
|
||||
ln -s "${phpEmbedWithZts}/lib/php.ini" "$out/lib/frankenphp.ini"
|
||||
|
||||
wrapProgram $out/bin/frankenphp --set-default PHP_INI_SCAN_DIR $out/lib
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "numbat";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = "numbat";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mwDpdQEIgvdGbcXEtA3TLP1e2yFNRCdcljaOzDEoKjg=";
|
||||
hash = "sha256-zMgZ/QmpZaB+4xdxVBE3C8CWS/aNCDuowDWOg65PhTo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hGNfB82m2w9wDiPs8PMUExWOBN9ZQ+XVs1v8jhHuVhA=";
|
||||
cargoHash = "sha256-x6SMQoiDf0GoyOJGP8S69wJnY/nCvo6Bq5KQyrgY+Gs=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
|
|
|||
26
pkgs/by-name/re/regex2json/package.nix
Normal file
26
pkgs/by-name/re/regex2json/package.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, buildGoModule, fetchFromGitLab }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "regex2json";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "tozd";
|
||||
repo = "regex2json";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WoxrwAH2ocDuwRj52QHPN3sOMXIF3ygzKeb83BKZqKo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-myMUs9urHjYaOQ/UaPYlLZstvClOuvF5xJao4lTP5bY=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = {
|
||||
description = "Convert text to JSON using only regular expressions";
|
||||
homepage = "https://gitlab.com/tozd/regex2json";
|
||||
changelog = "https://gitlab.com/tozd/regex2json/-/blob/${src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ nagy ];
|
||||
mainProgram = "regex2json";
|
||||
};
|
||||
}
|
||||
72
pkgs/by-name/se/seabios/package.nix
Normal file
72
pkgs/by-name/se/seabios/package.nix
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, acpica-tools
|
||||
, python3
|
||||
, writeText
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "seabios";
|
||||
version = "1.16.3";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.seabios.org/seabios.git";
|
||||
rev = "rel-${finalAttrs.version}";
|
||||
hash = "sha256-hWemj83cxdY8p+Jhkh5GcPvI0Sy5aKYZJCsKDjHTUUk=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
|
||||
buildInputs = [ acpica-tools ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
makeFlags = [
|
||||
# https://www.seabios.org/Build_overview#Distribution_builds
|
||||
"EXTRAVERSION=\"-nixpkgs\""
|
||||
];
|
||||
|
||||
hardeningDisable = [ "pic" "stackprotector" "fortify" ];
|
||||
|
||||
postConfigure = let
|
||||
config = writeText "config.txt" (lib.generators.toKeyValue { } {
|
||||
# SeaBIOS with CSM (Compatible Support Module) support; learn more at
|
||||
# https://www.electronicshub.org/what-is-csm-bios/
|
||||
"CONFIG_CSM" = "y";
|
||||
"CONFIG_PERMIT_UNALIGNED_PCIROM" = "y";
|
||||
"CONFIG_QEMU_HARDWARE" = "y";
|
||||
});
|
||||
in ''
|
||||
cp ${config} .config
|
||||
make olddefconfig
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -pv $doc/share/doc/seabios-${finalAttrs.version}/
|
||||
cp -v docs/* $doc/share/doc/seabios-${finalAttrs.version}/
|
||||
install -Dm644 out/Csm16.bin -t $out/share/seabios/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.seabios.org";
|
||||
description = "Open source implementation of a 16bit x86 BIOS";
|
||||
longDescription = ''
|
||||
SeaBIOS is an open source implementation of a 16bit x86 BIOS.
|
||||
It can run in an emulator or it can run natively on x86 hardware with the
|
||||
use of coreboot.
|
||||
'';
|
||||
license = with lib.licenses; [ lgpl3Plus ];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.systems.inspect.patternLogicalAnd
|
||||
lib.systems.inspect.patterns.isUnix
|
||||
lib.systems.inspect.patterns.isx86;
|
||||
badPlatforms = [ lib.systems.inspect.patterns.isDarwin ];
|
||||
};
|
||||
})
|
||||
|
|
@ -9,18 +9,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "shopware-cli";
|
||||
version = "0.3.12";
|
||||
version = "0.4.4";
|
||||
src = fetchFromGitHub {
|
||||
repo = "shopware-cli";
|
||||
owner = "FriendsOfShopware";
|
||||
rev = version;
|
||||
hash = "sha256-vGtHz1lSKbucR4MmXv542lv9kbON9Cwo7vB5TaeqoX8=";
|
||||
hash = "sha256-cic2J1xm/DbZP/qL5jWE7H9x38QAVPwUGpaWEwGTdDk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
nativeCheckInputs = [ git dart-sass ];
|
||||
|
||||
vendorHash = "sha256-vE9gh0u8j2NViK2dUd39zZtUuaoKv0hf8VhSX/P4ar8=";
|
||||
vendorHash = "sha256-Cllujomvlf3u3MjIhoh2BpDD3Tfo6kIbJsoPInIUaPI";
|
||||
|
||||
postInstall = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
|
|
|
|||
|
|
@ -71,13 +71,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-common";
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon";
|
||||
rev = version;
|
||||
hash = "sha256-QEJNBQnj4vXZim5HsRY15VU2CBbnsw/jtSP9JRbWpog=";
|
||||
hash = "sha256-/kjl/0Qdro6H3fMfs1dA0Zf/GT5Z4s6kK4vB+EBKw0g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nemo";
|
||||
version = "6.0.0";
|
||||
version = "6.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-JeiBhgfGyGyNT9eNhtUl6Pp1jgG02NRlm5lam592lS0=";
|
||||
sha256 = "sha256-3iGwpHuZrRBd35nAa3x1Lu/KDS1L42y5u8A4vM41b0Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-system-monitor";
|
||||
version = "6.0.8";
|
||||
version = "6.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-7XvS5HviK9XRsxTGnreYX9IQxxGWk7x7MHtcsHCz1rc=";
|
||||
hash = "sha256-ompsCTPmmF7S0UHNNU0YDQiTdvcFglpEoS4o+XMZ7jg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
|
|||
deepin-system-monitor-main/process/priority_controller.cpp \
|
||||
deepin-system-monitor-main/service/service_manager.cpp \
|
||||
deepin-system-monitor-main/translations/policy/com.deepin.pkexec.deepin-system-monitor.policy \
|
||||
--replace "/usr/bin/kill" "${util-linux}/bin/kill" \
|
||||
--replace "/usr/bin/renice" "${util-linux}/bin/renice" \
|
||||
--replace "/usr/bin/kill" "${lib.getBin util-linux}/bin/kill" \
|
||||
--replace "/usr/bin/renice" "${lib.getBin util-linux}/bin/renice" \
|
||||
--replace '/usr/bin/systemctl' '${lib.getBin systemd}/systemctl'
|
||||
|
||||
substituteInPlace deepin-system-monitor-main/{service/service_manager.cpp,process/{priority_controller.cpp,process_controller.cpp}} \
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-calendar";
|
||||
version = "5.11.0";
|
||||
version = "5.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-AgomXDydGHzfybE3r4IW94zIWKtwURmLW68MwqjLBWE=";
|
||||
hash = "sha256-EQcB+a0dK2c6NdvGFbyp65a8nN2PmOpZLWx61UDOTJg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -95,9 +95,9 @@
|
|||
};
|
||||
|
||||
"12.2" = {
|
||||
version = "12.2.0";
|
||||
url = "https://developer.download.nvidia.com/compute/cuda/12.2.0/local_installers/cuda_12.2.0_535.54.03_linux.run";
|
||||
sha256 = "sha256-7PPSr63LrAKfD0UFeFgQ1S0AbkuHunn/P5hDNqK79Rg=";
|
||||
version = "12.2.2";
|
||||
url = "https://developer.download.nvidia.com/compute/cuda/12.2.2/local_installers/cuda_12.2.2_535.104.05_linux.run";
|
||||
sha256 = "sha256-Kzmq4+dhjZ9Zo8j6HxvGHynAsODfdfsFB2uts1KVLvI=";
|
||||
};
|
||||
|
||||
"12.3" = {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "protolock";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nilslice";
|
||||
repo = "protolock";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vWwRZVArmlTIGwD4zV3dEHN2kkoeCZuNIvjCBVAviPo=";
|
||||
sha256 = "sha256-+7kU4nCBwCA6mnjFrejPrIILYUSfYpq13d+0MmNZoBg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pYtP+Tkh2TcGsbk7zQNaoYLEQrqGOL0gkMG5dUkfpt4=";
|
||||
vendorHash = "sha256-lJhtZQ9S7/h3dSZ72O2l8oHHf3tEmGKC2PPAms09Itc=";
|
||||
|
||||
postInstall = ''
|
||||
rm $out/bin/plugin*
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "yojson";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";
|
||||
hash = "sha256-1YGDIHsZjcBlhmI5Bm4HTDT54TnA2cQXWjiAl5DogXM=";
|
||||
hash = "sha256-WfLxq7/Ip8y9v2CIlOXHXop2AG40iZJURG+D4gDftPk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cppo ];
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "21.0.0";
|
||||
version = "21.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "esphome";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KT38NY1BZM6Qr1EeC05vM9IcVKO7GaEx0102TUzkyRE=";
|
||||
hash = "sha256-HPnyFHHx1BahqzvRChT85BaG4eJM3qvTq2Tpbqb3SDI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "goodwe";
|
||||
version = "0.2.32";
|
||||
version = "0.2.33";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "marcelblijleven";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Uj4f3OcPRqbMaM0ADP6OlPQAXFfCYZS0/qbz9eXGLv0=";
|
||||
hash = "sha256-D2NR31aIl6A3ij8sKOIHPOj3HFQKGwpk6RjA+MB3mMk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "holidays";
|
||||
version = "0.37";
|
||||
version = "0.39";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "dr-prodigy";
|
||||
repo = "python-holidays";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3IhyHLwTPLTcyZY/9dZFmIr7Ael8I3mZrXhqYaULwY8=";
|
||||
hash = "sha256-PsrdR4voEAiEhgoeR03Xp/tacqtcEt1FhO4kfMYkSos=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ihm";
|
||||
version = "0.42";
|
||||
version = "0.43";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihmwg";
|
||||
repo = "python-ihm";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BIw+ytk4IvtMkm8FZdKQ7hvYdJLdNo6SY100WVawgF8=";
|
||||
hash = "sha256-6tjIxe3JYvtWG5z4ltrkUSTxh1q2BDq2I2siYt7dCF8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "influxdb-client";
|
||||
version = "1.38.0";
|
||||
version = "1.39.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "influxdata";
|
||||
repo = "influxdb-client-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oE0RPryuUJcy6HN3V2XIxipGYU41xrYMC7b0sGRfay8=";
|
||||
hash = "sha256-cj3qeT5wE/RqrwOW1MV9sVG+khxyRAO5438omqbKbmY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "libknot";
|
||||
version = "3.3.2";
|
||||
version = "3.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-uttdIl2ONoR9ba6gJXmJkU++UQldcezwTUG+X5mCcbE=";
|
||||
hash = "sha256-w8VAA+llRg1xeAMRe7ISHo8H+qGi247jwOjTZHecFVM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -16,20 +16,26 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyatmo";
|
||||
version = "7.6.0";
|
||||
format = "pyproject";
|
||||
version = "8.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jabesq";
|
||||
repo = "pyatmo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rAmSxayXljOJchiMtSOgnotzQmapK2n86HwNi9HJX68=";
|
||||
hash = "sha256-ASjAmkM/BFWzZYnLeXATbZzSG6KBDcmy66/R1MgzAwQ=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "oauthlib~=3.1" "oauthlib" \
|
||||
--replace "requests~=2.24" "requests"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
|
@ -49,12 +55,6 @@ buildPythonPackage rec {
|
|||
time-machine
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "oauthlib~=3.1" "oauthlib" \
|
||||
--replace "requests~=2.24" "requests"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyatmo"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "surepy";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "benleb";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/fgNznsucjHPO44lK4tk5tDJHKjCJEbPtOO7YHmDcRQ=";
|
||||
hash = "sha256-ETgpXSUUsV1xoZjdnL2bzn4HwDjKC2t13yXwf28OBqI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "3.1.38";
|
||||
version = "3.1.40";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-03tukEuNaQP3YNv66FuDKzeTPcPfPY4PT6ZWRLFDu6c=";
|
||||
hash = "sha256-KnkaE40NVcZAM9U/WmifM9D7xOTRV1Mi7lFIh/r4WJQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -174,8 +174,12 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
|
|||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $libExecPath
|
||||
unzip -d $libExecPath out/Release/dist.zip
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
|
@ -183,14 +187,18 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
|
|||
passthru = {
|
||||
inherit info;
|
||||
headers = stdenv.mkDerivation rec {
|
||||
name = "node-v${info.node}-headers.tar.xz";
|
||||
name = "node-v${info.node}-headers.tar.gz";
|
||||
nativeBuildInputs = [ python3 ];
|
||||
src = fetchdep info.deps."src/third_party/electron_node";
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make tar-headers
|
||||
runHook postBuild
|
||||
'';
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mv ${name} $out
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
|
|||
postPatch = ''
|
||||
# upstream uses lld on aarch64-darwin for faster builds
|
||||
# within nix lld looks for CoreFoundation rather than CoreFoundation.tbd and fails
|
||||
substituteInPlace .cargo/config.toml --replace '"-C", "link-arg=-fuse-ld=lld"' ""
|
||||
substituteInPlace .cargo/config.toml --replace "-fuse-ld=lld " ""
|
||||
'';
|
||||
|
||||
# uses zlib-ng but can't dynamically link yet
|
||||
|
|
@ -41,7 +41,14 @@ rustPlatform.buildRustPackage rec {
|
|||
];
|
||||
buildInputs = lib.optionals stdenv.isDarwin (
|
||||
[ libiconv darwin.libobjc ] ++
|
||||
(with darwin.apple_sdk.frameworks; [ Security CoreServices Metal Foundation QuartzCore ])
|
||||
(with darwin.apple_sdk_11_0.frameworks; [
|
||||
Security
|
||||
CoreServices
|
||||
Metal
|
||||
MetalPerformanceShaders
|
||||
Foundation
|
||||
QuartzCore
|
||||
])
|
||||
);
|
||||
|
||||
# work around "error: unknown warning group '-Wunused-but-set-parameter'"
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
{ lib, stdenv, fetchurl, cups, busybox }:
|
||||
{ lib, stdenv, fetchurl, cups, rpm, cpio }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epson-inkjet-printer-escpr2";
|
||||
version = "1.1.49";
|
||||
version = "1.2.9";
|
||||
|
||||
src = fetchurl {
|
||||
# To find new versions, visit
|
||||
# http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
|
||||
# some printer like for instance "WF-7210" to get to the most recent
|
||||
# version.
|
||||
url = "https://download3.ebz.epson.net/dsc/f/03/00/13/76/47/16f624dc1dfad10c3b4eb141c50c651a6360f69a/epson-inkjet-printer-escpr2-1.1.49-1lsb3.2.src.rpm";
|
||||
sha256 = "sha256-WKDOpS7YL7J/IaNQcTjcoyXNXJGOuEexopdhYFubf50=";
|
||||
url = "https://download3.ebz.epson.net/dsc/f/03/00/15/33/94/3bf10a30a1f8b5b91ddbafa4571c073878ec476b/epson-inkjet-printer-escpr2-1.2.9-1.src.rpm";
|
||||
sha256 = "sha256-2smNBTMSqoKYsGUoBtIHS3Fwk9ODbiXaP7Dtq69FG9U=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
rpm2cpio $src | cpio -idmv
|
||||
tar xvf ${pname}-${version}-1lsb3.2.tar.gz
|
||||
tar xvf ${pname}-${version}-1.tar.gz
|
||||
cd ${pname}-${version}
|
||||
|
||||
runHook postUnpack
|
||||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
patches = [ ./cups-filter-ppd-dirs.patch ];
|
||||
|
||||
buildInputs = [ cups ];
|
||||
nativeBuildInputs = [ busybox ];
|
||||
nativeBuildInputs = [ rpm cpio ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://download.ebz.epson.net/dsc/search/01/search/";
|
||||
|
|
|
|||
|
|
@ -59,11 +59,11 @@ rec {
|
|||
# Vulkan developer beta driver
|
||||
# See here for more information: https://developer.nvidia.com/vulkan-driver
|
||||
vulkan_beta = generic rec {
|
||||
version = "535.43.20";
|
||||
version = "535.43.22";
|
||||
persistencedVersion = "535.98";
|
||||
settingsVersion = "535.98";
|
||||
sha256_64bit = "sha256-PVs+AnVbJhriAHlxVEV81fqT4n92edv0cQyAGvuUgPw=";
|
||||
openSha256 = "sha256-xqjitZRsIvbE98zzSQNorkCguDJt53eCxKYBxIZQwVM=";
|
||||
sha256_64bit = "sha256-emam5bfYJeFi1+Z0Z1//luaY1JTKcQNYUP8GmG9480Q=";
|
||||
openSha256 = "sha256-8Nz6LfEdAsm7d6Leqs+ikN0BpOPkLCcd7bckK0MOIFU=";
|
||||
settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s=";
|
||||
persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM=";
|
||||
url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nginx-sso";
|
||||
version = "0.27.2";
|
||||
version = "0.27.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Luzifer";
|
||||
repo = "nginx-sso";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Lpaqcxw1q609rYuEd1zrAKXE0GDEi72wl2eoFezvrV8=";
|
||||
hash = "sha256-8ZfNHjf5sbcBasu3o3AHCL0tGROixdNZkDF9yd/uPbs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XReXxugMfR2l2LMTvXpSJa7Z9BX7LytwYdYNijPtciE=";
|
||||
vendorHash = "sha256-bquK6/xT+xhEGBDeNN3U1qwSxrHWQhdHNuw9RXoqM+8=";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xsecurelock";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "xsecurelock";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sK3KrtZzrV2jkQveZnSHDR5I4v7baL/sARje2mDpIMI=";
|
||||
sha256 = "sha256-OPasi5zmvmcWnVCj/dU2KprzNmar51zDElD23750yk4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nebula";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slackhq";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9WlccDDTChw3N+alN9l3ABLBywBLMoxDUyDgtNkXsTg=";
|
||||
hash = "sha256-lLDoAR3n3V0hJWvvSqz0nWXSsiXK+kjJJo7okv4KX8c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QeRmIgN0UuX6CYopTS2IUwduEHn9NIhHsdPQN//eK2Y=";
|
||||
vendorHash = "sha256-amOveyxXGyQVV6yQspExXfj0JTN9yLs6+bcKYRst1tU=";
|
||||
|
||||
subPackages = [ "cmd/nebula" "cmd/nebula-cert" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,17 +5,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cnspec";
|
||||
version = "9.11.0";
|
||||
version = "9.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnspec";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Lcky8+tY91ndZEJ6ZcBxxLHYj6k7U0Yu6BKs5MiB15U=";
|
||||
hash = "sha256-bNSSU7UJBexnZ95fJM0Oa70jGbbM0ghNA0ePESRMjX0=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-bFnlvstu+yYteq719r9g0A2sNJAaxV/jZR9Ww3FoG28=";
|
||||
vendorHash = "sha256-9hjQBoZW6pnuo1YDegp+yxpvR4Ja+6BqOg5/fqwPRig=";
|
||||
|
||||
subPackages = [
|
||||
"apps/cnspec"
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubeclarity";
|
||||
version = "2.22.0";
|
||||
version = "2.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openclarity";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VpTLf4Z2l9Ix92GzcyJvj4j2j+aff8nc2qW9+2uaPBs=";
|
||||
hash = "sha256-gET+nrNYWV4ON0y9/oh9QihqffkJEn38k7CcScqzHWI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kYdKCHqzDbfCGMlTMPSHAQkSLyhkCl/OvV7CF5jdyaY=";
|
||||
vendorHash = "sha256-rYUbXkf0wOPehXvAzcww0WVycATWdK72LOqbQolqoWc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -27130,8 +27130,6 @@ with pkgs;
|
|||
|
||||
ops = callPackage ../applications/virtualization/ops { };
|
||||
|
||||
seabios = callPackage ../applications/virtualization/seabios { };
|
||||
|
||||
vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };
|
||||
|
||||
patroni = callPackage ../servers/sql/patroni { pythonPackages = python3Packages; };
|
||||
|
|
|
|||
Loading…
Reference in a new issue