Merge remote branch master into haskell-updates
This commit is contained in:
sternenseemann
@@ -18498,6 +18498,11 @@
|
||||
githubId = 56157634;
|
||||
name = "Ruben Hönle";
|
||||
};
|
||||
rubikcubed = {
|
||||
github = "rubikcubed";
|
||||
githubId = 91467402;
|
||||
name = "rubikcubed";
|
||||
};
|
||||
ruby0b = {
|
||||
github = "ruby0b";
|
||||
githubId = 106119328;
|
||||
|
||||
@@ -714,10 +714,6 @@ in {
|
||||
ExecStart = updateConfig;
|
||||
};
|
||||
};
|
||||
|
||||
syncthing-resume = {
|
||||
wantedBy = [ "suspend.target" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ in
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = utils.removePackagesByName (with pkgs.xfce // pkgs; [
|
||||
environment.systemPackages = utils.removePackagesByName (with pkgs; [
|
||||
glib # for gsettings
|
||||
gtk3.out # gtk-update-icon-cache
|
||||
|
||||
@@ -88,7 +88,7 @@ in
|
||||
adwaita-icon-theme
|
||||
hicolor-icon-theme
|
||||
tango-icon-theme
|
||||
xfce4-icon-theme
|
||||
xfce.xfce4-icon-theme
|
||||
|
||||
desktop-file-utils
|
||||
shared-mime-info # for update-mime-database
|
||||
@@ -99,37 +99,37 @@ in
|
||||
# Needed by Xfce's xinitrc script
|
||||
xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
|
||||
|
||||
exo
|
||||
garcon
|
||||
libxfce4ui
|
||||
xfce.exo
|
||||
xfce.garcon
|
||||
xfce.libxfce4ui
|
||||
|
||||
mousepad
|
||||
parole
|
||||
ristretto
|
||||
xfce4-appfinder
|
||||
xfce4-notifyd
|
||||
xfce4-screenshooter
|
||||
xfce4-session
|
||||
xfce4-settings
|
||||
xfce4-taskmanager
|
||||
xfce4-terminal
|
||||
xfce.mousepad
|
||||
xfce.parole
|
||||
xfce.ristretto
|
||||
xfce.xfce4-appfinder
|
||||
xfce.xfce4-notifyd
|
||||
xfce.xfce4-screenshooter
|
||||
xfce.xfce4-session
|
||||
xfce.xfce4-settings
|
||||
xfce.xfce4-taskmanager
|
||||
xfce.xfce4-terminal
|
||||
] # TODO: NetworkManager doesn't belong here
|
||||
++ optional config.networking.networkmanager.enable networkmanagerapplet
|
||||
++ optional config.powerManagement.enable xfce4-power-manager
|
||||
++ optional config.powerManagement.enable xfce.xfce4-power-manager
|
||||
++ optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [
|
||||
pavucontrol
|
||||
# volume up/down keys support:
|
||||
# xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
|
||||
# but can only be used with xfce4-panel, so for no-desktop usage we still include
|
||||
# xfce4-volumed-pulse
|
||||
(if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin)
|
||||
(if cfg.noDesktop then xfce.xfce4-volumed-pulse else xfce.xfce4-pulseaudio-plugin)
|
||||
] ++ optionals cfg.enableXfwm [
|
||||
xfwm4
|
||||
xfwm4-themes
|
||||
xfce.xfwm4
|
||||
xfce.xfwm4-themes
|
||||
] ++ optionals (!cfg.noDesktop) [
|
||||
xfce4-panel
|
||||
xfdesktop
|
||||
] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages;
|
||||
xfce.xfce4-panel
|
||||
xfce.xfdesktop
|
||||
] ++ optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages;
|
||||
|
||||
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2;
|
||||
programs.xfconf.enable = true;
|
||||
|
||||
+142
-2
@@ -29,6 +29,28 @@ version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
|
||||
|
||||
[[package]]
|
||||
name = "avante-repo-map"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"minijinja",
|
||||
"mlua",
|
||||
"serde",
|
||||
"tree-sitter",
|
||||
"tree-sitter-c",
|
||||
"tree-sitter-cpp",
|
||||
"tree-sitter-go",
|
||||
"tree-sitter-javascript",
|
||||
"tree-sitter-language",
|
||||
"tree-sitter-lua",
|
||||
"tree-sitter-python",
|
||||
"tree-sitter-ruby",
|
||||
"tree-sitter-rust",
|
||||
"tree-sitter-typescript",
|
||||
"tree-sitter-zig",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "avante-templates"
|
||||
version = "0.1.0"
|
||||
@@ -117,9 +139,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.1.15"
|
||||
version = "1.1.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
|
||||
checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
|
||||
dependencies = [
|
||||
"shlex",
|
||||
]
|
||||
@@ -1275,6 +1297,124 @@ dependencies = [
|
||||
"unicode_categories",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter"
|
||||
version = "0.23.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "20f4cd3642c47a85052a887d86704f4eac272969f61b686bdd3f772122aabaff"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"regex",
|
||||
"regex-syntax",
|
||||
"tree-sitter-language",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter-c"
|
||||
version = "0.23.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c8b3fb515e498e258799a31d78e6603767cd6892770d9e2290ec00af5c3ad80b"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"tree-sitter-language",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter-cpp"
|
||||
version = "0.23.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1d67e862242878d6ee50e1e5814f267ee3eea0168aea2cdbd700ccfb4c74b6d3"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"tree-sitter-language",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter-go"
|
||||
version = "0.23.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "caf57626e4c9b6d6efaf8a8d5ee1241c5f178ae7bfdf693713ae6a774f01424e"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"tree-sitter-language",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter-javascript"
|
||||
version = "0.23.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "59e1f62f8babb640b909f30675d1addeb1f17802f2a4d2af287569753b243977"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"tree-sitter-language",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter-language"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2545046bd1473dac6c626659cc2567c6c0ff302fc8b84a56c4243378276f7f57"
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter-lua"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5cdb9adf0965fec58e7660cbb3a059dbb12ebeec9459e6dcbae3db004739641e"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"tree-sitter-language",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter-python"
|
||||
version = "0.23.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "65661b1a3e24139e2e54207e47d910ab07e28790d78efc7d5dc3a11ce2a110eb"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"tree-sitter-language",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter-ruby"
|
||||
version = "0.23.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6ec5ee842e27791e0adffa0b2a177614de51d2a26e5c7e84d014ed7f097e5ed0"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"tree-sitter-language",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter-rust"
|
||||
version = "0.23.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cffbbcb780348fbae8395742ae5b34c1fd794e4085d43aac9f259387f9a84dc8"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"tree-sitter-language",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter-typescript"
|
||||
version = "0.23.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aecf1585ae2a9dddc2b1d4c0e2140b2ec9876e2a25fd79de47fcf7dae0384685"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"tree-sitter-language",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tree-sitter-zig"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2994e37b8ef1f715b931a5ff084a1b1713b1bc56e7aaebd148cc3efe0bf29ad9"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"tree-sitter-language",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "typeid"
|
||||
version = "1.0.2"
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2024-09-15";
|
||||
version = "2024-09-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yetone";
|
||||
repo = "avante.nvim";
|
||||
rev = "f9520c4fdfed08e9cc609d6cd319b358e4ea33a5";
|
||||
hash = "sha256-8zTDGPnhNI2rQA0uJc8gQRj4JCyg+IkO/D3oHYy4f9U=";
|
||||
rev = "0705234991d03170a72582085dc508600a03a779";
|
||||
hash = "sha256-tAigYqS3ZAtZJp7RaarbXrDxrjiYu2wjNHq6GP/BMfk=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
@@ -65,6 +65,7 @@ vimUtils.buildVimPlugin {
|
||||
in
|
||||
''
|
||||
mkdir -p $out/build
|
||||
ln -s ${avante-nvim-lib}/lib/libavante_repo_map${ext} $out/build/avante_repo_map${ext}
|
||||
ln -s ${avante-nvim-lib}/lib/libavante_templates${ext} $out/build/avante_templates${ext}
|
||||
ln -s ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/build/avante_tokenizers${ext}
|
||||
'';
|
||||
|
||||
@@ -159,6 +159,7 @@ in
|
||||
dependencies = with self; [
|
||||
dressing-nvim
|
||||
nui-nvim
|
||||
nvim-treesitter
|
||||
plenary-nvim
|
||||
];
|
||||
};
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tev";
|
||||
version = "1.27";
|
||||
version = "1.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tom94";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-+qCRHP0AbYOQBAE4zK2cmWPHZGWjjxC3DZPNm8sgBzs=";
|
||||
hash = "sha256-bgum8UIv0hTcIacjQsL7nc/2AbhjW5Zhq+LFkIWmDu8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake wrapGAppsHook3 ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "edge";
|
||||
version = "24.9.2";
|
||||
sha256 = "0bac5pwh741z7ly8abz92mydrhps2rlp4nkf3a4yxm7gj25gbqb1";
|
||||
vendorHash = "sha256-zKKgMcuHowU3Sft8QX0VJF+zXCVRyNC10k8nXwzTfYs=";
|
||||
version = "24.9.3";
|
||||
sha256 = "1vm6f8abain3zjs3jymr62p7lk475av38pljczgb13fgnn2w6qii";
|
||||
vendorHash = "sha256-w7TchPXGQQSWcCVf4BMvh5U8qnkctgJAl0sHL6ml/8Y=";
|
||||
}
|
||||
|
||||
@@ -33,14 +33,14 @@ let
|
||||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-l7uu101UcY5AGMh6BzMvXvPMw1tlaX6grus9eL9Kxf8=";
|
||||
x86_64-linux = "sha256-0Cdu1ntG8ZPHbLOIFvVFO6Dj8ZBHl4Rb+MM46luRKj4=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
displayname = "XPipe";
|
||||
|
||||
in stdenvNoCC.mkDerivation rec {
|
||||
pname = "xpipe";
|
||||
version = "11.3";
|
||||
version = "12.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";
|
||||
|
||||
+1039
-934
File diff suppressed because it is too large
Load Diff
@@ -16,21 +16,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "asusctl";
|
||||
version = "6.0.9";
|
||||
version = "6.0.12";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "asus-linux";
|
||||
repo = "asusctl";
|
||||
rev = version;
|
||||
hash = "sha256-mml+nj+Z6267QtejTkWiR3SdNAdZCNz4M8r6LzvhALw=";
|
||||
hash = "sha256-fod3ZkJktmJGHF8nSSp9lVMg/qYKQd4EiauFGTSvbsg=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"const-field-offset-0.1.5" = "sha256-0MaNu6cUXislY+wDFuxZptXeJRkOuXGRJwZWm6AvcZ8=";
|
||||
"notify-rust-4.7.0" = "sha256-A7edUorty5GpGXCUQPszZuXtLdEmbmrDSU9JcoDaiaI=";
|
||||
"supergfxctl-5.2.3" = "sha256-wKcHoMukdUXZrdbE1xsylq7ySJpxny3+0dGUQ40BVH8=";
|
||||
"const-field-offset-0.1.5" = "sha256-QtlvLwe27tLLdWhqiKzXoUvBsBcZbfwY84jXUduzCKw=";
|
||||
"supergfxctl-5.2.4" = "sha256-MQJJaTajPQ45BU6zyMx0Wwf7tAPcT4EURWWbZxrbGzE=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
-57
@@ -1,57 +0,0 @@
|
||||
From: Geoffrey McRae <geoff@hostfission.com>
|
||||
Date: Wed, 13 Mar 2024 11:17:25 +1100
|
||||
Subject: [PATCH] [client] cmake: move X11 config directives to
|
||||
`displayservers`
|
||||
|
||||
---
|
||||
client/CMakeLists.txt | 7 -------
|
||||
client/displayservers/CMakeLists.txt | 7 +++++++
|
||||
2 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git client/CMakeLists.txt client/CMakeLists.txt
|
||||
index 3755adcf..eeeb3eb0 100644
|
||||
--- client/CMakeLists.txt
|
||||
+++ client/CMakeLists.txt
|
||||
@@ -42,19 +42,12 @@ add_feature_info(ENABLE_ASAN ENABLE_ASAN "AddressSanitizer support.")
|
||||
option(ENABLE_UBSAN "Build with UndefinedBehaviorSanitizer" OFF)
|
||||
add_feature_info(ENABLE_UBSAN ENABLE_UBSAN "UndefinedBehaviorSanitizer support.")
|
||||
|
||||
-option(ENABLE_X11 "Build with X11 support" ON)
|
||||
-add_feature_info(ENABLE_X11 ENABLE_X11 "X11 support.")
|
||||
-
|
||||
option(ENABLE_PIPEWIRE "Build with PipeWire audio output support" ON)
|
||||
add_feature_info(ENABLE_PIPEWIRE ENABLE_PIPEWIRE "PipeWire audio support.")
|
||||
|
||||
option(ENABLE_PULSEAUDIO "Build with PulseAudio audio output support" ON)
|
||||
add_feature_info(ENABLE_PULSEAUDIO ENABLE_PULSEAUDIO "PulseAudio audio support.")
|
||||
|
||||
-if (NOT ENABLE_X11 AND NOT ENABLE_WAYLAND)
|
||||
- message(FATAL_ERROR "Either ENABLE_X11 or ENABLE_WAYLAND must be on")
|
||||
-endif()
|
||||
-
|
||||
add_compile_options(
|
||||
"-Wall"
|
||||
"-Wextra"
|
||||
diff --git client/displayservers/CMakeLists.txt client/displayservers/CMakeLists.txt
|
||||
index 5b5f827a..e7c4b25a 100644
|
||||
--- client/displayservers/CMakeLists.txt
|
||||
+++ client/displayservers/CMakeLists.txt
|
||||
@@ -18,9 +18,16 @@ function(add_displayserver name)
|
||||
add_subdirectory(${name})
|
||||
endfunction()
|
||||
|
||||
+option(ENABLE_X11 "Build with X11 support" ON)
|
||||
+add_feature_info(ENABLE_X11 ENABLE_X11 "X11 support.")
|
||||
+
|
||||
option(ENABLE_WAYLAND "Build with Wayland support" ON)
|
||||
add_feature_info(ENABLE_WAYLAND ENABLE_WAYLAND "Wayland support.")
|
||||
|
||||
+if (NOT ENABLE_X11 AND NOT ENABLE_WAYLAND)
|
||||
+ message(FATAL_ERROR "Either ENABLE_X11 or ENABLE_WAYLAND must be on")
|
||||
+endif()
|
||||
+
|
||||
# Add/remove displayservers here!
|
||||
if (ENABLE_WAYLAND)
|
||||
add_displayserver(Wayland)
|
||||
--
|
||||
2.43.1
|
||||
@@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, makeDesktopItem
|
||||
, pkg-config
|
||||
@@ -62,7 +63,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
patches = [
|
||||
# Fix failing cmake assertion when disabling X11 whithout explicitly enabling Wayland.
|
||||
./0001-client-cmake-move-X11-config-directives-to-displayse.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gnif/LookingGlass/commit/20972cfd9b940fddf9e7f3d2887a271d16398979.patch";
|
||||
hash = "sha256-CqB8AmOZ4YxnEsQkyu/ZEaun6ywpSh4B7PM+MFJF0qU=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wayland-scanner ];
|
||||
|
||||
@@ -126,12 +126,13 @@ let
|
||||
|
||||
indentLines = str: concatLines (map (s: " " + s) (filter (s: s != "") (splitString "\n" str)));
|
||||
bwrapCmd = { initArgs ? "" }: ''
|
||||
${extraPreBwrapCmds}
|
||||
ignored=(/nix /dev /proc /etc ${optionalString privateTmp "/tmp"})
|
||||
ro_mounts=()
|
||||
symlinks=()
|
||||
etc_ignored=()
|
||||
|
||||
${extraPreBwrapCmds}
|
||||
|
||||
# loop through all entries of root in the fhs environment, except its /etc.
|
||||
for i in ${fhsenv}/*; do
|
||||
path="/''${i##*/}"
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "arc-browser";
|
||||
version = "1.61.0-53949";
|
||||
version = "1.61.2-54148";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
|
||||
hash = "sha256-FuRWi4+vPt31bd3muMDEn3Fu20h9oWEd1XuPJU7W1OU=";
|
||||
hash = "sha256-y5oQFPdk6Y7AjzeTrA2U8MhGkPi6RJUcGqsvpjJ++UE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
+15
-9
@@ -1,11 +1,17 @@
|
||||
{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre_headless }:
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
makeBinaryWrapper,
|
||||
jre_headless,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "bundletool";
|
||||
version = "1.17.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
|
||||
url = "https://github.com/google/bundletool/releases/download/${finalAttrs.version}/bundletool-all-${finalAttrs.version}.jar";
|
||||
sha256 = "sha256-RYgerRM4iHLYLEJVsZVIi3/DPyysWpqXewr8XpI2dZI=";
|
||||
};
|
||||
|
||||
@@ -19,14 +25,14 @@ stdenvNoCC.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Command-line tool to manipulate Android App Bundles";
|
||||
mainProgram = "bundletool";
|
||||
homepage = "https://developer.android.com/studio/command-line/bundletool";
|
||||
changelog = "https://github.com/google/bundletool/releases/tag/${version}";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
maintainers = [ ];
|
||||
changelog = "https://github.com/google/bundletool/releases/tag/${finalAttrs.version}";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
maintainers = with lib.maintainers; [ momeemt ];
|
||||
platforms = jre_headless.meta.platforms;
|
||||
license = licenses.asl20;
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
appimageTools,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "cables";
|
||||
version = "0.3.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage";
|
||||
sha256 = "sha256-D5Bgg5D03FPQF2HKow4yehcqToo4dpPudBg0W4UnqFs=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit pname version src;
|
||||
postExtract = ''
|
||||
substituteInPlace $out/${name}.desktop --replace 'Exec=AppRun' 'Exec=cables'
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
inherit name src;
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/${name} $out/bin/cables
|
||||
|
||||
install -m 444 -D ${appimageContents}/${name}.desktop $out/share/applications/cables.desktop
|
||||
install -m 444 -D ${appimageContents}/${name}.png $out/share/icons/hicolor/512x512/apps/cables.png
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Standalone version of cables, a tool for creating beautiful interactive content.";
|
||||
homepage = "https://cables.gl";
|
||||
changelog = "https://cables.gl/changelog";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rubikcubed ];
|
||||
platforms = with platforms; linux ++ darwin ++ windows;
|
||||
broken = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64);
|
||||
mainProgram = "cables";
|
||||
};
|
||||
}
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clipse";
|
||||
version = "1.0.9";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savedra1";
|
||||
repo = "clipse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Kpe/LiAreZXRqh6BHvUIn0GcHloKo3A0WOdlRF2ygdc=";
|
||||
hash = "sha256-yUkHT7SZT7Eudvk1n43V+WGWqUKtXaV+p4ySMK/XzQw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Hdr9NRqHJxpfrV2G1KuHGg3T+cPLKhZXEW02f1ptgsw=";
|
||||
vendorHash = "sha256-+9uoB/1g4qucdM8RJRs+fSc5hpcgaCK0GrUOFgHWeKo=";
|
||||
|
||||
meta = {
|
||||
description = "Useful clipboard manager TUI for Unix";
|
||||
|
||||
@@ -1,14 +1,20 @@
|
||||
{ buildGoModule, lib, installShellFiles, fetchFromGitHub }:
|
||||
{
|
||||
buildGoModule,
|
||||
lib,
|
||||
installShellFiles,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "deck";
|
||||
version = "1.40.2";
|
||||
version = "1.40.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kong";
|
||||
repo = "deck";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qLWDZEYO/0as2+4OM6/FAJcN+vnRBrcx59uHRkougLQ=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-n6WASCtDwBX4FASSWI17JpU7rDXIeSidPWhj/MB2tUs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@@ -21,7 +27,7 @@ buildGoModule rec {
|
||||
];
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
vendorHash = "sha256-RkhpR9sKWaO1jceCU4sS4TmxS5giq2uUIkiHNnahQZw=";
|
||||
vendorHash = "sha256-csoSvu7uce1diB4EsQCRRt08mX+rJoxfZqAtaoo0x4M=";
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd deck \
|
||||
@@ -30,11 +36,13 @@ buildGoModule rec {
|
||||
--zsh <($out/bin/deck completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Configuration management and drift detection tool for Kong";
|
||||
homepage = "https://github.com/Kong/deck";
|
||||
license = licenses.asl20;
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "deck";
|
||||
maintainers = with maintainers; [ liyangau ];
|
||||
maintainers = with lib.maintainers; [ liyangau ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gittuf";
|
||||
version = "0.6.0";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gittuf";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2G0vUVOruevHJYCYHbumLBYMUah1o5EqgvUqMCONWDs=";
|
||||
hash = "sha256-iPaYwZUnIu9GeyY4kBhj+9gIINYx+pGSWJqPekh535g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mafN+Nrr0AtfMjnXNoEIuz90kJa58pgY2vUOlv7v+TE=";
|
||||
|
||||
+45
-31
@@ -1,53 +1,60 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, python3Packages
|
||||
, gobject-introspection
|
||||
, vulkan-tools
|
||||
, python3
|
||||
, wrapGAppsHook4
|
||||
, gdk-pixbuf
|
||||
, lsb-release
|
||||
, mesa-demos
|
||||
, vdpauinfo
|
||||
, clinfo
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
|
||||
# nativeBuildInputs
|
||||
gobject-introspection,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
wrapGAppsHook4,
|
||||
|
||||
# buildInputs
|
||||
gdk-pixbuf,
|
||||
gtk4,
|
||||
libadwaita,
|
||||
vulkan-tools,
|
||||
|
||||
# wrapper
|
||||
python3,
|
||||
clinfo,
|
||||
lsb-release,
|
||||
mesa-demos,
|
||||
vdpauinfo,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gpu-viewer";
|
||||
version = "3.04";
|
||||
version = "3.06";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arunsivaramanneo";
|
||||
repo = pname;
|
||||
repo = "gpu-viewer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+FDBHSVBTUHnhu2n7i9W1zIZe2wjY+OuFwQOJZojuzs=";
|
||||
hash = "sha256-vFU2VdafY1HmPGRa20PwT6n+Xf4bKBzKJ5jWpvwyMWg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
gobject-introspection
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gdk-pixbuf
|
||||
gtk4
|
||||
libadwaita
|
||||
vulkan-tools
|
||||
gdk-pixbuf
|
||||
];
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
pygobject3
|
||||
click
|
||||
pygobject3
|
||||
];
|
||||
|
||||
# Prevent double wrapping
|
||||
@@ -55,7 +62,15 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${python3.interpreter} $out/bin/gpu-viewer \
|
||||
--prefix PATH : "${lib.makeBinPath [ clinfo lsb-release mesa-demos vdpauinfo vulkan-tools ]}" \
|
||||
--prefix PATH : "${
|
||||
lib.makeBinPath [
|
||||
clinfo
|
||||
lsb-release
|
||||
mesa-demos
|
||||
vdpauinfo
|
||||
vulkan-tools
|
||||
]
|
||||
}" \
|
||||
--add-flags "$out/share/gpu-viewer/Files/GPUViewer.py" \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH" \
|
||||
--chdir "$out/share/gpu-viewer/Files" \
|
||||
@@ -63,14 +78,13 @@ python3.pkgs.buildPythonApplication rec {
|
||||
''${gappsWrapperArgs[@]}
|
||||
'';
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/arunsivaramanneo/GPU-Viewer";
|
||||
description = "Front-end to glxinfo, vulkaninfo, clinfo and es2_info";
|
||||
changelog = "https://github.com/arunsivaramanneo/GPU-Viewer/releases/tag/v${version}";
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "gpu-viewer";
|
||||
};
|
||||
}
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule {
|
||||
pname = "hexxy";
|
||||
version = "0-unstable-2024-09-20";
|
||||
version = "0-unstable-2024-09-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sweetbbak";
|
||||
repo = "hexxy";
|
||||
# upstream does not publish releases, i.e., there are no tags
|
||||
rev = "96cd37561fe54ba0b87d0d0989297f7eba09ecaa";
|
||||
hash = "sha256-SkBHLZW0MDMluoLGFPH+QTXbaikcZXaUnSaTq3uoOaA=";
|
||||
rev = "36174e436f9d57421b9e9515db32ca1425c382bd";
|
||||
hash = "sha256-5r8yaKlRkIcZXubHBMhdGV0u52rs2WnEaWatm+D56Fs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qkBpSVLWZPRgS9bqOVUWHpyj8z/nheQJON3vJOwPUj4=";
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{
|
||||
"version": "1.116.2",
|
||||
"hash": "sha256-vbLUHNgUHnKAO424j/MwKDv0GZhBZ2T6vwjLsIHhMxM=",
|
||||
"version": "1.117.0",
|
||||
"hash": "sha256-v4TxKL+NaaAFxlJx/AG/5JxWnPK9uO6GjM4aoW53nzQ=",
|
||||
"components": {
|
||||
"cli": {
|
||||
"npmDepsHash": "sha256-M0A+B9qHmRRb6XW0P57Huo85cL8PUpLGe32IJzJgZhY=",
|
||||
"version": "2.2.22"
|
||||
"npmDepsHash": "sha256-ARjrBHx4aOiNy2PbHWS7kP9Z8QiNyTeyImSxIsXwPnU=",
|
||||
"version": "2.2.23"
|
||||
},
|
||||
"server": {
|
||||
"npmDepsHash": "sha256-1gOJxg+OXG4t6jZdia5+1Ie5gOjtZhqpqOgPi3I/U+k=",
|
||||
"version": "1.116.2"
|
||||
"npmDepsHash": "sha256-RjaTRqfZpDhI8lMVvsgICUn8g4NFnqcPptem/AwRr38=",
|
||||
"version": "1.117.0"
|
||||
},
|
||||
"web": {
|
||||
"npmDepsHash": "sha256-mI/hMDf7mBV1oMkJIh6IYVzqGv+h+sc9wiGJsL0Rmog=",
|
||||
"version": "1.116.2"
|
||||
"npmDepsHash": "sha256-TZnpbLJbTNFwI2Kvng88z0T1jFf4Tj2xwR0X0wCLaD0=",
|
||||
"version": "1.117.0"
|
||||
},
|
||||
"open-api/typescript-sdk": {
|
||||
"npmDepsHash": "sha256-lfqk/2YBbB6qiFXjeTYqnkslVmI8fXTvHe/wGCSD8Ok=",
|
||||
"version": "1.116.2"
|
||||
"npmDepsHash": "sha256-G+iivJ0jibRCw/RChv5heVwY7c7oY/EG4bL+kpjoADQ=",
|
||||
"version": "1.117.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fuse,
|
||||
ncurses,
|
||||
python3,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libbde";
|
||||
version = "20240502";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/libyal/libbde/releases/download/${finalAttrs.version}/libbde-alpha-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-La6rzBOfyBIXDn78vXb8GUt8jgQkzsqM38kRZ7t3Fp0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
fuse
|
||||
ncurses
|
||||
python3
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
substituteInPlace pybde/Makefile \
|
||||
--replace-fail '$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install' ' '
|
||||
'';
|
||||
|
||||
configureFlags = [ "--enable-python" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Library to access the BitLocker Drive Encryption (BDE) format";
|
||||
homepage = "https://github.com/libyal/libbde/";
|
||||
license = lib.licenses.lgpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
eliasp
|
||||
bot-wxt1221
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
zlib
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater { tagPrefix = "v"; };
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "okteto";
|
||||
version = "2.31.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = version;
|
||||
hash = "sha256-YY8PWBEd8MV/k0wvXqyFTuNi3mvUnFNm2GrmrFF7TKQ=";
|
||||
hash = "sha256-TxZdHR6SNHrIAdrrg3X9TnWCR8bjos93d7k7eaKpvQ8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7XZImCS9hv8ILYfGcoY3tMk0grswWbfpQrBKhghTfsY=";
|
||||
vendorHash = "sha256-GiA/fmLT9x3gGF066bHTBWDd1yhygeG9snwCpwhOlMM=";
|
||||
|
||||
postPatch = ''
|
||||
# Disable some tests that need file system & network access.
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "onedrive";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abraunegg";
|
||||
repo = "onedrive";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-up7o1myrQutDOEX98rkMlxJZs+Wzaf9HkOYNsX/JC4s=";
|
||||
hash = "sha256-neJi5lIx45GsuwZPzzwwEm1bfrL2DFSysVkxa4fCBww";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -33,10 +33,10 @@
|
||||
|
||||
let
|
||||
# Keep these separate so the update script can regex them
|
||||
rpcs3GitVersion = "16959-60b5adab6";
|
||||
rpcs3Version = "0.0.33-16959-60b5adab6";
|
||||
rpcs3Revision = "60b5adab636f0cef6987165b38b42cbd7b2a9768";
|
||||
rpcs3Hash = "sha256-0/cNiPUnjuik6YyiNeZ5ZAZBExex5WVW56PCzm80Xx8=";
|
||||
rpcs3GitVersion = "16999-938306a7b";
|
||||
rpcs3Version = "0.0.33-16999-938306a7b";
|
||||
rpcs3Revision = "938306a7bc86edd0dfdd995d28e818f36240bf8f";
|
||||
rpcs3Hash = "sha256-5XufzJ3LmhBpLiIscIW3KBgj/R9aSDD5zFiBo/D+p34=";
|
||||
|
||||
inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland;
|
||||
in
|
||||
|
||||
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gitUpdater { tagPrefix = "v"; };
|
||||
updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
tests = {
|
||||
inherit (nixosTests) rtorrent;
|
||||
};
|
||||
|
||||
@@ -42,8 +42,8 @@ let
|
||||
|
||||
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
|
||||
# source of the latter disappears much faster.
|
||||
version = "8.129.0.201";
|
||||
revision = "364";
|
||||
version = "8.129.0.202";
|
||||
revision = "365";
|
||||
|
||||
rpath =
|
||||
lib.makeLibraryPath [
|
||||
@@ -103,7 +103,7 @@ let
|
||||
fetchurl {
|
||||
name = "skypeforlinux-${version}-${revision}.snap";
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap";
|
||||
hash = "sha512-b1tA6Su7Ij89/SdEY1WCBu6IeKuSlEH5OpD5qE+w1B8xEX2Bj9axe4s/YYDb2FvuDhWJn86oZpFf7N6ATt16tg==";
|
||||
hash = "sha512-pxLh/dU/RK1H5gjFLB0V4mVddgQkO8ZcJowpNNihECsLaELgoeXmWXflhYFs2G7fdEzNMeujuc4/ZoGCFSZCvw==";
|
||||
}
|
||||
else
|
||||
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.24.6";
|
||||
version = "1.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EaifxKLvjfJi2DLvv6yc9JEcaYuZT0vlQriOhmtYY7s=";
|
||||
hash = "sha256-0JInvnQRINItUyAqnDBT0uRlF7zKRA4S/IyqxqmHnvQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6z7W9nlYHB7iCv/16KeKF2ryYpsy0dKjhgbfpk3tBXs=";
|
||||
cargoHash = "sha256-44JBZu08PDkyeBMscchNp6N9aF99b5lZWDhp4K42xsY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code spell checker";
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
{ lib, stdenv, fetchzip }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vault-bin";
|
||||
version = "1.17.5";
|
||||
version = "1.17.6";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -16,16 +20,16 @@ stdenv.mkDerivation rec {
|
||||
aarch64-darwin = "darwin_arm64";
|
||||
};
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-rh0ZVmAbiOmZFCpiiX9ClAYmQKx084VKCjxvD9bbYAk=";
|
||||
aarch64-linux = "sha256-DtriOEQCuSMMjzfJJpJAf7z+wGJSbzU3V/X+glTLkv8=";
|
||||
i686-linux = "sha256-EPS3Sx2l0Gv4PWeqrnIEoNYUF4Or075vdhn71vKXQEw=";
|
||||
x86_64-darwin = "sha256-pi/sD88haBxUx6dSUEUv6ugQO2K/lhg4ne7xbcVzg3M=";
|
||||
aarch64-darwin = "sha256-6ZESO3m5FCRwTNh3xlWjWw6c9sjiAwV09YA/hQ5Py/o=";
|
||||
x86_64-linux = "sha256-K9yNZ4M8u8FfisWi6Y6TsBJy6FQytr3htNCsKh2MlyA=";
|
||||
aarch64-linux = "sha256-KLHkxUGvekHT/bPtoIlmylCubTWH+I7Q0wJM0UG0Hp8=";
|
||||
i686-linux = "sha256-jBS/nGKP27weFw4u6Q10athYwCqWLzpb7ph39v+QAN8=";
|
||||
x86_64-darwin = "sha256-5KfWqtJldk66dO5ImYKivDau4JzacUIXBfAzWkkPfoE=";
|
||||
aarch64-darwin = "sha256-wjmNY1lunJDjpkWDXl0upAeNBqBx8momlY4a3j+hMd0=";
|
||||
};
|
||||
in
|
||||
fetchzip {
|
||||
url = "https://releases.hashicorp.com/vault/${version}/vault_${version}_${suffix}.zip";
|
||||
stripRoot=false;
|
||||
stripRoot = false;
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
@@ -57,8 +61,23 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.vaultproject.io";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.bsl11;
|
||||
maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man techknowlogick mkaito ];
|
||||
maintainers =
|
||||
with maintainers;
|
||||
teams.serokell.members
|
||||
++ [
|
||||
offline
|
||||
psyanticy
|
||||
Chili-Man
|
||||
techknowlogick
|
||||
mkaito
|
||||
];
|
||||
mainProgram = "vault";
|
||||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
"aarch64-linux"
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
installShellFiles,
|
||||
nixosTests,
|
||||
makeWrapper,
|
||||
gawk,
|
||||
glibc,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vault";
|
||||
version = "1.17.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "vault";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sd4gNNJ/DVpl7ReymykNemWz4NNisofMIH6lLNl+iVw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-V7aMf03U2DTNg1murp4LBfuOioA+7iG6jX9o05rhM2U=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
tags = [ "vault" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/hashicorp/vault/sdk/version.GitCommit=${src.rev}"
|
||||
"-X github.com/hashicorp/vault/sdk/version.Version=${version}"
|
||||
"-X github.com/hashicorp/vault/sdk/version.VersionPrerelease="
|
||||
];
|
||||
|
||||
postInstall =
|
||||
''
|
||||
echo "complete -C $out/bin/vault vault" > vault.bash
|
||||
installShellCompletion vault.bash
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
wrapProgram $out/bin/vault \
|
||||
--prefix PATH ${
|
||||
lib.makeBinPath [
|
||||
gawk
|
||||
glibc
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests)
|
||||
vault
|
||||
vault-postgresql
|
||||
vault-dev
|
||||
vault-agent
|
||||
;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.vaultproject.io/";
|
||||
description = "Tool for managing secrets";
|
||||
changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.bsl11;
|
||||
mainProgram = "vault";
|
||||
maintainers = with maintainers; [
|
||||
rushmorem
|
||||
lnl7
|
||||
offline
|
||||
pradeepchhetri
|
||||
Chili-Man
|
||||
techknowlogick
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wit-bindgen";
|
||||
version = "0.32.0";
|
||||
version = "0.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = "wit-bindgen";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AsKbmJBWIv/NjWzGdjTpbCs+esSkIli08qbEApppvOU=";
|
||||
hash = "sha256-+3tWqNdDZagJa9cLSz1OBaPtCr2F1joYyzB//BPqV34=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+/7asqF4eXtl+/AhgSf+M3KIVqFf44EHb0FJTT4lo4c=";
|
||||
cargoHash = "sha256-3TrnSU7qXC8INlEZMbYTNwZsqiKMZ6j7tdGmz3DFl1g=";
|
||||
|
||||
# Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
|
||||
# However, GitHub Actions ensures a proper build.
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-unite";
|
||||
version = "79";
|
||||
version = "80";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hardpixel";
|
||||
repo = "unite-shell";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OyxNibjQn7VBEdAPUaGd0MEgzCzpaFqViMKhF52haUI=";
|
||||
hash = "sha256-mK5EoGlfJ6JGQkKuYFg1wxwyL5p+woIlJfkj9UWozio=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -19,27 +19,25 @@
|
||||
, libgudev
|
||||
, libraw
|
||||
, sqlite
|
||||
, python3
|
||||
, libwebp
|
||||
, wrapGAppsHook3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-photos";
|
||||
version = "8.0.0";
|
||||
version = "8.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "photos";
|
||||
rev = version;
|
||||
sha256 = "sha256-EULNLtoZ8M68cp1DT11G6O2TONH/0DXWNX0k4AUqa/w=";
|
||||
sha256 = "sha256-+aqBeGRisngbH/EALROTr0IZvyrWIlQvFFEgJNfv95Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook3
|
||||
];
|
||||
@@ -66,11 +64,6 @@ stdenv.mkDerivation rec {
|
||||
gstreamer
|
||||
]);
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
@@ -1,19 +1,27 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl
|
||||
, x11Support ? false
|
||||
, libX11
|
||||
, cairo
|
||||
, config
|
||||
, enableCuda ? config.cudaSupport
|
||||
, cudaPackages
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
expat,
|
||||
ncurses,
|
||||
pciutils,
|
||||
numactl,
|
||||
x11Support ? false,
|
||||
libX11,
|
||||
cairo,
|
||||
config,
|
||||
enableCuda ? config.cudaSupport,
|
||||
cudaPackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hwloc";
|
||||
version = "2.11.1";
|
||||
version = "2.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2";
|
||||
sha256 = "sha256-BM37/60iXOFfZhhPD0FBMn2r8ojRCouE0T9Rest4cMY=";
|
||||
hash = "sha256-9/iP7K4GcQDxoakVtlit0PT3FWEllIKRCmm66iL+hAk=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
@@ -22,11 +30,17 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
# XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
|
||||
|
||||
buildInputs = [ expat ncurses ]
|
||||
++ lib.optionals x11Support [ cairo libX11 ]
|
||||
buildInputs =
|
||||
[
|
||||
expat
|
||||
ncurses
|
||||
]
|
||||
++ lib.optionals x11Support [
|
||||
cairo
|
||||
libX11
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ]
|
||||
++ lib.optionals enableCuda [ cudaPackages.cuda_cudart ];
|
||||
|
||||
@@ -45,35 +59,44 @@ stdenv.mkDerivation rec {
|
||||
|
||||
sed -i "$lib/lib/libhwloc.la" \
|
||||
-e "s|-lnuma|-L$numalibdir -lnuma|g"
|
||||
'';
|
||||
'';
|
||||
|
||||
# Checks disabled because they're impure (hardware dependent) and
|
||||
# fail on some build machines.
|
||||
doCheck = false;
|
||||
|
||||
outputs = [ "out" "lib" "dev" "doc" "man" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"lib"
|
||||
"dev"
|
||||
"doc"
|
||||
"man"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Portable abstraction of hierarchical architectures for high-performance computing";
|
||||
longDescription = ''
|
||||
hwloc provides a portable abstraction (across OS,
|
||||
versions, architectures, ...) of the hierarchical topology of
|
||||
modern architectures, including NUMA memory nodes, sockets,
|
||||
shared caches, cores and simultaneous multithreading. It also
|
||||
gathers various attributes such as cache and memory
|
||||
information. It primarily aims at helping high-performance
|
||||
computing applications with gathering information about the
|
||||
hardware so as to exploit it accordingly and efficiently.
|
||||
hwloc provides a portable abstraction (across OS,
|
||||
versions, architectures, ...) of the hierarchical topology of
|
||||
modern architectures, including NUMA memory nodes, sockets,
|
||||
shared caches, cores and simultaneous multithreading. It also
|
||||
gathers various attributes such as cache and memory
|
||||
information. It primarily aims at helping high-performance
|
||||
computing applications with gathering information about the
|
||||
hardware so as to exploit it accordingly and efficiently.
|
||||
|
||||
hwloc may display the topology in multiple convenient
|
||||
formats. It also offers a powerful programming interface to
|
||||
gather information about the hardware, bind processes, and much
|
||||
more.
|
||||
hwloc may display the topology in multiple convenient
|
||||
formats. It also offers a powerful programming interface to
|
||||
gather information about the hardware, bind processes, and much
|
||||
more.
|
||||
'';
|
||||
# https://www.open-mpi.org/projects/hwloc/license.php
|
||||
license = licenses.bsd3;
|
||||
license = lib.licenses.bsd3;
|
||||
homepage = "https://www.open-mpi.org/projects/hwloc/";
|
||||
maintainers = with maintainers; [ fpletz markuskowa ];
|
||||
platforms = platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
fpletz
|
||||
markuskowa
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fuse
|
||||
, ncurses
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbde";
|
||||
version = "20221031";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/libyal/libbde/releases/download/${version}/${pname}-alpha-${version}.tar.gz";
|
||||
sha256 = "sha256-uMbwofboePCFWlxEOdRbZK7uZuj0MZC/qusWuu0Bm7g=";
|
||||
};
|
||||
|
||||
buildInputs = [ fuse ncurses python3 ];
|
||||
|
||||
configureFlags = [ "--enable-python" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to access the BitLocker Drive Encryption (BDE) format";
|
||||
homepage = "https://github.com/libyal/libbde/";
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ eliasp ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
Security,
|
||||
apacheHttpd,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustls-ffi";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rustls";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IDIWN5g1aaE6SDdXSm4WYK6n+BpuypPYQITuDj1WJEc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
|
||||
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
make install DESTDIR=${placeholder "out"}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
apacheHttpd = apacheHttpd.override { modTlsSupport = true; };
|
||||
# Currently broken notably because of https://github.com/curl/curl/issues/13248
|
||||
# curl = curl.override { opensslSupport = false; rustlsSupport = true; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "C-to-rustls bindings";
|
||||
homepage = "https://github.com/rustls/rustls-ffi/";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
asl20
|
||||
isc
|
||||
];
|
||||
maintainers = [ maintainers.lesuisse ];
|
||||
};
|
||||
}
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioopenexchangerates";
|
||||
version = "0.6.5";
|
||||
version = "0.6.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "MartinHjelmare";
|
||||
repo = "aioopenexchangerates";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-t8MmezVqXXodgMxaeulUueN3BFrv7TXgfKM/TagR/rE=";
|
||||
hash = "sha256-KFs5r7C7CorjEix2yL+NT/0liz3ivoiL6ZV5lJbBWBc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "pydantic" ];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiostreammagic";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "noahhusby";
|
||||
repo = "aiostreammagic";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-TWGDviQ1SYLlzuIsot7JgB5XIEZES54ERJ3tv7+9DNc=";
|
||||
hash = "sha256-Tb15ro+6K+7jqmer/bXDJUEBonMv1sZSU/0ZtCWOCfc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "websockets" ];
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-hijack";
|
||||
version = "3.6.0";
|
||||
version = "3.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "django-hijack";
|
||||
repo = "django-hijack";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-uece+tR3Nd32nfKn1gtcWqckN4z5iUP+C0dJxyDPXBA=";
|
||||
hash = "sha256-xnRVoCs+TyAbvFSBD58MJhwLw7ecKpMFuWewAgmnzqk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -61,14 +61,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "gftools";
|
||||
version = "0.9.70";
|
||||
version = "0.9.71";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlefonts";
|
||||
repo = "gftools";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mZGkcIODzc2nuhAWU83BkhjWg4+8vnmCA4eXgDsyFy8=";
|
||||
hash = "sha256-YVuTozuONZbBtrst4Q+NmHxqEZa/YPVRMiagjmjcW9U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hishel";
|
||||
version = "0.0.32";
|
||||
version = "0.0.33";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "karpetrosyan";
|
||||
repo = "hishel";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-EbvEu8pb64gj5buahpjR2dS/hjR9tRzhToQ41eRqYpw=";
|
||||
hash = "sha256-zi+13X7u2pk9w2EoYjfl3/Y8O5hHpA0wZx3sSv2vU6U=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -1,38 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
aiohttp,
|
||||
anthropic,
|
||||
buildPythonPackage,
|
||||
docstring-parser,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
poetry-core,
|
||||
|
||||
# dependencies
|
||||
aiohttp,
|
||||
docstring-parser,
|
||||
jiter,
|
||||
openai,
|
||||
poetry-core,
|
||||
pydantic,
|
||||
pytest-examples,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
fastapi,
|
||||
diskcache,
|
||||
redis,
|
||||
pythonOlder,
|
||||
rich,
|
||||
tenacity,
|
||||
typer,
|
||||
|
||||
# tests
|
||||
anthropic,
|
||||
diskcache,
|
||||
fastapi,
|
||||
google-generativeai,
|
||||
jinja2,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
redis,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "instructor";
|
||||
version = "1.3.7";
|
||||
version = "1.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jxnl";
|
||||
repo = "instructor";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-XouTXv8wNPPBKVs2mCue1o4hfHlPlq6uXBuDXiZLIHI=";
|
||||
hash = "sha256-UrLbKDaQu2ioQHqKKS8SdRTpQj+Z0w+bcLrRuZT3DC0=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@@ -57,12 +61,13 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
anthropic
|
||||
fastapi
|
||||
redis
|
||||
diskcache
|
||||
fastapi
|
||||
google-generativeai
|
||||
jinja2
|
||||
pytest-asyncio
|
||||
pytest-examples
|
||||
pytestCheckHook
|
||||
redis
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "instructor" ];
|
||||
@@ -72,6 +77,9 @@ buildPythonPackage rec {
|
||||
"successfully"
|
||||
"test_mode_functions_deprecation_warning"
|
||||
"test_partial"
|
||||
|
||||
# Requires unpackaged `vertexai`
|
||||
"test_json_preserves_description_of_non_english_characters_in_json_mode"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
@@ -80,12 +88,12 @@ buildPythonPackage rec {
|
||||
"tests/llm/"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Structured outputs for llm";
|
||||
homepage = "https://github.com/jxnl/instructor";
|
||||
changelog = "https://github.com/jxnl/instructor/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ mic92 ];
|
||||
mainProgram = "instructor";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meraki";
|
||||
version = "1.50.0";
|
||||
version = "1.51.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tKtfshAsKtXPkkDY13+QWRaWduQCBhor4+ReLjarwLA=";
|
||||
hash = "sha256-3JUUTi+6oe+mDn4n9NtlWXji4j3E6AZODZZ+PEvSSzg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -19,15 +19,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "momepy";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pysal";
|
||||
repo = "momepy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-r2iGzk54MsrkYB3Sp9/B1QGKnvqPGUj3MQhk6yqIoXE=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9GVX+OaBkLb3Q/RRHbGOlAJ3gu2K+V07ez6v9dWU6JU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msgraph-core";
|
||||
version = "1.1.4";
|
||||
version = "1.1.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "microsoftgraph";
|
||||
repo = "msgraph-sdk-python-core";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-r8awjj4yo8BXQ0vZiJW+ky1sTvC04FzcViJY725/P6k=";
|
||||
hash = "sha256-cyqhNpV3gowSDmZhdI3NbbJ1VOwnrJTXZYR/rYNnFVE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "opower";
|
||||
version = "0.8.0";
|
||||
version = "0.8.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "tronikos";
|
||||
repo = "opower";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gDd2Ht8SgUkqD1t5AY/zg/J/YG5Gyje8gbPp+5rP+M0=";
|
||||
hash = "sha256-p1fvfAQVmizfsW+6F3gKkNQTYUF+A0cafh3PZZTpTRw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "proto-plus";
|
||||
version = "1.23.0";
|
||||
version = "1.24.0";
|
||||
format = "setuptools";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-iQdRce8RmIs/oVf129i5zwnWX//ul+Kc5APNje+6GdI=";
|
||||
hash = "sha256-MLcqXsr+RAaw0znbNbVsQFkGTmkie4w72nRiOX+WZEU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ protobuf ];
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyosmium";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7" || isPyPy;
|
||||
@@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
owner = "osmcode";
|
||||
repo = "pyosmium";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HYp1MzXSa0tx0hY0JyMf2bmEvm5YuS2R+o25TsO8J6I=";
|
||||
hash = "sha256-qi4GsjQVe2nIcvQThAlxQu3kUdWhRuJFHVPjKbMBxdM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
callPackage ./generic.nix rec {
|
||||
pname = "shattered-pixel-dungeon";
|
||||
version = "2.5.2";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "00-Evan";
|
||||
repo = "shattered-pixel-dungeon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/CxOiJaBiOgKEKVSX7qx2HjMLUgeE+lRyRn4nrAqzsg=";
|
||||
hash = "sha256-Y23w3Pdq5Lsn4gywHhhfL2o9gVQlw/6mbRrjlHNfJjA=";
|
||||
};
|
||||
|
||||
depsPath = ./deps.json;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, kernel, looking-glass-client }:
|
||||
{ lib, stdenv, fetchpatch, kernel, looking-glass-client }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "kvmfr";
|
||||
@@ -9,6 +9,23 @@ stdenv.mkDerivation {
|
||||
hardeningDisable = [ "pic" "format" ];
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
patches = [
|
||||
# fix build for linux-6_10
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gnif/LookingGlass/commit/7305ce36af211220419eeab302ff28793d515df2.patch";
|
||||
hash = "sha256-97nZsIH+jKCvSIPf1XPf3i8Wbr24almFZzMOhjhLOYk=";
|
||||
stripLen = 1;
|
||||
})
|
||||
|
||||
# securtiy patch for potential buffer overflow
|
||||
# https://github.com/gnif/LookingGlass/issues/1133
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gnif/LookingGlass/commit/3ea37b86e38a87ee35eefb5d8fcc38b8dc8e2903.patch";
|
||||
hash = "sha256-Kk1gN1uB86ZJA374zmzM9dwwfMZExJcix3hee7ifpp0=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"KVER=${kernel.modDirVersion}"
|
||||
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "check_ssl_cert";
|
||||
version = "2.84.1";
|
||||
version = "2.84.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matteocorti";
|
||||
repo = "check_ssl_cert";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ga8GFZidqoWHaibHgOxSyRtGEMbrQv+4+V3RMNobhbs=";
|
||||
hash = "sha256-HVif2pjVumrf2YFSHbNiL9pfXy8XNeXHRgaIlx/Tzds=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "acme.sh";
|
||||
version = "3.0.8";
|
||||
version = "3.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acmesh-official";
|
||||
repo = "acme.sh";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-RFybUjBRrpnNCEVKmix2EPiIXrq8p+v4zJaI14NFQQ0=";
|
||||
hash = "sha256-GJNaY5Dxis/x5bCvOPnIvJ4VrJkjjaaOFq68JYXxDf0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,19 +11,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.55.2";
|
||||
version = "0.56.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = "trivy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DwIklbBd2g/zVPwRqcl+GFfTUm3LHs/x37X5T+tX4aI=";
|
||||
hash = "sha256-gVRmSWcWTO1HZ6K2N1sSZchSq2xMc60W+ImHU0xEnA0=";
|
||||
};
|
||||
|
||||
# Hash mismatch on across Linux and Darwin
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-h/hVzejcPvtGActgeVrmOmb2gn2mUdnzOvAWUrV5CvI=";
|
||||
vendorHash = "sha256-+WkOGy/Z4BuDlwpfisWqhjJlshPXTxjRy2pmmHxU6B8=";
|
||||
|
||||
subPackages = [ "cmd/trivy" ];
|
||||
|
||||
|
||||
@@ -31,16 +31,16 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "netbird";
|
||||
version = "0.29.4";
|
||||
version = "0.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "netbird";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-W71CE83r/RcPdBjzfT+FSh72UcKcTmIuagkrC1eaeNk=";
|
||||
hash = "sha256-YtKGiF45fNoiYQFTE3NReUaosRGDJOyjfqtc+tBKopI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CD34U+Z8bUKN0Z4nxIVC+mYDp71Q8q1bmUypRDGgb3U=";
|
||||
vendorHash = "sha256-t6kqEmL2lKKYlqxaQ1OsAvB3BSmmyfogghGoE9jw+AI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
|
||||
|
||||
|
||||
@@ -1,22 +1,23 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, pytestCheckHook
|
||||
, dnspython
|
||||
, fqdn
|
||||
, idna
|
||||
, natsort
|
||||
, python-dateutil
|
||||
, pyyaml
|
||||
, python
|
||||
, runCommand
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
dnspython,
|
||||
fetchFromGitHub,
|
||||
fqdn,
|
||||
idna,
|
||||
natsort,
|
||||
pytestCheckHook,
|
||||
python-dateutil,
|
||||
python3,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
runCommand,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "octodns";
|
||||
version = "1.4.0";
|
||||
version = "1.9.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -24,15 +25,15 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "octodns";
|
||||
repo = "octodns";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-l4JGodbUmFxHFeEaxgClEozHcbyYP0F2yj5gDqV88IA=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5EKa5G1rX/BRMMpGd861qTaACa2tBgNrKX52uJPV+N8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
dnspython
|
||||
fqdn
|
||||
idna
|
||||
@@ -47,18 +48,21 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "octodns" ];
|
||||
|
||||
passthru.withProviders = ps: let
|
||||
pyEnv = python.withPackages ps;
|
||||
in runCommand "octodns-with-providers" { } ''
|
||||
mkdir -p $out/bin
|
||||
ln -st $out/bin ${pyEnv}/bin/octodns-*
|
||||
'';
|
||||
passthru.withProviders =
|
||||
ps:
|
||||
let
|
||||
pyEnv = python3.withPackages ps;
|
||||
in
|
||||
runCommand "octodns-with-providers" { } ''
|
||||
mkdir -p $out/bin
|
||||
ln -st $out/bin ${pyEnv}/bin/octodns-*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools for managing DNS across multiple providers";
|
||||
homepage = "https://github.com/octodns/octodns";
|
||||
changelog = "https://github.com/octodns/octodns/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = [ maintainers.anthonyroussel ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "octodns-powerdns";
|
||||
version = "0.0.5";
|
||||
version = "0.0.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -19,15 +19,15 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "octodns";
|
||||
repo = "octodns-powerdns";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jt0+JnpCgvsoqMcC9mANX7uq2WPTiI2JQjwQi7LGWj0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wa/SHyTfj+iHnTq8t+3yzyGn+YULOdI88Aii16qPwPM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
octodns
|
||||
requests
|
||||
];
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
buildGhidraExtension,
|
||||
}:
|
||||
let
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
in
|
||||
buildGhidraExtension {
|
||||
pname = "findcrypt";
|
||||
@@ -14,7 +14,7 @@ buildGhidraExtension {
|
||||
owner = "antoniovazquezblanco";
|
||||
repo = "GhidraFindcrypt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/KA95NdoQFvR6XSGCHkX+ySKfftK84hJ8zjAvt0+O0o=";
|
||||
hash = "sha256-SNmhn/X+POp6dRaB9etZ8GvpKf/5+mPg3E0HUQTthIY=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "osv-scanner";
|
||||
version = "1.8.5";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "osv-scanner";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bwCY1LK2Ig/VcJJHu88cyrZ5ImOOEUYdGMBkZTmpG+g=";
|
||||
hash = "sha256-hK8hvD59X+JzeBtYqwlfNBy2XX7slzMKoIHxL8DmRGc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uZ0FDQaYaCMYu92e5i2YqS31NP1whaiDE8s+0KLh7k4=";
|
||||
vendorHash = "sha256-IVtdZCwjGrGr0DuyPCkt5DJQhD8mN7bEFI41e0a3s8s=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/osv-scanner"
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
{ stdenv, lib, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests
|
||||
, makeWrapper
|
||||
, gawk
|
||||
, glibc
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vault";
|
||||
version = "1.17.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "vault";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OMA4c+Ot5xioRdI4z7zY4Eux8KxxIZ4opnT/xSc5oUk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MJPKICuaxyUA8DQsdeToJK7HQk1VINNjv7JGjb1mrCs=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
tags = [ "vault" ];
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X github.com/hashicorp/vault/sdk/version.GitCommit=${src.rev}"
|
||||
"-X github.com/hashicorp/vault/sdk/version.Version=${version}"
|
||||
"-X github.com/hashicorp/vault/sdk/version.VersionPrerelease="
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
echo "complete -C $out/bin/vault vault" > vault.bash
|
||||
installShellCompletion vault.bash
|
||||
'' + lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
wrapProgram $out/bin/vault \
|
||||
--prefix PATH ${lib.makeBinPath [ gawk glibc ]}
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) vault vault-postgresql vault-dev vault-agent; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.vaultproject.io/";
|
||||
description = "Tool for managing secrets";
|
||||
changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.bsl11;
|
||||
mainProgram = "vault";
|
||||
maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri Chili-Man techknowlogick ];
|
||||
};
|
||||
}
|
||||
@@ -534,6 +534,10 @@ with pkgs;
|
||||
|
||||
dcgm = callPackage ../os-specific/linux/dcgm { };
|
||||
|
||||
deck = callPackage ../by-name/de/deck/package.nix {
|
||||
buildGoModule = buildGo123Module;
|
||||
};
|
||||
|
||||
dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { };
|
||||
|
||||
dhallPackageToNix = callPackage ../build-support/dhall/package-to-nix.nix { };
|
||||
@@ -4194,8 +4198,6 @@ with pkgs;
|
||||
|
||||
buildtorrent = callPackage ../tools/misc/buildtorrent { };
|
||||
|
||||
bundletool = callPackage ../development/tools/bundletool { };
|
||||
|
||||
bwm_ng = callPackage ../tools/networking/bwm-ng { };
|
||||
|
||||
bwbasic = callPackage ../development/interpreters/bwbasic { };
|
||||
@@ -5166,8 +5168,6 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
gpu-viewer = callPackage ../applications/misc/gpu-viewer { };
|
||||
|
||||
greg = callPackage ../applications/audio/greg {
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
@@ -20678,8 +20678,6 @@ with pkgs;
|
||||
libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx;
|
||||
libbassmix = (callPackage ../development/libraries/audio/libbass { }).bassmix;
|
||||
|
||||
libbde = callPackage ../development/libraries/libbde { };
|
||||
|
||||
libbdplus = callPackage ../development/libraries/libbdplus { };
|
||||
|
||||
libblockdev = callPackage ../development/libraries/libblockdev { };
|
||||
@@ -38252,14 +38250,10 @@ with pkgs;
|
||||
|
||||
valent = callPackage ../applications/misc/valent { };
|
||||
|
||||
vault = callPackage ../tools/security/vault { };
|
||||
|
||||
vault-medusa = callPackage ../tools/security/vault-medusa { };
|
||||
|
||||
vault-ssh-plus = callPackage ../tools/security/vault-ssh-plus { };
|
||||
|
||||
vault-bin = callPackage ../tools/security/vault/vault-bin.nix { };
|
||||
|
||||
vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv;
|
||||
|
||||
vazir-code-font = callPackage ../data/fonts/vazir-code-font { };
|
||||
|
||||
Reference in New Issue
Block a user