Merge master into staging-next
This commit is contained in:
commit
25aa617845
@ -4,48 +4,36 @@
|
||||
editorconfig,
|
||||
f,
|
||||
fetchFromGitHub,
|
||||
replaceVars,
|
||||
jsonrpc,
|
||||
nodejs,
|
||||
s,
|
||||
melpaBuild,
|
||||
copilot-node-server,
|
||||
copilot-language-server,
|
||||
}:
|
||||
let
|
||||
# The Emacs package isn't compatible with the latest
|
||||
# copilot-node-server so we have to set a specific revision
|
||||
# https://github.com/copilot-emacs/copilot.el/issues/344
|
||||
pinned-copilot-node-server = copilot-node-server.overrideAttrs (old: rec {
|
||||
version = "1.27.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jfcherng";
|
||||
repo = "copilot-node-server";
|
||||
rev = version;
|
||||
hash = "sha256-Ds2agoO7LBXI2M1dwvifQyYJ3F9fm9eV2Kmm7WITgyo=";
|
||||
};
|
||||
});
|
||||
in
|
||||
melpaBuild {
|
||||
melpaBuild (finalAttrs: {
|
||||
pname = "copilot";
|
||||
version = "0-unstable-2024-12-28";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "copilot-emacs";
|
||||
repo = "copilot.el";
|
||||
rev = "c5dfa99f05878db5e6a6a378dc7ed09f11e803d4";
|
||||
sha256 = "sha256-FzI08AW7a7AleEM7kSQ8LsWsDYID8SW1SmSN6/mIB/A=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-hIA+qdWoOJI9/hqBUSHhmh+jjzDnPiZkIzszCPuQxd0=";
|
||||
};
|
||||
|
||||
files = ''(:defaults "dist")'';
|
||||
|
||||
patches = [
|
||||
(replaceVars ./specify-copilot-install-dir.patch {
|
||||
copilot-node-server = pinned-copilot-node-server;
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace copilot.el \
|
||||
--replace-fail "defcustom copilot-server-executable \"copilot-language-server\"" \
|
||||
"defcustom copilot-server-executable \"${lib.getExe copilot-language-server}\""
|
||||
'';
|
||||
|
||||
packageRequires = [
|
||||
dash
|
||||
editorconfig
|
||||
f
|
||||
jsonrpc
|
||||
s
|
||||
];
|
||||
|
||||
@ -64,4 +52,4 @@ melpaBuild {
|
||||
"x86_64-windows"
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -1,14 +0,0 @@
|
||||
diff --git a/copilot.el b/copilot.el
|
||||
index f1f5e51..ddf2b5b 100644
|
||||
--- a/copilot.el
|
||||
+++ b/copilot.el
|
||||
@@ -132,8 +132,7 @@ (defcustom copilot-indentation-alist
|
||||
(defconst copilot-server-package-name "copilot-node-server"
|
||||
"The name of the package to install copilot server.")
|
||||
|
||||
-(defcustom copilot-install-dir (expand-file-name
|
||||
- (locate-user-emacs-file (f-join ".cache" "copilot")))
|
||||
+(defcustom copilot-install-dir "@copilot-node-server@"
|
||||
"Directory in which the servers will be installed."
|
||||
:risky t
|
||||
:type 'directory
|
File diff suppressed because it is too large
Load Diff
@ -9,10 +9,10 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "138.0";
|
||||
version = "138.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "265eef505216f70d50ebb95a6b23983d0b70430320e7e2dcf497127890d7bbdff1c49c64790010c85b8e3fe0da5c90e95b2d44fb1adca64b1755428ccb2b91a2";
|
||||
sha512 = "bc5a8d658140c4c3db29d51134c97105a0225567d5ce14757f69594066bf6a44a13e0626cebde2b7a078bac128a14690ee06083d0306d7789de2a5e9d8394b23";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
let
|
||||
appName = "AeroSpace.app";
|
||||
version = "0.18.2-Beta";
|
||||
version = "0.18.4-Beta";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "aerospace";
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip";
|
||||
sha256 = "sha256-/Fc4Zk8KvAdaKXyHmeL9nh79CAQLx/Y6URFWIOL5YyQ=";
|
||||
sha256 = "sha256-TjVxq1HS/gdGi32noj7i1P6e9lXKNtBoO373Cesnwks=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
@ -17,11 +17,11 @@ let
|
||||
rec {
|
||||
x86_64-linux = {
|
||||
urlSuffix = "linux-x86_64.tar.gz";
|
||||
hash = "sha256-WUAyGx7RcLlQsYpfcbV69k1ESaif5VraxUFAslMi5lo=";
|
||||
hash = "sha256-s3/975BJELl6J3u9reyVBEbismR32uJq6NXF7u/Dcp0=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
urlSuffix = "macos-universal.zip";
|
||||
hash = "sha256-fB6DCp2+7T9ozHuMdsv6IwwIyD6+t7LxVWMj9lDJ5Fw=";
|
||||
hash = "sha256-xMEyJxucnVuxSa0zwOYr91C7yUuMvKkRTYZhuioV1xc=";
|
||||
};
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
}
|
||||
@ -30,7 +30,7 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "appflowy";
|
||||
version = "0.8.8";
|
||||
version = "0.8.9";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";
|
||||
|
@ -2,13 +2,11 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "beedii";
|
||||
|
||||
# 1.2.0 does not include font files.
|
||||
# https://github.com/webkul/beedii/issues/1
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchzip {
|
||||
@ -25,6 +23,15 @@ stdenvNoCC.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
url = "https://github.com/webkul/beedii";
|
||||
rev-prefix = "v";
|
||||
|
||||
# This version does not include font files in the released assets.
|
||||
# https://github.com/webkul/beedii/issues/1
|
||||
ignoredVersions = "^1\.2\.0$";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Free Hand Drawn Emoji Font";
|
||||
homepage = "https://github.com/webkul/beedii";
|
||||
|
@ -15,20 +15,31 @@ let
|
||||
hash = "sha256-hYbTYvfrTpRPRwXXgNCqKeEtiRpuLj6sYIYnfJ3aMv4=";
|
||||
};
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit version pname src;
|
||||
inherit pname version src;
|
||||
|
||||
postExtract = ''
|
||||
# disable creating a desktop file and icon in the home folder during runtime
|
||||
linuxConfigFilename=$out/resources/app/build/main/linux-*.mjs
|
||||
echo "export function registerLinuxConfig() {}" > $linuxConfigFilename
|
||||
|
||||
# disable auto update
|
||||
sed -i 's/[^=]*\.auto_update_disabled/true/' $out/resources/app/build/main/main-entry-*.mjs
|
||||
|
||||
# prevent updates
|
||||
sed -i -E 's/executeDownload\([^)]+\)\{/executeDownload(){return;/g' $out/resources/app/build/main/main-entry-*.mjs
|
||||
|
||||
# hide version status element on about page otherwise a error message is shown
|
||||
sed -i '$ a\.subview-prefs-about > div:nth-child(2) {display: none;}' $out/resources/app/build/renderer/PrefsPanes-*.css
|
||||
'';
|
||||
};
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
appimageTools.wrapAppImage {
|
||||
inherit pname version;
|
||||
|
||||
src = appimageContents;
|
||||
|
||||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
|
||||
postExtract = ''
|
||||
# disable creating a desktop file and icon in the home folder during runtime
|
||||
linuxConfigFilename=$out/resources/app/build/main/linux-*.mjs
|
||||
echo "export function registerLinuxConfig() {}" > $linuxConfigFilename
|
||||
'';
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -Dm 644 ${appimageContents}/beepertexts.png $out/share/icons/hicolor/512x512/apps/beepertexts.png
|
||||
install -Dm 644 ${appimageContents}/beepertexts.desktop -t $out/share/applications/
|
||||
@ -50,10 +61,13 @@ appimageTools.wrapType2 {
|
||||
text = ''
|
||||
set -o errexit
|
||||
latestLinux="$(curl --silent --output /dev/null --write-out "%{redirect_url}\n" https://api.beeper.com/desktop/download/linux/x64/stable/com.automattic.beeper.desktop)"
|
||||
version="$(echo "$latestLinux" | grep --only-matching --extended-regexp '[0-9]+\.[0-9]+\.[0-9]+')"
|
||||
version="$(echo "$latestLinux" | grep --only-matching --extended-regexp '[0-9]+\.[0-9]+\.[0-9]+')"
|
||||
update-source-version beeper "$version"
|
||||
'';
|
||||
});
|
||||
|
||||
# needed for nix-update
|
||||
inherit src;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.21.0";
|
||||
version = "2.21.1";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
|
||||
hash = "sha256-pYNjb7jvYNgL6H+jhH1eviwk67JCDt1S5F2yxRaAO6g=";
|
||||
hash = "sha256-l8ud3yiycRyWk4yQ8LkJIGpK2aZh8GwYKRBZEYqObHg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -21,6 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-applets";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-applets";
|
||||
|
@ -13,6 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-applibrary";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-applibrary";
|
||||
|
@ -15,6 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-bg";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-bg";
|
||||
|
@ -22,6 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-comp";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-comp";
|
||||
|
@ -23,6 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-edit";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-edit";
|
||||
|
@ -14,6 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-files";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-files";
|
||||
|
@ -19,6 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-greeter";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-greeter";
|
||||
|
@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-icons";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-icons";
|
||||
|
@ -18,6 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-idle";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-idle";
|
||||
|
@ -13,6 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-launcher";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-launcher";
|
||||
|
@ -14,6 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-notifications";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-notifications";
|
||||
|
@ -14,6 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-osd";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-osd";
|
||||
|
@ -13,6 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-panel";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-panel";
|
||||
|
@ -20,6 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-player";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-player";
|
||||
|
@ -14,6 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-randr";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-randr";
|
||||
|
@ -12,6 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-screenshot";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-screenshot";
|
||||
|
@ -14,6 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-session";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-session";
|
||||
|
@ -17,6 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-settings-daemon";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-settings-daemon";
|
||||
|
@ -29,6 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-settings";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-settings";
|
||||
|
@ -17,6 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-store";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-store";
|
||||
|
@ -17,6 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-term";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-term";
|
||||
|
@ -10,6 +10,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-wallpapers";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-wallpapers";
|
||||
|
@ -16,6 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-workspaces-epoch";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-workspaces-epoch";
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "docfd";
|
||||
version = "10.2.0";
|
||||
version = "11.0.1";
|
||||
|
||||
minimalOCamlVersion = "5.1";
|
||||
|
||||
@ -22,7 +22,7 @@ ocamlPackages.buildDunePackage rec {
|
||||
owner = "darrenldl";
|
||||
repo = "docfd";
|
||||
rev = version;
|
||||
hash = "sha256-wVhsZTG8yEkxKA0ta3IDe7O/ER5RuBuFOPKHP8xS2GA=";
|
||||
hash = "sha256-uRC2QBn4gAfS9u85YaNH2Mm2C0reP8FnDHbyloY+OC8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -20,13 +20,13 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "freetube";
|
||||
version = "0.23.4";
|
||||
version = "0.23.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeTubeApp";
|
||||
repo = "FreeTube";
|
||||
tag = "v${finalAttrs.version}-beta";
|
||||
hash = "sha256-JQob4NyZ00iOnRbSyNWjL4xyNQ14ixyZDXsJ7KBd9ZM=";
|
||||
hash = "sha256-tVe//h20cTVgpHeo3IlfGfuAH+dM6H5MEfGny5Uhrjk=";
|
||||
};
|
||||
|
||||
# Darwin requires writable Electron dist
|
||||
|
@ -23,21 +23,21 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-podcasts";
|
||||
version = "0.7.2";
|
||||
version = "25.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "podcasts";
|
||||
rev = version;
|
||||
hash = "sha256-xPB1ieOgnHe2R5ORK0Hl61V+iDZ7WsJEnsAJGZvQUVI=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-pVGut7kmwybPrR7ZaXPoDx03FOYeZSvchXl++2cdPck=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
hash = "sha256-Nzfsr1OFw7DnxrNol00BI9WIe1Tau3z/R4zdF0PaBOk=";
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-HKU4rd5OzxhYcN6QKiTVj+NnkdyG8T+D6X1txznZ/xM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -78,6 +78,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Listen to your favorite podcasts";
|
||||
mainProgram = "gnome-podcasts";
|
||||
homepage = "https://apps.gnome.org/Podcasts/";
|
||||
changelog = "https://gitlab.gnome.org/World/podcasts/-/releases/${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
teams = [
|
||||
lib.teams.gnome
|
||||
@ -86,4 +87,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-podcasts.x86_64-darwin
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -8,10 +8,10 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "halo";
|
||||
version = "2.20.18";
|
||||
version = "2.20.19";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar";
|
||||
hash = "sha256-N3hbiK/pmZ30wJA8VJI9ft6o7VKQEM2+evakk0EObx4=";
|
||||
hash = "sha256-4xXg1pW6vXebrmmyhzQKmJReR8gfRrflrfuB3ijk4tc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,25 +8,27 @@
|
||||
|
||||
let
|
||||
pname = "hoppscotch";
|
||||
version = "25.1.1-0";
|
||||
version = "25.3.2-0";
|
||||
|
||||
src =
|
||||
fetchurl
|
||||
{
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg";
|
||||
hash = "sha256-1KYc96WUlybXhgPeT97w1mLE2zxmohIhvNMCmEb5Vf0=";
|
||||
hash = "sha256-l8R6pWu8lJSuji8lITFJFUagvFUFbJ5KKUBJ/1jE9WI=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg";
|
||||
hash = "sha256-wdqgzTXFL7Dvq1DOrjyPE4O3OYfpvmRSLzk+HBJIaTU=";
|
||||
hash = "sha256-6HT2IwdjaMjf+PcN6/keCSIqKAIOsQqocEibA+v5GJc=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage";
|
||||
hash = "sha256-M9fQx4NBotLPe8i43E1uqHpFeoXdHGQePp4zgzbzDdM=";
|
||||
hash = "sha256-TpR0vfOba34C+BMi5Yn1C1M83gPXzRnqi1w0+Jt5GNc=";
|
||||
};
|
||||
}
|
||||
.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Open source API development ecosystem";
|
||||
@ -56,6 +58,7 @@ if stdenv.hostPlatform.isDarwin then
|
||||
pname
|
||||
version
|
||||
src
|
||||
passthru
|
||||
meta
|
||||
;
|
||||
|
||||
@ -78,6 +81,7 @@ else
|
||||
pname
|
||||
version
|
||||
src
|
||||
passthru
|
||||
meta
|
||||
;
|
||||
|
||||
@ -87,7 +91,9 @@ else
|
||||
in
|
||||
''
|
||||
# Install .desktop files
|
||||
install -Dm444 ${appimageContents}/hoppscotch.desktop -t $out/share/applications
|
||||
install -Dm444 ${appimageContents}/hoppscotch.png -t $out/share/pixmaps
|
||||
install -Dm444 ${appimageContents}/Hoppscotch.desktop $out/share/applications/hoppscotch.desktop
|
||||
install -Dm444 ${appimageContents}/Hoppscotch.png $out/share/pixmaps/hoppscotch.png
|
||||
substituteInPlace $out/share/applications/hoppscotch.desktop \
|
||||
--replace-fail "hoppscotch-desktop" "hoppscotch"
|
||||
'';
|
||||
}
|
||||
|
22
pkgs/by-name/ho/hoppscotch/update.sh
Executable file
22
pkgs/by-name/ho/hoppscotch/update.sh
Executable file
@ -0,0 +1,22 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p bash nix-update common-updater-scripts nix jq
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; hoppscotch.version or (lib.getVersion hoppscotch)" | tr -d '"')
|
||||
latestVersion=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/hoppscotch/releases/releases/latest | jq --raw-output .tag_name | sed 's/^v//')
|
||||
|
||||
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||
echo "package is up-to-date: $currentVersion"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
update-source-version hoppscotch $latestVersion || true
|
||||
|
||||
for system in \
|
||||
x86_64-linux \
|
||||
x86_64-darwin \
|
||||
aarch64-darwin; do
|
||||
hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; hoppscotch.src.url" --system "$system" | tr -d '"')))
|
||||
update-source-version hoppscotch $latestVersion $hash --system=$system --ignore-same-version
|
||||
done
|
@ -59,7 +59,7 @@ buildNpmPackage rec {
|
||||
$out/share/applications \
|
||||
$out/share/icons/hicolor/512x512/apps
|
||||
|
||||
readonly dist=release/linux-unpacked
|
||||
readonly dist=release/*-unpacked
|
||||
|
||||
cp -a $dist/resources $out/share/${pname}
|
||||
|
||||
|
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "nix-community";
|
||||
repo = "nh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Pqff6gVSNP2kA0Oo0t9CUy9cdf2yGnwSfwlOvS5LtKM=";
|
||||
hash = "sha256-BCD0tfDNlQHFM75THRtXM3GegMg/KbREsYllg7Az9ao=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@ -54,7 +54,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-alZFjeBJskp4vu+uaEy9tMkdS1aXcv8d6AQ8jeJKEOA=";
|
||||
cargoHash = "sha256-cNYPxM2DOLdyq0YcZ0S/WIa3gAx7aTzPp7Zhbtu4PKg=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
@ -44,13 +44,13 @@
|
||||
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ossia-score";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ossia";
|
||||
repo = "score";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7gZTUdOVfMlNDuvLrt8twbHCBOz9hoZQaQdWdDF6qMg=";
|
||||
hash = "sha256-f4n1EPOAAAWyHJvbA2xF1ZpOd9sjo4NWG73EaDik78Q=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -21,6 +21,7 @@ let
|
||||
comment = "Calculate Investment Portfolio Performance";
|
||||
desktopName = "Portfolio Performance";
|
||||
categories = [ "Office" ];
|
||||
startupWMClass = "Portfolio Performance";
|
||||
};
|
||||
|
||||
runtimeLibs = lib.makeLibraryPath [
|
||||
@ -33,11 +34,11 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.75.1";
|
||||
version = "0.76.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
|
||||
hash = "sha256-TIkEv8YEKgvi2DQ7vc90ZjyvVNOiMQvBhb8rqPT2Xl0=";
|
||||
hash = "sha256-F3U6CU6hZktN2Lq9pPRAw7OSLubEz6ddTAym5azRj1c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,16 +8,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "spicetify-cli";
|
||||
version = "2.39.7";
|
||||
version = "2.40.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spicetify";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iqx+bwq99xNUt2NEc3ZFxPdfE+WJPhmJXJ26sPCm8sk=";
|
||||
hash = "sha256-qBUGi4Q1RZnJ7cXNT9fjSPj5CVdku37h5+4Pv42/B7Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wSmKzof3nAyA+wI8kXQu/t5Fz4l22JyW50PCuOrWK1k=";
|
||||
vendorHash = "sha256-yCxEpfqZRJcx4KevS+vqq6taHCZyEw1VK4Xt6BPPFAo=";
|
||||
|
||||
ldflags = [
|
||||
"-s -w"
|
||||
|
@ -16,8 +16,8 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "termius";
|
||||
version = "9.18.1";
|
||||
revision = "220";
|
||||
version = "9.19.1";
|
||||
revision = "222";
|
||||
|
||||
src = fetchurl {
|
||||
# find the latest version with
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
# and the sha512 with
|
||||
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap";
|
||||
hash = "sha512-IpFMTY161PlXtsr64YAdE21BupqYHxZZC7ZNbh3Zd10F1zJhVd+qAQOLOv6vdryu0HdhPv91Z1AEfz6BwLGVYA==";
|
||||
hash = "sha512-WwFXunaA7hERnOl1ZKxLC0QR2ZdBkvJBdBDRcNDDzAnBqHOdu9TibqXKdUk11CbE5j/q+ak9DoavemK2s3MKKg==";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
@ -7,10 +7,10 @@
|
||||
|
||||
let
|
||||
pname = "wootility";
|
||||
version = "5.0.3";
|
||||
version = "5.0.6";
|
||||
src = fetchurl {
|
||||
url = "https://wootility-updates.ams3.cdn.digitaloceanspaces.com/wootility-linux/Wootility-${version}.AppImage";
|
||||
sha256 = "sha256-uDjxA8o/ZvWJzpwJFs2b6jXcaRBeNy04hkeZ3DGoXVs=";
|
||||
sha256 = "sha256-9DFt8Hx39B7hgIQn22TPDva1mpxBYFtddNG+WNeqgF8=";
|
||||
};
|
||||
in
|
||||
|
||||
|
@ -19,6 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "xdg-desktop-portal-cosmic";
|
||||
version = "1.0.0-alpha.7";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "xdg-desktop-portal-cosmic";
|
||||
|
@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "duckdb.yazi";
|
||||
version = "25.4.8-unstable-2025-04-20";
|
||||
version = "25.4.8-unstable-2025-04-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wylie102";
|
||||
repo = "duckdb.yazi";
|
||||
rev = "6259e2d26236854b966ebc71d28de0397ddbe4d8";
|
||||
hash = "sha256-9DMqE/pihp4xT6Mo2xr51JJjudMRAesxD5JqQ4WXiM4=";
|
||||
rev = "02f902dfaf22f20c121da49bfcf5500f4fb11d7d";
|
||||
hash = "sha256-fESxJDU7befG2aDxm79M9Eq71RH1UwA4hi0OgK9vPbM=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
@ -7,16 +7,16 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "phpstan";
|
||||
version = "2.1.12";
|
||||
version = "2.1.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phpstan";
|
||||
repo = "phpstan-src";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-KX5wvt6MGzxp24z9ga2U9NL1F9qUDeqLaILoISfB7dQ=";
|
||||
hash = "sha256-/danRcl5yTJNtJFhuIRMvNuii7SZc/e9B+gM6MB6Avc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JFrRZMB8ety+ZJSIgaTRCTbE+t2HfAUmtyBLHwEg+9A=";
|
||||
vendorHash = "sha256-IYcpPaXrML+YM3kcU527RMQjluczsISSyHGzsQFZuuc=";
|
||||
composerStrictValidation = false;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
@ -21,13 +21,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-aws";
|
||||
version = "0.2.15";
|
||||
version = "0.2.22";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain-aws";
|
||||
tag = "v${version}";
|
||||
tag = "langchain-aws==${version}";
|
||||
hash = "sha256-tEkwa+rpitGxstci754JH5HCqD7+WX0No6ielJJnbxk=";
|
||||
};
|
||||
|
||||
@ -71,7 +71,7 @@ buildPythonPackage rec {
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"^langchain-aws==([0-9.]+)$"
|
||||
"langchain-aws==([0-9.]+)"
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lcn-frontend";
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "lcn_frontend";
|
||||
inherit version;
|
||||
hash = "sha256-pjpzOUhNCEYncCk+u/1u5gXot+5rEAvSfdL21fO6LMY=";
|
||||
hash = "sha256-WPjK/CzEpi9S1raEotR10n7eM06jg5ihAUKCLt8KDig=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -2,23 +2,15 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
bpf-linker,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
mitmproxy,
|
||||
mitmproxy-rs,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "mitmproxy-linux";
|
||||
version = "0.11.5";
|
||||
inherit (mitmproxy-rs) version src cargoDeps;
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitmproxy";
|
||||
repo = "mitmproxy_rs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vC+Vsv7UWjkO+6lm7gAb91Ig04Y7r9gYQoz6R9xpxsA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace mitmproxy-linux/build.rs \
|
||||
--replace-fail '"-Z",' "" \
|
||||
@ -26,12 +18,12 @@ buildPythonPackage rec {
|
||||
|
||||
substituteInPlace mitmproxy-linux-ebpf/.cargo/config.toml \
|
||||
--replace-fail 'build-std = ["core"]' ""
|
||||
'';
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-CFsefq1zQLIYjZcfoy3afYfP/0MlBoi9kVx7FVGEKr0=";
|
||||
};
|
||||
cp ${./fix-mitmproxy-linux-redirector-path.diff} tmp.diff
|
||||
substituteInPlace tmp.diff \
|
||||
--replace-fail @mitmproxy-linux-redirector@ $out/bin/mitmproxy-linux-redirector
|
||||
patch -p1 < tmp.diff
|
||||
'';
|
||||
|
||||
RUSTFLAGS = "-C target-feature=";
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
@ -49,13 +41,13 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "mitmproxy_linux" ];
|
||||
|
||||
meta = {
|
||||
description = "Rust bits in mitmproxy";
|
||||
homepage = "https://github.com/mitmproxy/mitmproxy_rs/tree/main/mitmproxy-linux";
|
||||
changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md#${
|
||||
lib.replaceStrings [ "." ] [ "" ] version
|
||||
}";
|
||||
license = lib.licenses.mit;
|
||||
inherit (mitmproxy.meta) maintainers;
|
||||
};
|
||||
meta =
|
||||
{
|
||||
inherit (mitmproxy-rs.meta) changelog license maintainers;
|
||||
}
|
||||
// {
|
||||
description = "Linux Rust bits in mitmproxy";
|
||||
homepage = "https://github.com/mitmproxy/mitmproxy_rs/tree/main/mitmproxy-linux";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -0,0 +1,13 @@
|
||||
diff --git a/mitmproxy-linux/mitmproxy_linux/__init__.py b/mitmproxy-linux/mitmproxy_linux/__init__.py
|
||||
index 7c50254..68aea37 100644
|
||||
--- a/mitmproxy-linux/mitmproxy_linux/__init__.py
|
||||
+++ b/mitmproxy-linux/mitmproxy_linux/__init__.py
|
||||
@@ -12,6 +12,8 @@ def executable_path() -> Path:
|
||||
for development setups this may invoke cargo to build it.
|
||||
"""
|
||||
|
||||
+ return "@mitmproxy-linux-redirector@"
|
||||
+
|
||||
if getattr(sys, 'frozen', False) and (pyinstaller_dir := getattr(sys, '_MEIPASS')):
|
||||
return Path(pyinstaller_dir) / "mitmproxy-linux-redirector"
|
||||
else:
|
@ -2,11 +2,12 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
mitmproxy-rs,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mitmproxy-macos";
|
||||
version = "0.11.5";
|
||||
inherit (mitmproxy-rs) version;
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
@ -15,7 +16,7 @@ buildPythonPackage rec {
|
||||
format = "wheel";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
hash = "sha256-j3qqZGrMZLpHkKf01Gy5+/18sEEbm3pWfbBASGS/8o0=";
|
||||
hash = "sha256-sNguT3p72v9+FU5XFLYV6p0fO6WvGYerPy68GINwbyA=";
|
||||
};
|
||||
|
||||
# repo has no python tests
|
||||
|
@ -11,21 +11,21 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mitmproxy-rs";
|
||||
version = "0.11.5";
|
||||
version = "0.12.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitmproxy";
|
||||
repo = "mitmproxy_rs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vC+Vsv7UWjkO+6lm7gAb91Ig04Y7r9gYQoz6R9xpxsA=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bWvSaUx5nv8d17eOWyYlhSDi71rHycrFoDGRuQEL7LU=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "mitmproxy-rs";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-CFsefq1zQLIYjZcfoy3afYfP/0MlBoi9kVx7FVGEKr0=";
|
||||
hash = "sha256-9J5RVGCXyMOcCYUP+LS92Xv1krA+feoMqFgeFExxxqY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,20 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
# Mitmproxy requirements
|
||||
aioquic,
|
||||
argon2-cffi,
|
||||
asgiref,
|
||||
brotli,
|
||||
buildPythonPackage,
|
||||
certifi,
|
||||
cryptography,
|
||||
fetchFromGitHub,
|
||||
flask,
|
||||
h11,
|
||||
h2,
|
||||
hyperframe,
|
||||
hypothesis,
|
||||
kaitaistruct,
|
||||
ldap3,
|
||||
mitmproxy-linux,
|
||||
mitmproxy-rs,
|
||||
msgpack,
|
||||
passlib,
|
||||
@ -22,41 +23,38 @@
|
||||
pyopenssl,
|
||||
pyparsing,
|
||||
pyperclip,
|
||||
ruamel-yaml,
|
||||
setuptools,
|
||||
sortedcontainers,
|
||||
tornado,
|
||||
urwid,
|
||||
wsproto,
|
||||
zstandard,
|
||||
# Additional check requirements
|
||||
hypothesis,
|
||||
pytest-asyncio,
|
||||
pytest-timeout,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
requests,
|
||||
ruamel-yaml,
|
||||
setuptools,
|
||||
sortedcontainers,
|
||||
stdenv,
|
||||
tornado,
|
||||
urwid,
|
||||
wsproto,
|
||||
zstandard,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mitmproxy";
|
||||
version = "11.1.3";
|
||||
version = "12.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitmproxy";
|
||||
repo = "mitmproxy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gTeXxNQWVMQYiGdIyy7SS6JcuYG16KLnjxBBdjhi+lE=";
|
||||
hash = "sha256-2dEoPgT8g59sLRV5gMPo7XII0XjTrn2cVdYetxDj/V0=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"h11" # https://github.com/NixOS/nixpkgs/pull/399393
|
||||
"h2"
|
||||
"passlib"
|
||||
"protobuf"
|
||||
"pyparsing"
|
||||
"ruamel.yaml"
|
||||
"urwid"
|
||||
"typing-extensions" # https://github.com/NixOS/nixpkgs/pull/397082
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -14,11 +14,11 @@ else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dune";
|
||||
version = "3.18.1";
|
||||
version = "3.18.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
|
||||
hash = "sha256-X6HjSPDLJO7U7ZPO/w92gGTIcHjOsAj2dW1SG/zu6p4=";
|
||||
hash = "sha256-Vr5Qn/w8W6ZSET2ea0PtsEppHx4fbLuhe50kOxI5p68=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unityhub";
|
||||
version = "3.11.1";
|
||||
version = "3.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb";
|
||||
sha256 = "sha256-1JRV8hohI+UoNYtpuU3HChUOpOFT6ZWEak96s0NmSJU=";
|
||||
sha256 = "sha256-2shkZ+RuoOVWFU5uaBQ/oOrXcxTfcbhEVVIzYVvQ3k0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,7 +1,11 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
replaceVars,
|
||||
qtwebengine,
|
||||
xapian,
|
||||
man-db,
|
||||
python3,
|
||||
kio-extras,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "khelpcenter";
|
||||
@ -9,6 +13,13 @@ mkKdeDerivation {
|
||||
extraBuildInputs = [
|
||||
qtwebengine
|
||||
xapian
|
||||
python3
|
||||
kio-extras
|
||||
];
|
||||
patches = [
|
||||
(replaceVars ./use_nix_paths_for_mansearch_utilities.patch {
|
||||
inherit man-db;
|
||||
})
|
||||
];
|
||||
meta.mainProgram = "khelpcenter";
|
||||
}
|
||||
|
@ -0,0 +1,23 @@
|
||||
diff --git a/searchhandlers/khc_mansearch.py b/searchhandlers/khc_mansearch.py
|
||||
index ce61ed9c..a8c4c653 100755
|
||||
--- a/searchhandlers/khc_mansearch.py
|
||||
+++ b/searchhandlers/khc_mansearch.py
|
||||
@@ -32,15 +32,15 @@ def main():
|
||||
# If the query is a single word, perhaps it is the literal name of the
|
||||
# command, or a prefix, or a substring
|
||||
if not ' ' in words:
|
||||
- results_prefix = subprocess.run(['whatis', '-w', words + '*'], capture_output=True, text=True)
|
||||
+ results_prefix = subprocess.run(['@man-db@/bin/whatis', '-w', words + '*'], capture_output=True, text=True)
|
||||
if results_prefix.returncode == 0:
|
||||
command_results += results_prefix.stdout
|
||||
- results_substring = subprocess.run(['whatis', '-w', '*' + words + '*'], capture_output=True, text=True)
|
||||
+ results_substring = subprocess.run(['@man-db@/bin/whatis', '-w', '*' + words + '*'], capture_output=True, text=True)
|
||||
if results_substring.returncode == 0:
|
||||
command_results += results_substring.stdout
|
||||
|
||||
# Build the apropos command line
|
||||
- apropos = ['apropos', '-L', args.lang]
|
||||
+ apropos = ['@man-db@/bin/apropos', '-L', args.lang]
|
||||
if args.method == 'and':
|
||||
apropos.append('--and')
|
||||
apropos.extend(words.split(' '))
|
13
pkgs/kde/gear/kio-extras/add-nixos-man-db-config-path.patch
Normal file
13
pkgs/kde/gear/kio-extras/add-nixos-man-db-config-path.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/man/kio_man.cpp b/man/kio_man.cpp
|
||||
index a2fb6dbf5..cb6f373bc 100644
|
||||
--- a/man/kio_man.cpp
|
||||
+++ b/man/kio_man.cpp
|
||||
@@ -868,6 +868,8 @@ void MANProtocol::constructPath(QStringList &constr_path, QStringList constr_cat
|
||||
mc.setFileName("/etc/manpath.config"); // SuSE, Debian
|
||||
if (!mc.exists())
|
||||
mc.setFileName("/etc/man.config"); // Mandrake
|
||||
+ if (!mc.exists())
|
||||
+ mc.setFileName("/run/current-system/etc/man_db.conf"); // NixOS
|
||||
|
||||
if (mc.open(QIODevice::ReadOnly)) {
|
||||
QTextStream is(&mc);
|
@ -19,6 +19,10 @@
|
||||
mkKdeDerivation {
|
||||
pname = "kio-extras";
|
||||
|
||||
patches = [
|
||||
# An upstream merge request is pending for this https://invent.kde.org/network/kio-extras/-/merge_requests/422
|
||||
./add-nixos-man-db-config-path.patch
|
||||
];
|
||||
extraNativeBuildInputs = [
|
||||
pkg-config
|
||||
gperf
|
||||
|
Loading…
x
Reference in New Issue
Block a user