Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/applications/version-management/git-cliff/default.nix pkgs/by-name/ba/bacon/package.nix pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix pkgs/development/python-modules/elevenlabs/default.nix pkgs/development/python-modules/jupyter-server/default.nix
This commit is contained in:
Alyssa Ross
@@ -7810,6 +7810,12 @@
|
||||
githubId = 24463229;
|
||||
name = "Forden";
|
||||
};
|
||||
ForgottenBeast = {
|
||||
email = "forgottenbeast@riseup.net";
|
||||
github = "ForgottenBeast";
|
||||
githubId = 5754552;
|
||||
name = "ForgottenBeast";
|
||||
};
|
||||
forkk = {
|
||||
email = "forkk@forkk.net";
|
||||
github = "Forkk";
|
||||
@@ -16459,6 +16465,12 @@
|
||||
github = "NiklasVousten";
|
||||
githubId = 24965952;
|
||||
};
|
||||
nikolaizombie1 = {
|
||||
name = "Fabio J. Matos Nieves";
|
||||
email = "fabio.matos999@gmail.com";
|
||||
githubId = 70602908;
|
||||
github = "nikolaizombie1";
|
||||
};
|
||||
nikstur = {
|
||||
email = "nikstur@outlook.com";
|
||||
name = "nikstur";
|
||||
|
||||
@@ -521,6 +521,20 @@ with lib.maintainers;
|
||||
shortName = "Home Assistant";
|
||||
};
|
||||
|
||||
hyprland = {
|
||||
members = [
|
||||
donovanglover
|
||||
fufexan
|
||||
johnrtitor
|
||||
khaneliman
|
||||
NotAShelf
|
||||
];
|
||||
githubTeams = [ "hyprland" ];
|
||||
scope = "Maintain Hyprland compositor and ecosystem";
|
||||
shortName = "Hyprland";
|
||||
enableFeatureFreezePing = true;
|
||||
};
|
||||
|
||||
infisical = {
|
||||
members = [ akhilmhdh ];
|
||||
scope = "Maintain Infisical";
|
||||
|
||||
@@ -139,5 +139,5 @@ in
|
||||
] "Nvidia patches are no longer needed")
|
||||
];
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ fufexan ];
|
||||
meta.maintainers = lib.teams.hyprland.members;
|
||||
}
|
||||
|
||||
@@ -26,5 +26,5 @@ in
|
||||
security.pam.services.hyprlock = { };
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ johnrtitor ];
|
||||
meta.maintainers = lib.teams.hyprland.members;
|
||||
}
|
||||
|
||||
@@ -28,5 +28,5 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ johnrtitor ];
|
||||
meta.maintainers = lib.teams.hyprland.members;
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
let
|
||||
cfg = config.services.calibre-web;
|
||||
dataDir = if lib.hasPrefix "/" cfg.dataDir then cfg.dataDir else "/var/lib/${cfg.dataDir}";
|
||||
|
||||
inherit (lib) concatStringsSep mkEnableOption mkIf mkOption optional optionalString types;
|
||||
in
|
||||
@@ -32,9 +33,10 @@ in
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/lib/calibre-web";
|
||||
default = "calibre-web";
|
||||
description = ''
|
||||
The directory where Calibre-Web stores its data.
|
||||
Where Calibre-Web stores its data.
|
||||
Either an absolute path, or the directory name below {file}`/var/lib`.
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -107,14 +109,16 @@ in
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.tmpfiles.settings."10-calibre-web".${cfg.dataDir}.d = {
|
||||
inherit (cfg) user group;
|
||||
mode = "0700";
|
||||
systemd.tmpfiles.settings = lib.optionalAttrs (lib.hasPrefix "/" cfg.dataDir) {
|
||||
"10-calibre-web".${dataDir}.d = {
|
||||
inherit (cfg) user group;
|
||||
mode = "0700";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.calibre-web = let
|
||||
appDb = "${cfg.dataDir}/app.db";
|
||||
gdriveDb = "${cfg.dataDir}/gdrive.db";
|
||||
appDb = "${dataDir}/app.db";
|
||||
gdriveDb = "${dataDir}/gdrive.db";
|
||||
calibreWebCmd = "${cfg.package}/bin/calibre-web -p ${appDb} -g ${gdriveDb}";
|
||||
|
||||
settings = concatStringsSep ", " (
|
||||
@@ -151,6 +155,8 @@ in
|
||||
|
||||
ExecStart = "${calibreWebCmd} -i ${cfg.listen.ip}";
|
||||
Restart = "on-failure";
|
||||
} // lib.optionalAttrs (!(lib.hasPrefix "/" cfg.dataDir)) {
|
||||
StateDirectory = cfg.dataDir;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
+3
-3
@@ -8,13 +8,13 @@
|
||||
|
||||
melpaBuild {
|
||||
pname = "edraw";
|
||||
version = "1.2.0-unstable-2025-01-06";
|
||||
version = "1.2.0-unstable-2025-01-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "misohena";
|
||||
repo = "el-easydraw";
|
||||
rev = "9a5b5e2b071be99350bfc8db6fbc2c9c667f3725";
|
||||
hash = "sha256-lQYSUQFAv6rqvZySsFbe8B7ZqEaa2L+L3HXB231D4OQ=";
|
||||
rev = "449c1226f7108e1cf8b4b447a65fa053b6bd782f";
|
||||
hash = "sha256-u6lc2s4fqNWNCuICu832vAbMmV5X6FB8fIkJwgdBKfg=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ gzip ];
|
||||
|
||||
@@ -195,6 +195,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
|
||||
};
|
||||
|
||||
LuaSnip-snippets-nvim = buildVimPlugin {
|
||||
pname = "LuaSnip-snippets.nvim";
|
||||
version = "2022-03-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "molleweide";
|
||||
repo = "LuaSnip-snippets.nvim";
|
||||
rev = "d7e40e4cce622eab2316607dbcd8d6039bcb9fe0";
|
||||
sha256 = "063fz3f9byzmb1qavhrjdcphr3nk4l4d19h7mzj5sx4wv7cn8nl8";
|
||||
};
|
||||
meta.homepage = "https://github.com/molleweide/LuaSnip-snippets.nvim/";
|
||||
};
|
||||
|
||||
MatchTagAlways = buildVimPlugin {
|
||||
pname = "MatchTagAlways";
|
||||
version = "2017-05-20";
|
||||
@@ -11324,6 +11336,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/gabrielpoca/replacer.nvim/";
|
||||
};
|
||||
|
||||
repolink-nvim = buildVimPlugin {
|
||||
pname = "repolink.nvim";
|
||||
version = "2023-12-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "9seconds";
|
||||
repo = "repolink.nvim";
|
||||
rev = "55edfedbaef3e894d2ab5107ea7fadc64cb8258d";
|
||||
sha256 = "1pa75cmb1fyxz4b9lam4vbgkcy2g3lfj0f31s17cppzapk0aqh6a";
|
||||
};
|
||||
meta.homepage = "https://github.com/9seconds/repolink.nvim/";
|
||||
};
|
||||
|
||||
resession-nvim = buildVimPlugin {
|
||||
pname = "resession.nvim";
|
||||
version = "2025-01-25";
|
||||
|
||||
@@ -1616,6 +1616,10 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
LuaSnip-snippets-nvim = super.LuaSnip-snippets-nvim.overrideAttrs {
|
||||
checkInputs = [ self.luasnip ];
|
||||
};
|
||||
|
||||
lz-n = neovimUtils.buildNeovimPlugin {
|
||||
luaAttr = luaPackages.lz-n;
|
||||
};
|
||||
@@ -2764,6 +2768,10 @@ in
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
repolink-nvim = super.repolink-nvim.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
# needs "http" and "json" treesitter grammars too
|
||||
rest-nvim = super.rest-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
|
||||
@@ -15,6 +15,7 @@ https://github.com/martinda/Jenkinsfile-vim-syntax/,,
|
||||
https://github.com/vigoux/LanguageTool.nvim/,,
|
||||
https://github.com/LazyVim/LazyVim/,,
|
||||
https://github.com/Yggdroot/LeaderF/,,
|
||||
https://github.com/molleweide/LuaSnip-snippets.nvim/,HEAD,
|
||||
https://github.com/Valloric/MatchTagAlways/,,
|
||||
https://github.com/numToStr/Navigator.nvim/,,
|
||||
https://github.com/overcache/NeoSolarized/,,
|
||||
@@ -938,6 +939,7 @@ https://github.com/amitds1997/remote-nvim.nvim/,HEAD,
|
||||
https://github.com/filipdutescu/renamer.nvim/,,
|
||||
https://github.com/MeanderingProgrammer/render-markdown.nvim/,,
|
||||
https://github.com/gabrielpoca/replacer.nvim/,HEAD,
|
||||
https://github.com/9seconds/repolink.nvim/,HEAD,
|
||||
https://github.com/stevearc/resession.nvim/,HEAD,
|
||||
https://github.com/rest-nvim/rest.nvim/,,
|
||||
https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim
|
||||
|
||||
@@ -18,8 +18,6 @@ let
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
phases = [ "buildPhase" "fixupPhase" ];
|
||||
|
||||
buildPhase = ''
|
||||
makeWrapper {$tesseractBase,$out}/bin/tesseract --set-default TESSDATA_PREFIX $out/share/tessdata
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -45,8 +45,8 @@ let
|
||||
}
|
||||
else
|
||||
{
|
||||
version = "2024.4";
|
||||
hash = "sha256-rGGOzi5Yr6hrU2xaLE/Lk38HYDGPEtGPEDRra969hqg=";
|
||||
version = "2024.5";
|
||||
hash = "sha256-/s8GsYbN25Qs+0LujaXz6yuZk+aswKLxjRSsCwFEJPM=";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-cliff";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "git-cliff";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wGxxLfl+d8uTPLHPL2EKpaL36x0or7PHwdVaZTlKITE=";
|
||||
hash = "sha256-B421xXt7TrBJVwi04vygnw9t5o7/KLVpuItQtwV4E24=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-8Zybs+SlwVuF+obJD+yt36HdtDGIJWLSGUnypqOlFWU=";
|
||||
cargoHash = "sha256-GGEKQgnSB2HW3VIj4CfxzUZaWYE2/nHJPN9ZMmHY5Ns=";
|
||||
|
||||
# attempts to run the program on .git in src which is not deterministic
|
||||
doCheck = false;
|
||||
|
||||
@@ -33,10 +33,7 @@ let
|
||||
homepage = "https://github.com/hyprwm/hyprland-plugins";
|
||||
description = "Hyprland ${description} plugin";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
fufexan
|
||||
johnrtitor
|
||||
];
|
||||
maintainers = lib.teams.hyprland.members;
|
||||
inherit (hyprland.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -91,10 +91,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/releases/tag/v${finalAttrs.version}";
|
||||
mainProgram = "hyprland-share-picker";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
fufexan
|
||||
khaneliman
|
||||
];
|
||||
maintainers = lib.teams.hyprland.members;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,17 +7,18 @@
|
||||
stdenv,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
callPackage,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "alist";
|
||||
version = "3.41.0";
|
||||
webVersion = "3.41.0";
|
||||
version = "3.42.0";
|
||||
webVersion = "3.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlistGo";
|
||||
repo = "alist";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DzqSkcyDRyiHM0yh7A+dZj7TnjhDVQoHHgV5piVcu1g=";
|
||||
hash = "sha256-qUW9bA2TeAVve77i43+ITxClLaO3aqm5959itf+iFqs=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -31,11 +32,11 @@ buildGoModule rec {
|
||||
};
|
||||
web = fetchzip {
|
||||
url = "https://github.com/AlistGo/alist-web/releases/download/${webVersion}/dist.tar.gz";
|
||||
hash = "sha256-1IXvst9VfxuIjUrgmJxTYm8jJQStMK+RlQibQ3fTDGs=";
|
||||
hash = "sha256-g2+qdLrxuyuqxlyVk32BKJCbMfXNs29KLEPxAkTQHjU=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-p6JqYmcQR6W7RE7F6NGxoiTxSOESuYjpke0rLRlxeSM=";
|
||||
vendorHash = "sha256-uid+uT4eOtDsCNsKqGqPc4vMDnKUatG4V2n0Z7r6ccY=";
|
||||
|
||||
buildInputs = [ fuse ];
|
||||
|
||||
@@ -67,6 +68,7 @@ buildGoModule rec {
|
||||
"TestHTTPAll"
|
||||
"TestWebsocketAll"
|
||||
"TestWebsocketCaller"
|
||||
"TestDownloadOrder"
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
@@ -88,6 +90,10 @@ buildGoModule rec {
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = lib.getExe (callPackage ./update.nix { });
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "File list/WebDAV program that supports multiple storages";
|
||||
homepage = "https://github.com/alist-org/alist";
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
writeShellApplication,
|
||||
nix,
|
||||
nix-update,
|
||||
curl,
|
||||
jq,
|
||||
common-updater-scripts,
|
||||
}:
|
||||
|
||||
writeShellApplication {
|
||||
name = "update-alist";
|
||||
runtimeInputs = [
|
||||
curl
|
||||
jq
|
||||
nix
|
||||
common-updater-scripts
|
||||
nix-update
|
||||
];
|
||||
|
||||
text = ''
|
||||
# get old info
|
||||
oldVersion=$(nix-instantiate --eval --strict -A "alist.version" | jq -e -r)
|
||||
|
||||
get_latest_release() {
|
||||
local repo=$1
|
||||
curl --fail ''${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \
|
||||
-s "https://api.github.com/repos/AlistGo/$repo/releases/latest" | jq -r ".tag_name"
|
||||
}
|
||||
|
||||
version=$(get_latest_release "alist")
|
||||
version="''${version#v}"
|
||||
webVersion=$(get_latest_release "alist-web")
|
||||
|
||||
if [[ "$oldVersion" == "$version" ]]; then
|
||||
echo "Already up to date!"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
update-source-version alist "$webVersion" --source-key=web --version-key=webVersion
|
||||
|
||||
nix-update alist --version="$version"
|
||||
'';
|
||||
}
|
||||
@@ -71,10 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "A very light linux rendering backend library";
|
||||
homepage = "https://github.com/hyprwm/aquamarine";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
fufexan
|
||||
johnrtitor
|
||||
];
|
||||
maintainers = lib.teams.hyprland.members;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -6,28 +6,14 @@
|
||||
pkg-config,
|
||||
alsa-lib,
|
||||
versionCheckHook,
|
||||
bacon,
|
||||
nix-update-script,
|
||||
|
||||
withSound ? false,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bacon";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = "bacon";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LnJlE4ostOl+pr+d7ZsAfKvG4C45qt4pedWpeiTchPU=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-o+hTK/7hw2/gLwGm5TozfZZyi674h2p55E7yfprB9wU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
let
|
||||
soundDependencies =
|
||||
lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
]
|
||||
@@ -35,12 +21,40 @@ rustPlatform.buildRustPackage rec {
|
||||
# bindgenHook is only included on darwin as it is needed to build `coreaudio-sys`, a darwin-specific crate
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bacon";
|
||||
version = "3.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = "bacon";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TniEPcY3mK5LO9CBXi5kgnUQkOeDwF9n1K0kSn4ucKk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-6vR8Bxv/A6do4+oGAI0kx1yUyht7YOi1pP/mnIiBPmc=";
|
||||
|
||||
buildFeatures = lib.optionals withSound [
|
||||
"sound"
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optionals withSound [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals withSound soundDependencies;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
withSound = bacon.override { withSound = true; };
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
|
||||
@@ -13,9 +13,10 @@
|
||||
xapp,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "blueberry";
|
||||
version = "1.4.8";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
@@ -26,7 +27,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
python3Packages.wrapPython
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
@@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
|
||||
bluez-tools
|
||||
gnome-bluetooth_1_0
|
||||
libnotify
|
||||
python3Packages.python
|
||||
util-linux
|
||||
xapp
|
||||
];
|
||||
@@ -53,28 +52,28 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Fix paths
|
||||
substituteInPlace $out/bin/blueberry \
|
||||
--replace /usr/lib/blueberry $out/lib/blueberry
|
||||
--replace-fail /usr/lib/blueberry $out/lib/blueberry
|
||||
substituteInPlace $out/bin/blueberry-tray \
|
||||
--replace /usr/lib/blueberry $out/lib/blueberry
|
||||
--replace-fail /usr/lib/blueberry $out/lib/blueberry
|
||||
substituteInPlace $out/etc/xdg/autostart/blueberry-obex-agent.desktop \
|
||||
--replace /usr/lib/blueberry $out/lib/blueberry
|
||||
--replace-fail /usr/lib/blueberry $out/lib/blueberry
|
||||
substituteInPlace $out/etc/xdg/autostart/blueberry-tray.desktop \
|
||||
--replace Exec=blueberry-tray Exec=$out/bin/blueberry-tray
|
||||
--replace-fail Exec=blueberry-tray Exec=$out/bin/blueberry-tray
|
||||
substituteInPlace $out/lib/blueberry/blueberry-obex-agent.py \
|
||||
--replace /usr/share $out/share
|
||||
--replace-fail /usr/share $out/share
|
||||
substituteInPlace $out/lib/blueberry/blueberry-tray.py \
|
||||
--replace /usr/share $out/share
|
||||
--replace-fail /usr/share $out/share
|
||||
substituteInPlace $out/lib/blueberry/blueberry.py \
|
||||
--replace '"bt-adapter"' '"${bluez-tools}/bin/bt-adapter"' \
|
||||
--replace /usr/bin/pavucontrol ${pavucontrol}/bin/pavucontrol \
|
||||
--replace /usr/lib/blueberry $out/lib/blueberry \
|
||||
--replace /usr/share $out/share
|
||||
--replace-fail '"bt-adapter"' '"${bluez-tools}/bin/bt-adapter"' \
|
||||
--replace-fail /usr/bin/pavucontrol ${pavucontrol}/bin/pavucontrol \
|
||||
--replace-fail /usr/lib/blueberry $out/lib/blueberry \
|
||||
--replace-fail /usr/share $out/share
|
||||
substituteInPlace $out/lib/blueberry/rfkillMagic.py \
|
||||
--replace /usr/bin/rfkill ${util-linux}/bin/rfkill \
|
||||
--replace /usr/sbin/rfkill ${util-linux}/bin/rfkill \
|
||||
--replace /usr/lib/blueberry $out/lib/blueberry
|
||||
--replace-fail /usr/bin/rfkill ${util-linux}/bin/rfkill \
|
||||
--replace-fail /usr/sbin/rfkill ${util-linux}/bin/rfkill \
|
||||
--replace-fail /usr/lib/blueberry $out/lib/blueberry
|
||||
substituteInPlace $out/share/applications/blueberry.desktop \
|
||||
--replace Exec=blueberry Exec=$out/bin/blueberry
|
||||
--replace-fail Exec=blueberry Exec=$out/bin/blueberry
|
||||
|
||||
glib-compile-schemas --strict $out/share/glib-2.0/schemas
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "chirpstack-rest-api";
|
||||
version = "4.10.2";
|
||||
version = "4.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chirpstack";
|
||||
repo = "chirpstack-rest-api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-t7JACy26BzmkC7f/KGATw8V+lqEqhkPjEg6LHQ6REWE=";
|
||||
hash = "sha256-yYuSciMsQudGqBPNqj28TZgCGtZb9j7mtEkBR8tbEm4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Y4KGcLms5TAWHcvm9OYKty3+Lciycy+31zokVAPx/pI=";
|
||||
vendorHash = "sha256-UZ1todyWnxRTnqEGc/2rM+JCZPWYG/WA+OnivpB6JGI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cpuinfo";
|
||||
version = "0-unstable-2024-12-09";
|
||||
version = "0-unstable-2025-01-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = "cpuinfo";
|
||||
rev = "ca156f7bc9109c552973414a63d310f76ef0cbf8";
|
||||
hash = "sha256-hIGizsl1NSGySXPI9Xx69xCfQLAMpYviYhBXX201N4o=";
|
||||
rev = "8a1772a0c5c447df2d18edf33ec4603a8c9c04a6";
|
||||
hash = "sha256-dKmZ5YXLhvVdxaJ4PefR+SWlh+MTFHNxOMeM6Vj7Gvo=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version" = "1.11.89";
|
||||
"version" = "1.11.91";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "sha256-vZLM1AIMxDltB+GeQEcYifnaBC1+4wWkotPFuelHxT0=";
|
||||
"desktopYarnHash" = "1n057ic4dzcyg3wfr8jj7vab00jg2d1m38y5zk1kab1pka163f1q";
|
||||
"desktopSrcHash" = "sha256-nHA/j9V+vZUgY+eCCp/iO458GrXSkla+ruJbJjh9NJw=";
|
||||
"desktopYarnHash" = "09k4kislf1zimbyn6m68bh2s3kpn2cs9h04wqli3j3qgkplcvxdv";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version" = "1.11.89";
|
||||
"version" = "1.11.91";
|
||||
"hashes" = {
|
||||
"webSrcHash" = "sha256-K9i5MxTJaX359qsnpfXZBZiNHbhCEy25plUPVUtbGQs=";
|
||||
"webYarnHash" = "164smvrq9937x0pql20zdqab5w35fcidbywkzlyc5g4w7iwkd9kx";
|
||||
"webSrcHash" = "sha256-kdjkmVkoJuV3SBFkVQr4IAi69mAs8V5i3qFOd66BP2s=";
|
||||
"webYarnHash" = "sha256-in7qiGIXP+Ki820RB/uB2st2FIwrxjqYpdOmmLI6RSM=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "flutter_rust_bridge_codegen";
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fzyzcjy";
|
||||
repo = "flutter_rust_bridge";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XHHgKwwGI0v6PD+KQBA8AvUBqUPxefxoJXcZDwjOemQ=";
|
||||
hash = "sha256-I9IaBOqX93g5i26aMa/ICWKurX/82R9PvINNVWNQuNk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-4/Tmj0FFBLhGKbabE+kcoHqBX7rmlg3ps3oZ/hwuir8=";
|
||||
cargoHash = "sha256-8+h2B3q3cFH7lLilathipnSJKx5nAts0EiUUiqFENFU=";
|
||||
cargoBuildFlags = "--package flutter_rust_bridge_codegen";
|
||||
cargoTestFlags = "--package flutter_rust_bridge_codegen";
|
||||
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gdlauncher-carbon";
|
||||
version = "2.0.20";
|
||||
version = "2.0.22";
|
||||
|
||||
src = appimageTools.extract {
|
||||
inherit (finalAttrs) pname version;
|
||||
src = fetchurl {
|
||||
url = "https://cdn-raw.gdl.gg/launcher/GDLauncher__${finalAttrs.version}__linux__x64.AppImage";
|
||||
hash = "sha256-tI9RU8qO3MHbImOGw2Wl1dksNbhqrYFyGemqms8aAio=";
|
||||
hash = "sha256-b1d39cSuVJ17rx8vjlYlyIUvqkBbhCWXuq4Z96K1I3M=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -29,12 +29,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "glamoroustoolkit";
|
||||
version = "1.1.9";
|
||||
version = "1.1.11";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-dBUMn5KMSLTfmJnKTS6seEYDRy2JCiR+fi37UIUJ5aM=";
|
||||
hash = "sha256-bb5tU4UtqdWcSqgl28V8IoATWx4TADxNFXkn9ljmw6Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
gnome,
|
||||
adwaita-icon-theme,
|
||||
meson,
|
||||
mesonEmulatorHook,
|
||||
ninja,
|
||||
pkg-config,
|
||||
gtk3,
|
||||
@@ -51,20 +52,24 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
gettext
|
||||
itstool
|
||||
pkg-config
|
||||
libxml2
|
||||
wrapGAppsHook3
|
||||
gobject-introspection
|
||||
gtk-doc
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_43
|
||||
python3
|
||||
];
|
||||
nativeBuildInputs =
|
||||
[
|
||||
meson
|
||||
ninja
|
||||
gettext
|
||||
itstool
|
||||
pkg-config
|
||||
libxml2
|
||||
wrapGAppsHook3
|
||||
gobject-introspection
|
||||
gtk-doc
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_43
|
||||
python3
|
||||
]
|
||||
++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
mesonEmulatorHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
@@ -86,6 +91,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gnome-bluetooth";
|
||||
|
||||
@@ -64,10 +64,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
description = "Helper for screenshots within Hyprland, based on grimshot";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [
|
||||
donovanglover
|
||||
khaneliman
|
||||
];
|
||||
maintainers = lib.teams.hyprland.members;
|
||||
mainProgram = "grimblast";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -50,7 +50,11 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Hyprland cursor format, library and utilities";
|
||||
changelog = "https://github.com/hyprwm/hyprcursor/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ iynaix ];
|
||||
maintainers =
|
||||
lib.teams.hyprland.members
|
||||
++ (with lib.maintainers; [
|
||||
iynaix
|
||||
]);
|
||||
mainProgram = "hyprcursor-util";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -51,9 +51,6 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Official implementation library for the hypr config language";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
fufexan
|
||||
khaneliman
|
||||
];
|
||||
maintainers = lib.teams.hyprland.members;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -48,11 +48,11 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Hyprland's idle daemon";
|
||||
homepage = "https://github.com/hyprwm/hypridle";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
iogamaster
|
||||
johnrtitor
|
||||
khaneliman
|
||||
];
|
||||
maintainers =
|
||||
lib.teams.hyprland.members
|
||||
++ (with lib.maintainers; [
|
||||
iogamaster
|
||||
]);
|
||||
mainProgram = "hypridle";
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/hyprwm/hyprland-protocols";
|
||||
description = "Wayland protocol extensions for Hyprland";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ fufexan ];
|
||||
maintainers = lib.teams.hyprland.members;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -43,7 +43,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Hyprland QT/qml utility apps";
|
||||
homepage = "https://github.com/hyprwm/hyprland-qtutils";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.fufexan ];
|
||||
maintainers = lib.teams.hyprland.members;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -217,12 +217,7 @@ customStdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/hyprwm/Hyprland";
|
||||
description = "Dynamic tiling Wayland compositor that doesn't sacrifice on its looks";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
fufexan
|
||||
johnrtitor
|
||||
khaneliman
|
||||
wozeparrot
|
||||
];
|
||||
maintainers = lib.teams.hyprland.members;
|
||||
mainProgram = "Hyprland";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
};
|
||||
|
||||
@@ -39,9 +39,10 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Official implementation library for the hypr config language";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
iogamaster
|
||||
fufexan
|
||||
];
|
||||
maintainers =
|
||||
lib.teams.hyprland.members
|
||||
++ (with lib.maintainers; [
|
||||
iogamaster
|
||||
]);
|
||||
};
|
||||
})
|
||||
|
||||
@@ -70,10 +70,11 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Hyprland's GPU-accelerated screen locking utility";
|
||||
homepage = "https://github.com/hyprwm/hyprlock";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
iynaix
|
||||
johnrtitor
|
||||
];
|
||||
maintainers =
|
||||
lib.teams.hyprland.members
|
||||
++ (with lib.maintainers; [
|
||||
iynaix
|
||||
]);
|
||||
mainProgram = "hyprlock";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -82,11 +82,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs.src.meta) homepage;
|
||||
description = "Blazing fast wayland wallpaper utility";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [
|
||||
fufexan
|
||||
khaneliman
|
||||
wozeparrot
|
||||
];
|
||||
maintainers = lib.teams.hyprland.members;
|
||||
inherit (wayland.meta) platforms;
|
||||
broken = gcc14Stdenv.hostPlatform.isDarwin;
|
||||
mainProgram = "hyprpaper";
|
||||
|
||||
@@ -61,10 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Wlroots-compatible Wayland color picker that does not suck";
|
||||
homepage = "https://github.com/hyprwm/hyprpicker";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
fufexan
|
||||
khaneliman
|
||||
];
|
||||
maintainers = lib.teams.hyprland.members;
|
||||
platforms = wayland.meta.platforms;
|
||||
mainProgram = "hyprpicker";
|
||||
};
|
||||
|
||||
@@ -40,10 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Polkit authentication agent written in QT/QML";
|
||||
homepage = "https://github.com/hyprwm/hyprpolkitagent";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
fufexan
|
||||
johnrtitor
|
||||
];
|
||||
maintainers = lib.teams.hyprland.members;
|
||||
mainProgram = "hyprpolkitagent";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -65,7 +65,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
description = "An xprop replacement for Hyprland";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
maintainers = lib.teams.hyprland.members;
|
||||
mainProgram = "hyprprop";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -53,10 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Application to enable a blue-light filter on Hyprland";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
fufexan
|
||||
johnrtitor
|
||||
];
|
||||
maintainers = lib.teams.hyprland.members;
|
||||
mainProgram = "hyprsunset";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -42,9 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Small C++ library for utilities used across the Hypr* ecosystem";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
maintainers = with lib.maintainers; [
|
||||
donovanglover
|
||||
johnrtitor
|
||||
];
|
||||
maintainers = lib.teams.hyprland.members;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -36,10 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Hyprland version of wayland-scanner in and for C++";
|
||||
changelog = "https://github.com/hyprwm/hyprwayland-scanner/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
fufexan
|
||||
johnrtitor
|
||||
];
|
||||
maintainers = lib.teams.hyprland.members;
|
||||
mainProgram = "hyprwayland-scanner";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
{
|
||||
"version": "1.125.3",
|
||||
"hash": "sha256-lDk2Pj+wspzeRVccWOJ1Xp4E72jlkJBU3G5djFNNHYw=",
|
||||
"version": "1.125.6",
|
||||
"hash": "sha256-8rVpXo4pASKA5UTUGh3yHd5J7JPQe0kYOPQ/0hMED24=",
|
||||
"components": {
|
||||
"cli": {
|
||||
"npmDepsHash": "sha256-l4h6aTgGGZf84LpmaN9XLiw99pgo4JN8zfBXvyE438Y=",
|
||||
"version": "2.2.44"
|
||||
"npmDepsHash": "sha256-DqyA/J90+PsjWiwXyGML0gJqYL8jBRR99SxoG0acxqY=",
|
||||
"version": "2.2.47"
|
||||
},
|
||||
"server": {
|
||||
"npmDepsHash": "sha256-v21BjA7+zOPQtZNH06q4+x/EvcNVi/4T1Zi4LMgYZUU=",
|
||||
"version": "1.125.3"
|
||||
"npmDepsHash": "sha256-4+G4mIxABb2Rr9HqbfzB2B7gwBLMlwZTDnH11Oi7kMc=",
|
||||
"version": "1.125.6"
|
||||
},
|
||||
"web": {
|
||||
"npmDepsHash": "sha256-H32WmL7C+I03i3LSfs87Wyj/TMubqF1Nz7/VEj25aeI=",
|
||||
"version": "1.125.3"
|
||||
"npmDepsHash": "sha256-iMFKWgYlCCdjGnnYx0vB5Vl4+d4ftPjPRenHQDPePSU=",
|
||||
"version": "1.125.6"
|
||||
},
|
||||
"open-api/typescript-sdk": {
|
||||
"npmDepsHash": "sha256-HpLw4I7KEap45HnRcA4u1PA8qM2HvSeF5hLkar20bns=",
|
||||
"version": "1.125.3"
|
||||
"npmDepsHash": "sha256-nZTg6PmuMDqCFOoz+3INyRUMdbUKAqvkl+EHVkPZXoQ=",
|
||||
"version": "1.125.6"
|
||||
},
|
||||
"geonames": {
|
||||
"timestamp": "20250126191509",
|
||||
"hash": "sha256-uzKJJTN9TZCAgEtePI2RGZWTNGKdhmup4RHNVMGfQ48="
|
||||
"timestamp": "20250128052059",
|
||||
"hash": "sha256-QnDkaqJbOpaROXZRtr1nLJxtd70YULEuNqLlwgN/9lY="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jenkins";
|
||||
version = "2.479.2";
|
||||
version = "2.479.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
|
||||
hash = "sha256-F3wsAz8NOuQUjmAdD9raYBEtg/JQUh86Cg/ZfLsTjb0=";
|
||||
hash = "sha256-MEyFkoYNWwPewnyWteiexY/HRPeBYcU/ejRKC/fOkgM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -22,28 +22,8 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-cG9so0x0y8CbTxLOxSQwn5vG72KxHJzzTIH4lQA4MvE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QQrFUJ24Qnrx8+7+h9riycXZSQUdH1sXMhpDzU9AXiI=";
|
||||
|
||||
# the dependency native-windows-gui contains both README.md and readme.md,
|
||||
# which causes a hash mismatch on systems with a case-insensitive filesystem
|
||||
# this removes the readme files and updates cargo's checksum file accordingly
|
||||
depsExtraArgs = {
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
pushd $name/native-windows-gui
|
||||
|
||||
rm --force --verbose README.md readme.md
|
||||
jq 'del(.files."README.md") | del(.files."readme.md")' \
|
||||
.cargo-checksum.json -c \
|
||||
| sponge .cargo-checksum.json
|
||||
|
||||
popd
|
||||
'';
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-VKvle1hQae+0Vbvd7Epq3cDqG8OV5J2mowF5lue59oc=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import ./generic.nix {
|
||||
version = "1.3.3";
|
||||
hash = "sha256-W5G7osV4du6w/BfyY9YrDzorcLNizRsoz70RMfO2AbY=";
|
||||
cargoHash = "sha256-iziTHr0gvv319Rzgkze9J1H4UzPR7WxMmCkiGVsb33k=";
|
||||
cargoHash = "sha256-QgEoeXjGm7fhPnJBbquWJYDYPg+Uv1IjZnaI5yUEYlQ=";
|
||||
patchDir = ./patches/1_3;
|
||||
extraMeta = {
|
||||
knownVulnerabilities = [
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
version = "1.4.6";
|
||||
hash = "sha256-pjJyq52wO5p34LN2Jmt0npgWBDcWin8gIX4skZ7Ff8E=";
|
||||
cargoHash = "sha256-XyyvXxZOvaxSzH8Jd23IxE4Wyd/6h5N3HRVEvdQ8RtY=";
|
||||
cargoHash = "sha256-33HRoH/vWPe/wOZJtQLWV9eBocbj0iR/XUu4zMehu8M=";
|
||||
patchDir = ./patches/1_4;
|
||||
}
|
||||
|
||||
@@ -38,6 +38,7 @@ in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kanidm" + (lib.optionalString enableSecretProvisioning "-with-secret-provisioning");
|
||||
inherit version cargoHash;
|
||||
useFetchCargoVendor = true;
|
||||
cargoDepsName = "kanidm";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
{ python3 }:
|
||||
|
||||
with python3.pkgs;
|
||||
toPythonApplication mallard-ducktype
|
||||
@@ -17,6 +17,7 @@
|
||||
xvfb-run,
|
||||
libadwaita,
|
||||
libxcvt,
|
||||
libGL,
|
||||
libICE,
|
||||
libX11,
|
||||
libXcomposite,
|
||||
@@ -106,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
gettext
|
||||
glib
|
||||
libxcvt
|
||||
meson
|
||||
ninja
|
||||
@@ -133,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libdrm
|
||||
libei
|
||||
libdisplay-info
|
||||
libGL
|
||||
libgudev
|
||||
libinput
|
||||
libstartup_notification
|
||||
@@ -175,10 +178,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--replace-fail "libadwaita-1.so.0" "${libadwaita}/lib/libadwaita-1.so.0"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
# TODO: Move this into a directory devhelp can find.
|
||||
@@ -189,6 +188,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
|
||||
|
||||
separateDebugInfo = true;
|
||||
strictDeps = true;
|
||||
|
||||
passthru = {
|
||||
libdir = "${finalAttrs.finalPackage}/lib/mutter-15";
|
||||
|
||||
@@ -38,16 +38,20 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
nativeBuildInputs =
|
||||
[
|
||||
autoreconfHook
|
||||
glib # for gdbus-codegen
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals withGnome [
|
||||
gtk4 # for gtk4-builder-tool
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
networkmanager
|
||||
ppp
|
||||
glib
|
||||
openssl
|
||||
nss
|
||||
]
|
||||
@@ -67,6 +71,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
strictDeps = true;
|
||||
|
||||
passthru = {
|
||||
networkManagerPlugin = "VPN/nm-l2tp-service.name";
|
||||
|
||||
@@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
glib
|
||||
libxml2
|
||||
openconnect
|
||||
networkmanager
|
||||
@@ -55,6 +54,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
intltool
|
||||
pkg-config
|
||||
file
|
||||
|
||||
@@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
glib
|
||||
pkg-config
|
||||
file
|
||||
libxml2
|
||||
@@ -46,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
[
|
||||
openvpn
|
||||
networkmanager
|
||||
glib
|
||||
]
|
||||
++ lib.optionals withGnome [
|
||||
gtk3
|
||||
@@ -63,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--enable-absolute-paths"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "NetworkManager-openvpn";
|
||||
|
||||
@@ -29,18 +29,22 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-zd+g86cZLyibLhYLal6XzUb9wFu7kHROp0KzRM95Qng=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
file
|
||||
gettext
|
||||
pkg-config
|
||||
];
|
||||
nativeBuildInputs =
|
||||
[
|
||||
autoreconfHook
|
||||
file
|
||||
gettext
|
||||
glib # for gdbus-codegen
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals withGnome [
|
||||
gtk4 # for gtk4-builder-tool
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
sstp
|
||||
networkmanager
|
||||
glib
|
||||
ppp
|
||||
]
|
||||
++ lib.optionals withGnome [
|
||||
@@ -63,6 +67,8 @@ stdenv.mkDerivation rec {
|
||||
"--enable-absolute-paths"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
|
||||
@@ -35,12 +35,12 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
file
|
||||
glib
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
vpnc
|
||||
networkmanager
|
||||
glib
|
||||
] ++ lib.optionals withGnome [
|
||||
gtk3
|
||||
gtk4
|
||||
@@ -55,6 +55,8 @@ stdenv.mkDerivation rec {
|
||||
"--enable-absolute-paths"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
buildNimPackage (
|
||||
final: prev: rec {
|
||||
pname = "nimlangserver";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
# nix build ".#nimlangserver.src"
|
||||
# nix run "github:daylinmorgan/nnl" -- result/nimble.lock -o:pkgs/by-name/ni/nimlangserver/lock.json --prefetch-git:bearssl,zlib
|
||||
@@ -16,7 +16,7 @@ buildNimPackage (
|
||||
owner = "nim-lang";
|
||||
repo = "langserver";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JyBjHAP/sxQfQ1XvyeZyHsu0Er5D7ePDGyJK7Do5kyk=";
|
||||
hash = "sha256-j5YnTGPtt0WhRvNfpgO9tjAqZJA5Kt1FE1Mjqn0/DNY=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "unstable-2024-03-25";
|
||||
version = "0-unstable-2024-12-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jtojnar";
|
||||
repo = "nixpkgs-hammering";
|
||||
rev = "6851ecea8c6da45870b7c06d6495cba3fb2d7c7c";
|
||||
hash = "sha256-kr3zMr7aWt4W/+Jcol5Ctiq0KjXSxViPhGtyqvX9dqE=";
|
||||
rev = "56e8d636b3e7188dae2832fc405db2e388be634b";
|
||||
hash = "sha256-hr+BHAmWT/FCLI5zNEHgtKdBbIYgmAydrErRu9RfuuM=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
+3
-5
@@ -2,13 +2,11 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
openrgb,
|
||||
glib,
|
||||
openal,
|
||||
qmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -29,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ln -s ${openrgb.src} OpenRGB
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = with libsForQt5; [
|
||||
qmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = with libsForQt5; [
|
||||
qtbase
|
||||
glib
|
||||
openal
|
||||
+3
-5
@@ -2,14 +2,12 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
openrgb,
|
||||
glib,
|
||||
libgtop,
|
||||
lm_sensors,
|
||||
qmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -31,14 +29,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rm -r dependencies/lhwm-cpp-wrapper
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = with libsForQt5; [
|
||||
qtbase
|
||||
glib
|
||||
libgtop
|
||||
lm_sensors
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = with libsForQt5; [
|
||||
qmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
@@ -2,15 +2,12 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
libusb1,
|
||||
hidapi,
|
||||
pkg-config,
|
||||
coreutils,
|
||||
mbedtls_2,
|
||||
qtbase,
|
||||
qttools,
|
||||
symlinkJoin,
|
||||
openrgb,
|
||||
}:
|
||||
@@ -26,12 +23,13 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = with libsForQt5; [
|
||||
qmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
|
||||
buildInputs = with libsForQt5; [
|
||||
libusb1
|
||||
hidapi
|
||||
mbedtls_2
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchCrate,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
@@ -9,16 +9,17 @@ rustPlatform.buildRustPackage rec {
|
||||
version = "9.1.3";
|
||||
pname = "oxipng";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
hash = "sha256-kzN4YNsFqv/KUxpHao++oqc90Us6VllyFYkpdVUigD0=";
|
||||
# do not use fetchCrate (only repository includes tests)
|
||||
src = fetchFromGitHub {
|
||||
owner = "shssoichiro";
|
||||
repo = "oxipng";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8EOEcIw10hCyYi9SwDLDZ8J3ezLXa30RUY5I9ksfqTs=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-4c9YcIQRZsbDJvl8P9Pkd3atTVM+RbQ/4BMb7rE84po=";
|
||||
|
||||
doCheck = !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/shssoichiro/oxipng";
|
||||
description = "Multithreaded lossless PNG compression optimizer";
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
xorg,
|
||||
}:
|
||||
let
|
||||
version = "2.14.5";
|
||||
version = "2.14.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "paperless-ngx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ML38TErINQPjBGweCY673zFlGEjTjgJcYJTJUbTov+4=";
|
||||
hash = "sha256-wBm4+ohM9v25n6zEUAeaVU6mAmB3GR8n1kDYyTBlnjM=";
|
||||
};
|
||||
|
||||
# subpath installation is broken with uvicorn >= 0.26
|
||||
@@ -283,6 +283,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
# FileNotFoundError(2, 'No such file or directory'): /build/tmp...
|
||||
"test_script_with_output"
|
||||
"test_script_exit_non_zero"
|
||||
"testDocumentPageCountMigrated"
|
||||
# AssertionError: 10 != 4 (timezone/time issue)
|
||||
# Due to getting local time from modification date in test_consumer.py
|
||||
"testNormalOperation"
|
||||
|
||||
@@ -9,13 +9,13 @@ assert !blas.isILP64;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plumed";
|
||||
version = "2.9.2";
|
||||
version = "2.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plumed";
|
||||
repo = "plumed2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jNvdbfh1krNMrOFqkEHMy60mjsG/Wp6MQg0gHEjDA5U=";
|
||||
hash = "sha256-KN412t64tp3QUQkhpLU3sAYDosQ3hw9HqpT1fzt5fwA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
name = "regal";
|
||||
version = "0.30.0";
|
||||
version = "0.30.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StyraInc";
|
||||
repo = "regal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sr+tGfKDSgJ5SiHihJ/aMAn6AnAC8bEb838+xYdFosc=";
|
||||
hash = "sha256-HlopAz+AqpjZ/NpVVvkiR0p7+ezWlr5ddLMK/LobxpM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6JheW6JHkAidZda7WWHSfEAuPYoBdli8wWHp2sX2r5Q=";
|
||||
vendorHash = "sha256-0B8MOF+ovJ1memBuXtEeMViKKWaQXX6+HQzMY91bgyI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -34,11 +34,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "saga";
|
||||
version = "9.7.1";
|
||||
version = "9.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz";
|
||||
hash = "sha256-ZPJ8OlVEqG/jmRaA7BJRsw3b1X/3tKtRcYTXqfGdJ0I=";
|
||||
hash = "sha256-1nWpFGRBS49uzKl7m/4YWFI+3lvm2zKByYpR9llxsgY=";
|
||||
};
|
||||
|
||||
sourceRoot = "saga-${version}/saga-gis";
|
||||
|
||||
@@ -53,13 +53,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "shairport-sync";
|
||||
version = "4.3.5";
|
||||
version = "4.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "shairport-sync";
|
||||
owner = "mikebrady";
|
||||
tag = version;
|
||||
hash = "sha256-GYu/n4JoghqUHnkCiSQJYm9WSLww585WKgXTEiWGq4g=";
|
||||
hash = "sha256-Pbg2yFa524OFOfvwZPS1/K+Vvn+bwtmo7Fbr919Smwc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
runCommand,
|
||||
config,
|
||||
pkg-config,
|
||||
libtool,
|
||||
curl,
|
||||
@@ -33,6 +35,8 @@
|
||||
enableX11 ? true,
|
||||
enableGtk2 ? false,
|
||||
gtk2,
|
||||
enableNVML ? config.cudaSupport,
|
||||
nvml,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -113,7 +117,14 @@ stdenv.mkDerivation rec {
|
||||
http-parser
|
||||
]
|
||||
++ lib.optionals enableX11 [ xorg.xauth ]
|
||||
++ lib.optionals enableGtk2 [ gtk2 ];
|
||||
++ lib.optionals enableGtk2 [ gtk2 ]
|
||||
++ lib.optionals enableNVML [
|
||||
(runCommand "collect-nvml" { } ''
|
||||
mkdir $out
|
||||
ln -s ${nvml.dev}/include $out/include
|
||||
ln -s ${nvml.lib}/lib/stubs $out/lib
|
||||
'')
|
||||
];
|
||||
|
||||
configureFlags =
|
||||
[
|
||||
@@ -132,7 +143,8 @@ stdenv.mkDerivation rec {
|
||||
"--without-rpath" # Required for configure to pick up the right dlopen path
|
||||
]
|
||||
++ (lib.optional enableGtk2 "--disable-gtktest")
|
||||
++ (lib.optional (!enableX11) "--disable-x11");
|
||||
++ (lib.optional (!enableX11) "--disable-x11")
|
||||
++ (lib.optional (enableNVML) "--with-nvml");
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs ./doc/html/shtml2html.py
|
||||
|
||||
Generated
+232
@@ -0,0 +1,232 @@
|
||||
[
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.0.0",
|
||||
"hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-NUoyXJkIsgbkcKFVb10VRafM4ViHs801c/7vhu3ssUY="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Angle.Windows.Natives",
|
||||
"version": "2.1.22045.20230930",
|
||||
"hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.AvaloniaEdit",
|
||||
"version": "11.1.0",
|
||||
"hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.BuildServices",
|
||||
"version": "0.0.29",
|
||||
"hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.ColorPicker",
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-z3ZHxVSOoOjqq+5G71jnGN1Y0i3YpAkox7cj3lNr6kg="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.DataGrid",
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-jIJvuYN0iym/WeOC0C7z5xj5kCZSXGoeLQ/q5qQfewM="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Desktop",
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-srtZi+kDbhRtMl33l91zssBWETU5oHodKbbWyfEsb/I="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Diagnostics",
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Fonts.Inter",
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-ySsCXVpjqjCX/uYkwluSfrAoBtuq9k7fC1bFjxKC9/Q="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.FreeDesktop",
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-3sNemBmZE06w2ul87T5HrEeHUxXMOa9MfQhpI4AoxDY="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Native",
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-2Gp98NGWcrILqF+P5PDMPRdsMby/lZiT3eWAUskFim8="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Skia",
|
||||
"version": "11.0.0",
|
||||
"hash": "sha256-A01nrs3Ij1eTo6tPmu7++T1K+Wo/H/9LvpeuOUGbQeU="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Skia",
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-QBp8wTA92hGwbmNSVL4gsjrqA9CfwDPgdTiOEqcogGA="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Themes.Fluent",
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-DRl+267mUtJDUJpreUj6BxDLGGYGkEEo5vDGtGguoC8="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Themes.Simple",
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-UF15yTDzHmqd33siH3TJxmxaonA51dzga+hmCUahn1k="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Win32",
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-xKFKObvqdJaQjphEktRJvzmAoDEsKg3WqlEG31V3qLE="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.X11",
|
||||
"version": "11.2.3",
|
||||
"hash": "sha256-SD4dmpKx4l8YOyUnrA0fnf2Bb+tHSNyARh7GAtHyg60="
|
||||
},
|
||||
{
|
||||
"pname": "AvaloniaEdit.TextMate",
|
||||
"version": "11.1.0",
|
||||
"hash": "sha256-Nv52bUxA02VcsKCbMqEAkNBl46gznSivRZ3llLHrhkM="
|
||||
},
|
||||
{
|
||||
"pname": "CommunityToolkit.Mvvm",
|
||||
"version": "8.3.2",
|
||||
"hash": "sha256-zY+iB5Rj/8ru0xpRWwFLFO6JI3UFB/XHnx9pWmrZCAs="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp",
|
||||
"version": "7.3.0.2",
|
||||
"hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp",
|
||||
"version": "7.3.0.3",
|
||||
"hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.Linux",
|
||||
"version": "7.3.0.3",
|
||||
"hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.macOS",
|
||||
"version": "7.3.0.3",
|
||||
"hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
|
||||
"version": "7.3.0.3",
|
||||
"hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.Win32",
|
||||
"version": "7.3.0.3",
|
||||
"hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
|
||||
},
|
||||
{
|
||||
"pname": "LiveChartsCore",
|
||||
"version": "2.0.0-rc4.5",
|
||||
"hash": "sha256-2Fgn9Bo1aM6dZHCU+OVykOhggTzpcEfFNfYtWc4yvHc="
|
||||
},
|
||||
{
|
||||
"pname": "LiveChartsCore.SkiaSharpView",
|
||||
"version": "2.0.0-rc4.5",
|
||||
"hash": "sha256-03RR14tA0DtYHiLdgmAI4Gp5/e2H6QPkNFOBeqiFaJU="
|
||||
},
|
||||
{
|
||||
"pname": "LiveChartsCore.SkiaSharpView.Avalonia",
|
||||
"version": "2.0.0-rc4.5",
|
||||
"hash": "sha256-lzG/5e6WDpUiHZ8GvovOMvwXyYoVBeB1Ktuuw2Fx5No="
|
||||
},
|
||||
{
|
||||
"pname": "MicroCom.Runtime",
|
||||
"version": "0.11.0",
|
||||
"hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
|
||||
},
|
||||
{
|
||||
"pname": "Onigwrap",
|
||||
"version": "1.0.6",
|
||||
"hash": "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp",
|
||||
"version": "2.88.8",
|
||||
"hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.HarfBuzz",
|
||||
"version": "2.88.8",
|
||||
"hash": "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.Linux",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.macOS",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.WebAssembly",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.Win32",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Pipelines",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "8.0.5",
|
||||
"hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
|
||||
},
|
||||
{
|
||||
"pname": "TextMateSharp",
|
||||
"version": "1.0.59",
|
||||
"hash": "sha256-qfAGSgVpTrWMZSk0TFDVP1IgWWi6O1jEEvWc0Pvw9i0="
|
||||
},
|
||||
{
|
||||
"pname": "TextMateSharp",
|
||||
"version": "1.0.65",
|
||||
"hash": "sha256-kZx3CBDzu7qUSnihs9Q4Ck78ih1aJ+0g8cN8Hke+E5w="
|
||||
},
|
||||
{
|
||||
"pname": "TextMateSharp.Grammars",
|
||||
"version": "1.0.59",
|
||||
"hash": "sha256-ru5VxQK4PFRJhHu+MvCzDt3EwbC/94n1whtDovUAUDA="
|
||||
},
|
||||
{
|
||||
"pname": "TextMateSharp.Grammars",
|
||||
"version": "1.0.65",
|
||||
"hash": "sha256-tZx/GKYX3bomQFVFaEgneNYHpB74v+8D90IfkYImlhE="
|
||||
},
|
||||
{
|
||||
"pname": "Tmds.DBus.Protocol",
|
||||
"version": "0.20.0",
|
||||
"hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
|
||||
}
|
||||
]
|
||||
@@ -0,0 +1,31 @@
|
||||
diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs
|
||||
index a24f1b6..4102274 100644
|
||||
--- a/src/Native/Linux.cs
|
||||
+++ b/src/Native/Linux.cs
|
||||
@@ -97,7 +97,7 @@ namespace SourceGit.Native
|
||||
}
|
||||
}
|
||||
|
||||
- private string FindExecutable(string filename)
|
||||
+ public static string FindExecutable(string filename)
|
||||
{
|
||||
var pathVariable = Environment.GetEnvironmentVariable("PATH") ?? string.Empty;
|
||||
var pathes = pathVariable.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
|
||||
diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs
|
||||
index 5721fe8..bc2a57d 100644
|
||||
--- a/src/Native/MacOS.cs
|
||||
+++ b/src/Native/MacOS.cs
|
||||
@@ -25,12 +25,7 @@ namespace SourceGit.Native
|
||||
|
||||
public string FindGitExecutable()
|
||||
{
|
||||
- var gitPathVariants = new List<string>() {
|
||||
- "/usr/bin/git", "/usr/local/bin/git", "/opt/homebrew/bin/git", "/opt/homebrew/opt/git/bin/git"
|
||||
- };
|
||||
- foreach (var path in gitPathVariants)
|
||||
- if (File.Exists(path)) return path;
|
||||
- return string.Empty;
|
||||
+ return Linux.FindExecutable("git");
|
||||
}
|
||||
|
||||
public string FindTerminal(Models.ShellOrTerminal shell)
|
||||
@@ -0,0 +1,117 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildDotnetModule,
|
||||
fetchFromGitHub,
|
||||
dotnetCorePackages,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
libicns,
|
||||
|
||||
libXcursor,
|
||||
libXext,
|
||||
libXi,
|
||||
libXrandr,
|
||||
|
||||
git,
|
||||
xdg-utils,
|
||||
}:
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "sourcegit";
|
||||
version = "2025.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcegit-scm";
|
||||
repo = "sourcegit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6FO0WRUcWm7xnuw6Br97+cWZhvzIOesg/eANZzeyxZo=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-darwin-git-path.patch ];
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_9_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_9_0;
|
||||
|
||||
nugetDeps = ./deps.json;
|
||||
|
||||
projectFile = [ "src/SourceGit.csproj" ];
|
||||
|
||||
executables = [ "SourceGit" ];
|
||||
|
||||
dotnetFlags = [
|
||||
"-p:DisableUpdateDetection=true"
|
||||
"-p:DisableAOT=true"
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
copyDesktopItems
|
||||
libicns
|
||||
];
|
||||
|
||||
# these are dlopen-ed at runtime
|
||||
# libXi is needed for right-click support
|
||||
# not sure about what the other ones are needed for, but I'll include them anyways
|
||||
runtimeDeps = [
|
||||
libXcursor
|
||||
libXext
|
||||
libXi
|
||||
libXrandr
|
||||
];
|
||||
|
||||
# Note: users can use `.overrideAttrs` to append to this list
|
||||
runtimePathDeps = [
|
||||
git
|
||||
xdg-utils
|
||||
];
|
||||
|
||||
# add fallback binaries to use if the user doesn't already have them in their PATH
|
||||
preInstall = ''
|
||||
makeWrapperArgs+=(
|
||||
--suffix PATH : ${lib.makeBinPath finalAttrs.runtimePathDeps}
|
||||
)
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "SourceGit";
|
||||
exec = "SourceGit";
|
||||
icon = "SourceGit";
|
||||
desktopName = "SourceGit";
|
||||
terminal = false;
|
||||
comment = finalAttrs.meta.description;
|
||||
})
|
||||
];
|
||||
|
||||
postInstall =
|
||||
lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
# extract the .icns file into multiple .png files
|
||||
# where the format of the .png file names is App_"$n"x"$n"x32.png
|
||||
|
||||
icns2png -x build/resources/app/App.icns
|
||||
|
||||
for f in App_*x32.png; do
|
||||
res=''${f//App_}
|
||||
res=''${res//x32.png}
|
||||
install -Dm644 $f "$out/share/icons/hicolor/$res/apps/SourceGit.png"
|
||||
done
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
install -Dm644 build/resources/app/App.icns $out/Applications/SourceGit.app/Contents/Resources/App.icns
|
||||
|
||||
substitute build/resources/app/App.plist $out/Applications/SourceGit.app/Contents/Info.plist \
|
||||
--replace-fail "SOURCE_GIT_VERSION" "${finalAttrs.version}"
|
||||
|
||||
mkdir -p $out/Applications/SourceGit.app/Contents/MacOS
|
||||
ln -s $out/bin/SourceGit $out/Applications/SourceGit.app/Contents/MacOS/SourceGit
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/sourcegit-scm/sourcegit/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "Free & OpenSource GUI client for GIT users";
|
||||
homepage = "https://github.com/sourcegit-scm/sourcegit";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "SourceGit";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
};
|
||||
})
|
||||
@@ -12,12 +12,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tpm2-openssl";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpm2-software";
|
||||
repo = "tpm2-openssl";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-mZ4Z/GxJFwwfyFd1SAiVlQqOjkFSzsZePeuEZtq8Mcg=";
|
||||
hash = "sha256-CCTR7qBqI/y+jLBEEcgRanYOBNUYM/sH/hCqOLGA4QM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
python312Packages,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
}:
|
||||
python312Packages.buildPythonApplication rec {
|
||||
pname = "vanguards";
|
||||
version = "0.3.1-unstable-2023-10-31";
|
||||
|
||||
dependencies = [ python312Packages.stem ];
|
||||
#tries to access the network during the tests, which fails
|
||||
doCheck = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikeperry-tor";
|
||||
repo = "vanguards";
|
||||
rev = "8132fa0e556fbcbb3538ff9b48a2180c0c5e8fbd";
|
||||
sha256 = "sha256-XauSTgoH6zXv2DXyX2lQc6gy6Ysm41fKnyuWZ3hj7kI=";
|
||||
};
|
||||
patches = [ ./python-3.12.patch ];
|
||||
postPatch = ''
|
||||
# fix import cycle issue
|
||||
substituteInPlace src/vanguards/main.py --replace-fail \
|
||||
'import stem.response.events' 'import stem.socket; import stem.control; import stem.response.events'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ ForgottenBeast ];
|
||||
mainProgram = "vanguards";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://github.com/mikeperry-tor/vanguards";
|
||||
description = "Protects TOR hidden services against guard node attacks";
|
||||
longDescription = ''
|
||||
Runs alongside tor and interacts with its control port
|
||||
in order to protect and alert against guard node attacks on hidden services
|
||||
'';
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
Origin: https://github.com/mikeperry-tor/vanguards/pull/105/commits/183d24775521feb3ed61b681088347279c3fc84c
|
||||
From: Dave Jones <dave@waveform.org.uk>
|
||||
Date: Wed, 28 Aug 2024 12:54:24 +0100
|
||||
Subject: [PATCH] Python 3.12 compatibility
|
||||
|
||||
Python 3.12 removes the deprecated `SafeConfigParser` class. This patch
|
||||
switches the code to using ConfigParser and read_file from Python 3.x,
|
||||
and patches 2.7's SafeConfigParser to a compatible definition.
|
||||
---
|
||||
src/vanguards/config.py | 11 +++++++----
|
||||
1 file changed, 7 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/vanguards/config.py b/src/vanguards/config.py
|
||||
index 1c33391..b8e3f9c 100644
|
||||
--- a/src/vanguards/config.py
|
||||
+++ b/src/vanguards/config.py
|
||||
@@ -16,9 +16,12 @@
|
||||
from .logger import plog
|
||||
|
||||
try:
|
||||
- from configparser import SafeConfigParser, Error
|
||||
+ from configparser import ConfigParser, Error
|
||||
except ImportError:
|
||||
from ConfigParser import SafeConfigParser, Error
|
||||
+ class ConfigParser(SafeConfigParser):
|
||||
+ def read_file(self, f, source=None):
|
||||
+ return self.readfp(f, source)
|
||||
|
||||
################# Global options ##################
|
||||
|
||||
@@ -209,7 +212,7 @@ def set_options_from_module(config, module, section):
|
||||
config.set(section, param, str(val))
|
||||
|
||||
def generate_config():
|
||||
- config = SafeConfigParser(allow_no_value=True)
|
||||
+ config = ConfigParser(allow_no_value=True)
|
||||
set_options_from_module(config, sys.modules[__name__], "Global")
|
||||
set_options_from_module(config, vanguards, "Vanguards")
|
||||
set_options_from_module(config, bandguards, "Bandguards")
|
||||
@@ -219,9 +222,9 @@ def generate_config():
|
||||
return config
|
||||
|
||||
def apply_config(config_file):
|
||||
- config = SafeConfigParser(allow_no_value=True)
|
||||
+ config = ConfigParser(allow_no_value=True)
|
||||
|
||||
- config.readfp(open(config_file, "r"))
|
||||
+ config.read_file(open(config_file, "r"))
|
||||
|
||||
get_options_for_module(config, sys.modules[__name__], "Global")
|
||||
get_options_for_module(config, vanguards, "Vanguards")
|
||||
@@ -11,6 +11,7 @@
|
||||
xorg,
|
||||
libGL,
|
||||
freetype,
|
||||
zenity,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -57,6 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
curl
|
||||
libjack2
|
||||
]
|
||||
}" \
|
||||
--prefix PATH : "${
|
||||
lib.makeBinPath [
|
||||
zenity
|
||||
]
|
||||
}"
|
||||
|
||||
runHook postInstall
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
bash,
|
||||
buildPackages,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
pkg-config,
|
||||
@@ -24,7 +26,11 @@ stdenv.mkDerivation {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ] ++ lib.optional (!opensslSupport) pkg-config;
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
perl
|
||||
] ++ lib.optional (!opensslSupport) pkg-config;
|
||||
|
||||
buildInputs = [
|
||||
libgcrypt
|
||||
perl
|
||||
@@ -40,15 +46,25 @@ stdenv.mkDerivation {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs src/makeman.pl
|
||||
'';
|
||||
postPatch =
|
||||
''
|
||||
substituteInPlace src/vpnc-disconnect \
|
||||
--replace-fail /bin/sh ${lib.getExe' bash "sh"}
|
||||
patchShebangs src/makeman.pl
|
||||
''
|
||||
+ lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
# manpage generation invokes the build vpnc, which must be emulating when cross compiling
|
||||
substituteInPlace src/makeman.pl --replace-fail \
|
||||
'$vpnc --long-help' \
|
||||
'${stdenv.hostPlatform.emulator buildPackages} $vpnc --long-help'
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
# Missing install depends:
|
||||
# install: target '...-vpnc-unstable-2021-11-04/share/doc/vpnc': No such file or directory
|
||||
# make: *** [Makefile:149: install-doc] Error 1
|
||||
enableParallelInstalling = false;
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://davidepucci.it/doc/vpnc/";
|
||||
|
||||
@@ -10,25 +10,27 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "waytrogen";
|
||||
version = "0.5.8";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nikolaizombie1";
|
||||
repo = "waytrogen";
|
||||
tag = version;
|
||||
hash = "sha256-tq5cC0Z0kmrYopOGbdoAERBHQXrAw799zWdQP06rTYw=";
|
||||
hash = "sha256-jkrvtwkzlsQgbw8/N4uzeqQ3fVSur2oa21IOXRRgh9I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-05YfQBezDbQ8KfNvl/4Av5vf/rxJU3Ej6RDgSnSfjtM=";
|
||||
cargoHash = "sha256-UkYQ/oN1+C9WQ+4hbhXxORw5J3Ypwe7DaDg5LhgP2d0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
];
|
||||
buildInputs = [ glib ];
|
||||
|
||||
env = {
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
};
|
||||
|
||||
postBuild = ''
|
||||
install -Dm644 org.Waytrogen.Waytrogen.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas
|
||||
@@ -38,6 +40,10 @@ rustPlatform.buildRustPackage rec {
|
||||
postInstall = ''
|
||||
install -Dm644 waytrogen.desktop $out/share/applications/waytrogen.desktop
|
||||
install -Dm644 README-Assets/WaytrogenLogo.svg $out/share/icons/hicolor/scalable/apps/waytrogen.svg
|
||||
while IFS= read -r lang; do
|
||||
mkdir -p $out/share/locale/$lang/LC_MESSAGES
|
||||
msgfmt locales/$lang/LC_MESSAGES/waytrogen.po -o $out/share/locale/$lang/LC_MESSAGES/waytrogen.mo
|
||||
done < locales/LINGUAS
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
@@ -52,7 +58,10 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/nikolaizombie1/waytrogen";
|
||||
changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${version}";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ genga898 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
genga898
|
||||
nikolaizombie1
|
||||
];
|
||||
mainProgram = "waytrogen";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -108,6 +108,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
# Multiple tests spin up & speak to D-Bus, avoid cross-talk causing failures
|
||||
enableParallelChecking = false;
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \
|
||||
--replace-fail '/bin/false' '${lib.getExe' coreutils "false"}'
|
||||
|
||||
@@ -39,7 +39,7 @@ let
|
||||
cleanArgs args
|
||||
// {
|
||||
pname = "astal-${name}";
|
||||
version = "0-unstable-2025-01-13";
|
||||
version = "0-unstable-2025-01-23";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -47,8 +47,8 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aylur";
|
||||
repo = "astal";
|
||||
rev = "cac0fc63bfe098b26753db8262f5d95ac42b281b";
|
||||
hash = "sha256-kNtKWbQ+gMzmAF7KNSZ4Hb8/2cfSNoURCyRSB0nx2I4=";
|
||||
rev = "127e9cdcbf173846a3c40ddc0abfbb038df48042";
|
||||
hash = "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/${sourceRoot}";
|
||||
|
||||
@@ -11,18 +11,17 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bindep";
|
||||
version = "2.11.0";
|
||||
version = "2.12.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rLLyWbzh/RUIhzR5YJu95bmq5Qg3hHamjWtqGQAufi8=";
|
||||
hash = "sha256-wGtR5tC6OWWq2PPCXwpXS+D4AboHyxp4SV2olUZ952A=";
|
||||
};
|
||||
|
||||
env.PBR_VERSION = version;
|
||||
|
||||
build-system = [
|
||||
distro
|
||||
pbr
|
||||
setuptools
|
||||
];
|
||||
@@ -41,7 +40,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bindep is a tool for checking the presence of binary packages needed to use an application / library";
|
||||
homepage = "https://docs.opendev.org/opendev/bindep/latest/";
|
||||
homepage = "https://opendev.org/opendev/bindep";
|
||||
license = licenses.asl20;
|
||||
mainProgram = "bindep";
|
||||
maintainers = teams.openstack.members;
|
||||
|
||||
@@ -0,0 +1,108 @@
|
||||
{
|
||||
attrs,
|
||||
buildPythonPackage,
|
||||
cmarkgfm,
|
||||
cryptography,
|
||||
defusedxml,
|
||||
datamodel-code-generator,
|
||||
email-validator,
|
||||
fetchFromGitHub,
|
||||
furl,
|
||||
ilcli,
|
||||
importlib-resources,
|
||||
jinja2,
|
||||
lib,
|
||||
mypy,
|
||||
openpyxl,
|
||||
orjson,
|
||||
paramiko,
|
||||
pytestCheckHook,
|
||||
pydantic,
|
||||
python-dotenv,
|
||||
python-frontmatter,
|
||||
requests,
|
||||
ruamel-yaml,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "compliance-trestle";
|
||||
version = "3.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oscal-compass";
|
||||
repo = "compliance-trestle";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MEPleUM5gSCJjVaVbNtNzRl+Vvvk97h6Q/mOWIxFd2Q=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tests/trestle/misc/mypy_test.py \
|
||||
--replace-fail "trestle'," "${placeholder "out"}/bin/trestle'," \
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
attrs
|
||||
cmarkgfm
|
||||
cryptography
|
||||
defusedxml
|
||||
datamodel-code-generator
|
||||
email-validator
|
||||
furl
|
||||
ilcli
|
||||
importlib-resources
|
||||
jinja2
|
||||
openpyxl
|
||||
orjson
|
||||
paramiko
|
||||
pydantic
|
||||
python-dotenv
|
||||
python-frontmatter
|
||||
requests
|
||||
ruamel-yaml
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
mypy
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Requires network access
|
||||
"test_import_from_url"
|
||||
"test_import_from_nist"
|
||||
"test_remote_profile_relative_cat"
|
||||
|
||||
# AssertionError
|
||||
"test_profile_generate_assemble_rev_5"
|
||||
"test_ssp_assemble_fedramp_profile"
|
||||
"test_ssp_generate_aggregates_no_cds"
|
||||
"test_ssp_generate_aggregates_no_param_value_orig"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Requires network access
|
||||
"tests/trestle/core/remote"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "trestle" ];
|
||||
|
||||
meta = {
|
||||
description = "An opinionated tooling platform for managing compliance as code, using continuous integration and NIST's OSCAL standard";
|
||||
homepage = "https://github.com/oscal-compass/compliance-trestle";
|
||||
changelog = "https://github.com/oscal-compass/compliance-trestle/blob/${src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ tochiaha ];
|
||||
mainProgram = "trestle";
|
||||
};
|
||||
}
|
||||
@@ -12,7 +12,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.50.3";
|
||||
version = "1.50.5";
|
||||
tag = version;
|
||||
in
|
||||
buildPythonPackage {
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage {
|
||||
owner = "elevenlabs";
|
||||
repo = "elevenlabs-python";
|
||||
inherit tag;
|
||||
hash = "sha256-r96g/luQ1UwSY2IRv21cFBVf9H2TWtDFY8WElZoS7nc=";
|
||||
hash = "sha256-Cew8+L7NoQlvR2pILVmwNIa3WUfZzmEkf1+U2nglsnM=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -6,6 +6,9 @@
|
||||
# build-system
|
||||
hatchling,
|
||||
|
||||
# dependencies
|
||||
wadler-lindig,
|
||||
|
||||
# tests
|
||||
cloudpickle,
|
||||
equinox,
|
||||
@@ -20,18 +23,22 @@
|
||||
let
|
||||
self = buildPythonPackage rec {
|
||||
pname = "jaxtyping";
|
||||
version = "0.2.36";
|
||||
version = "0.2.37";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "jaxtyping";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TXhHh6Nka9TOnfFPaNyHmLdTkhzyFEY0mLSfoDf9KQc=";
|
||||
hash = "sha256-0a/9TSQW/k5kuucHoSUhLtRk9k+5ycbI/g6V1id3v28=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
wadler-lindig
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "jaxtyping" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
hatch-jupyter-builder,
|
||||
hatchling,
|
||||
pytestCheckHook,
|
||||
@@ -89,6 +88,11 @@ buildPythonPackage rec {
|
||||
pytestFlagsArray = [
|
||||
"-W"
|
||||
"ignore::DeprecationWarning"
|
||||
# 19 failures on python 3.13:
|
||||
# ResourceWarning: unclosed database in <sqlite3.Connection object at 0x7ffff2a0cc70>
|
||||
# TODO: Can probably be removed at the next update
|
||||
"-W"
|
||||
"ignore::pytest.PytestUnraisableExceptionWarning"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
@@ -113,6 +117,10 @@ buildPythonPackage rec {
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
# Failed: DID NOT RAISE <class 'tornado.web.HTTPError'>
|
||||
"test_copy_big_dir"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
|
||||
# TypeError: the JSON object must be str, bytes or bytearray, not NoneType
|
||||
"test_terminal_create_with_cwd"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
gcc13Stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
|
||||
# nativeBuildInputs
|
||||
cmake,
|
||||
@@ -33,6 +35,9 @@
|
||||
cudaPackages ? { },
|
||||
|
||||
}:
|
||||
let
|
||||
stdenvTarget = if cudaSupport then gcc13Stdenv else stdenv;
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-cpp-python";
|
||||
version = "0.3.6";
|
||||
@@ -47,6 +52,16 @@ buildPythonPackage rec {
|
||||
};
|
||||
# src = /home/gaetan/llama-cpp-python;
|
||||
|
||||
patches = [
|
||||
# fix segfault when running tests due to missing default Metal devices
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/ggerganov/llama.cpp/commit/acd38efee316f3a5ed2e6afcbc5814807c347053.patch?full_index=1";
|
||||
stripLen = 1;
|
||||
extraPrefix = "vendor/llama.cpp/";
|
||||
hash = "sha256-71+Lpg9z5KPlaQTX9D85KS2LXFWLQNJJ18TJyyq3/pU=";
|
||||
})
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
SKBUILD_CMAKE_ARGS = lib.strings.concatStringsSep ";" (
|
||||
lib.optionals cudaSupport [
|
||||
@@ -76,6 +91,8 @@ buildPythonPackage rec {
|
||||
]
|
||||
);
|
||||
|
||||
stdenv = stdenvTarget;
|
||||
|
||||
dependencies = [
|
||||
diskcache
|
||||
jinja2
|
||||
@@ -99,7 +116,11 @@ buildPythonPackage rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
tests.llama-cpp-python = llama-cpp-python.override { cudaSupport = true; };
|
||||
tests = lib.optionalAttrs stdenvTarget.hostPlatform.isLinux {
|
||||
withCuda = llama-cpp-python.override {
|
||||
cudaSupport = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -109,12 +130,6 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ kirillrdy ];
|
||||
badPlatforms = [
|
||||
# Segfaults during tests:
|
||||
# tests/test_llama.py .Fatal Python error: Segmentation fault
|
||||
# Current thread 0x00000001f3decf40 (most recent call first):
|
||||
# File "/private/tmp/nix-build-python3.12-llama-cpp-python-0.3.2.drv-0/source/llama_cpp/_internals.py", line 51 in __init__
|
||||
lib.systems.inspect.patterns.isDarwin
|
||||
|
||||
# cc1: error: unknown value ‘native+nodotprod+noi8mm+nosve’ for ‘-mcpu’
|
||||
"aarch64-linux"
|
||||
];
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mallard-ducktype";
|
||||
version = "1.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectmallard";
|
||||
repo = "mallard-ducktype";
|
||||
tag = version;
|
||||
hash = "sha256-jHjzTBBRBh//bOrdnyCRmZRmpupgDaDRuZGAd75baco=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
pushd tests
|
||||
./runtests
|
||||
popd
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "mallard" ];
|
||||
|
||||
meta = {
|
||||
description = "Parser for the lightweight Ducktype syntax for Mallard";
|
||||
homepage = "https://github.com/projectmallard/mallard-ducktype";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyiskra";
|
||||
version = "0.1.14";
|
||||
version = "0.1.15";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Iskramis";
|
||||
repo = "pyiskra";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OLNUa11UULiW6E8nVy5rUyN7iAD7KdM+R76m2zaDOgc=";
|
||||
hash = "sha256-LIrhd2gDqa1AehnG0WVQKUNbFTuFkLcHwqNAjFejYk0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scrap-engine";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "scrap_engine";
|
||||
inherit version;
|
||||
hash = "sha256-qxzbVYFcSKcL2HtMlH9epO/sCx9HckWAt/NyVD8QJBQ=";
|
||||
hash = "sha256-9jiStwFD5vhPSxWsEVmHOvfRgNgVOUvlzAa1Rmf+faE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -22,16 +22,14 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "stable-baselines3";
|
||||
# TODO: To this date, the latest release (2.4.1) is not compatible with numpy 2 and does not build
|
||||
# successfully on nixpkgs
|
||||
version = "2.4.1-unstable-2025-01-07";
|
||||
version = "2.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DLR-RM";
|
||||
repo = "stable-baselines3";
|
||||
rev = "b7c64a1aa4dd2fd3efed96e7a9ddb4d1f5c96112";
|
||||
hash = "sha256-oyTOBRZsKkhhGKwwBN9HCV0t8+MkJYpWsTRdS+upMeI=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4KOF/3/PxHHSo95zaqtPy5+h53VcUsMhSx85tGvXV2o=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
hatchling,
|
||||
|
||||
# tests
|
||||
numpy,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wadler-lindig";
|
||||
version = "0.1.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "patrick-kidger";
|
||||
repo = "wadler_lindig";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-akb1x9UYbfEwnVS6ahpb42XnEl3y7kk3WkhwD8p7AA4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"wadler_lindig"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
numpy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A Wadler--Lindig pretty printer for Python";
|
||||
homepage = "https://github.com/patrick-kidger/wadler_lindig";
|
||||
changelog = "https://github.com/patrick-kidger/wadler_lindig/releases/tag/v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
@@ -48,6 +48,7 @@ rec {
|
||||
runCommand,
|
||||
writeText,
|
||||
autoPatchelfHook,
|
||||
buildPackages,
|
||||
|
||||
# The JDK/JRE used for running Gradle.
|
||||
java ? defaultJava,
|
||||
@@ -78,7 +79,6 @@ rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
java
|
||||
stdenv.cc.cc
|
||||
ncurses5
|
||||
ncurses6
|
||||
@@ -123,6 +123,8 @@ rec {
|
||||
newFileEvents = toString (lib.versionAtLeast version "8.12");
|
||||
in
|
||||
''
|
||||
# get the correct jar executable for cross
|
||||
export PATH="${buildPackages.jdk}/bin:$PATH"
|
||||
. ${./patching.sh}
|
||||
|
||||
nativeVersion="$(extractVersion native-platform $out/lib/gradle/lib/native-platform-*.jar)"
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
let
|
||||
common = rec {
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nixd";
|
||||
rev = version;
|
||||
hash = "sha256-5+ul4PxMgPkmGLB8CYpJcIcRDY/pJgByvjIHDA1Gs5A=";
|
||||
hash = "sha256-gYC7nbZsTDOA1cJIw9JRjwjgkvSzrlQonGTT21EZeWM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
openssl,
|
||||
perl,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
CoreServices,
|
||||
Security,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-web";
|
||||
version = "0.6.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koute";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-qualified-path.patch";
|
||||
url = "https://github.com/koute/cargo-web/commit/c9584542163d60d0aae6d6890509794e838e257f.patch";
|
||||
hash = "sha256-w59fXmrszptKt0llqGt0AF+0b3r9N6xUY6zQkpZnemE=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoHash = "sha256-apPXSG8RV9hZ+jttn4XHhgmuLQ7344SQJna7Z/fu/mA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
openssl
|
||||
perl
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
CoreServices
|
||||
Security
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cargo subcommand for the client-side Web";
|
||||
mainProgram = "cargo-web";
|
||||
homepage = "https://github.com/koute/cargo-web";
|
||||
license = with licenses; [
|
||||
asl20 # or
|
||||
mit
|
||||
];
|
||||
maintainers = with maintainers; [ clevor ];
|
||||
};
|
||||
}
|
||||
@@ -1,31 +1,31 @@
|
||||
{ fetchurl, fetchzip }:
|
||||
{
|
||||
x86_64-darwin = fetchzip {
|
||||
sha256 = "sha256-+xZmMc5VOJ2GKvZdR0qDdwj+qze4r7eJFtZuLUkqZwE=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_darwin_amd64.zip";
|
||||
};
|
||||
aarch64-darwin = fetchzip {
|
||||
sha256 = "sha256-gIqPWHOl0bcZYmfujV3KnTrsZ8hWjN5KQDWq+aHNIn4=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_darwin_arm64.zip";
|
||||
};
|
||||
i686-linux = fetchurl {
|
||||
sha256 = "sha256-HWUTRPkaqk26A2eeN13DUNKBNM+jDBa5UuqjrYzPK5k=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_386.tar.gz";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
sha256 = "sha256-El/IAemoIyOgQYpmI1F84qTFteHT0H3ncYp2WxzZcJY=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_amd64.tar.gz";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
sha256 = "sha256-AHsQbTWH1mNafhRtpGY31g89jP07TZnL5fJvS0EbLDU=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_arm64.tar.gz";
|
||||
};
|
||||
armv6l-linux = fetchurl {
|
||||
sha256 = "sha256-cpCgPLJEkgR0h5pduIEGP+sb58qZTljEeQn/w3Csz2Q=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_armv6.tar.gz";
|
||||
};
|
||||
armv7l-linux = fetchurl {
|
||||
sha256 = "sha256-Nm09ih54jZEDMJCBJst43Sl2d6vVXCdFnkWBV4lehns=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_armv7.tar.gz";
|
||||
};
|
||||
x86_64-darwin = fetchzip {
|
||||
sha256 = "sha256-uviTmopXz7OYVr4H2M/dFOMw0vD5P+3t5CChSL2HyrE=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_darwin_amd64.zip";
|
||||
};
|
||||
aarch64-darwin = fetchzip {
|
||||
sha256 = "sha256-P9n6H8YmttcZE5E/7nw/Bc+Gzb4nHbs3L/2pgdqUyFw=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_darwin_arm64.zip";
|
||||
};
|
||||
i686-linux = fetchurl {
|
||||
sha256 = "sha256-JPhx1Hqu5o3K4bBulStedLZexCtZhgZNgzvGTqUn3XY=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_386.tar.gz";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
sha256 = "sha256-BEqPo3jeLukMnykO+6GNZ93bplDCOcV33BOHleQLWDI=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_amd64.tar.gz";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
sha256 = "sha256-JxitRduWdp4uJCcoR7FA26prDIc68CzsFOviehxDRxI=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_arm64.tar.gz";
|
||||
};
|
||||
armv6l-linux = fetchurl {
|
||||
sha256 = "sha256-TdBDGSny3xWRrMG5MamrN26E/fOf7V9jHvxxbK+7BPU=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_armv6.tar.gz";
|
||||
};
|
||||
armv7l-linux = fetchurl {
|
||||
sha256 = "sha256-mrBsebAKSelAMcuurAUiZdPKr2AGi9lnk1Dhz+PAm/0=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_armv7.tar.gz";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.55";
|
||||
version = "0.107.56";
|
||||
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
version = "1.21.8";
|
||||
hash = "sha256-zTVjjd/XmxfVJpQdaFsIl6vDlzU1Hf7szHpnZJBwV3Y=";
|
||||
npmDepsHash = "sha256-uUzlWReyvCYYTFoPRd6DDUHEPbty99OLmfH4CEVmzU4=";
|
||||
vendorHash = "sha256-Rxavu9cu5tU4+SQmjh1O8NuLHJFnrcjN75bDYw3FY5Y=";
|
||||
version = "1.22.0";
|
||||
hash = "sha256-cQgBHiUV9Wy9T1FSuaiM26hp/F44JvBmH4NvsEKwD1U=";
|
||||
npmDepsHash = "sha256-McC7IDIJ6ZOOEFC8fCancAjp8BReJ6tfYN1FfPnaV8I=";
|
||||
vendorHash = "sha256-WhTYG1Bza5RglhApOqVDZMkPC3K3hVk4l2GdLvstOIc=";
|
||||
}
|
||||
|
||||
@@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-Y71o+ARi/YB2BRDfEyORbrA9HPvsUlWdh5UjM8hzmcA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Mk+0LKP55Um5YiCx2O49rUZPwaXtKFnWtRC+WPGBadE=";
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-bO3KN+ynxNdbnFv1ZHJSSPWd4SxWQGIis3O3Gfba8jw=";
|
||||
|
||||
passthru = rec {
|
||||
test_client = rustPlatform.buildRustPackage {
|
||||
@@ -25,7 +26,8 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildAndTestSubdir = "test_client";
|
||||
|
||||
cargoHash = "sha256-SBEuFOTgqNjPtKx0PFDA5Gkiksn3cZEmYcs2shAo2Po=";
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-bO3KN+ynxNdbnFv1ZHJSSPWd4SxWQGIis3O3Gfba8jw=";
|
||||
|
||||
meta = meta // {
|
||||
mainProgram = "test_client";
|
||||
|
||||
@@ -30,9 +30,8 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
};
|
||||
|
||||
cargoHash = if stdenv.buildPlatform.isDarwin
|
||||
then "sha256-HTqsghjfSjwOaN/ApPFvWVEoquZzE3MYzULkhUOXIWI"
|
||||
else "sha256-Z3AbYtdNAyKT5EuGtCktEg0fxs/gpKdsrttRkxZhLAU";
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-bVXz/rSfkmdQlAa3B4zamZebpRBOkch6zNOFiyEQBbY=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.Security
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user