Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
6a27b0be74
102 changed files with 1377 additions and 863 deletions
2
.github/workflows/periodic-merge-24h.yml
vendored
2
.github/workflows/periodic-merge-24h.yml
vendored
|
|
@ -56,7 +56,7 @@ jobs:
|
|||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Comment on failure
|
||||
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.1.0
|
||||
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
|
||||
if: ${{ failure() }}
|
||||
with:
|
||||
issue-number: 105153
|
||||
|
|
|
|||
2
.github/workflows/periodic-merge-6h.yml
vendored
2
.github/workflows/periodic-merge-6h.yml
vendored
|
|
@ -50,7 +50,7 @@ jobs:
|
|||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Comment on failure
|
||||
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.1.0
|
||||
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
|
||||
if: ${{ failure() }}
|
||||
with:
|
||||
issue-number: 105153
|
||||
|
|
|
|||
|
|
@ -3259,6 +3259,9 @@
|
|||
github = "LostAttractor";
|
||||
githubId = 46527539;
|
||||
name = "ChaosAttractor";
|
||||
keys = [{
|
||||
fingerprint = "A137 4415 DB7C 6439 10EA 5BF1 0FEE 4E47 5940 E125";
|
||||
}];
|
||||
};
|
||||
charlesbaynham = {
|
||||
email = "charlesbaynham@gmail.com";
|
||||
|
|
@ -5495,6 +5498,12 @@
|
|||
githubId = 428026;
|
||||
name = "embr";
|
||||
};
|
||||
emilioziniades = {
|
||||
email = "emilioziniades@protonmail.com";
|
||||
github = "emilioziniades";
|
||||
githubId = 75438244;
|
||||
name = "Emilio Ziniades";
|
||||
};
|
||||
emily = {
|
||||
email = "nixpkgs@emily.moe";
|
||||
github = "emilazy";
|
||||
|
|
@ -10169,6 +10178,13 @@
|
|||
githubId = 22116767;
|
||||
name = "Kritnich";
|
||||
};
|
||||
krloer = {
|
||||
email = "kriloneri@gmail.com";
|
||||
github = "krloer";
|
||||
githubId = 45591621;
|
||||
name = "Kristoffer Longva Eriksen";
|
||||
matrix = "@krisleri:pvv.ntnu.no";
|
||||
};
|
||||
kroell = {
|
||||
email = "nixosmainter@makroell.de";
|
||||
github = "rokk4";
|
||||
|
|
@ -16796,12 +16812,6 @@
|
|||
fingerprint = "E173 237A C782 296D 98F5 ADAC E13D FD4B 4712 7951";
|
||||
}];
|
||||
};
|
||||
scubed2 = {
|
||||
email = "scubed2@gmail.com";
|
||||
github = "scubed2";
|
||||
githubId = 7401858;
|
||||
name = "Sterling Stein";
|
||||
};
|
||||
sdier = {
|
||||
email = "scott@dier.name";
|
||||
matrix = "@sdier:matrix.org";
|
||||
|
|
|
|||
|
|
@ -118,9 +118,7 @@ in {
|
|||
(budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })
|
||||
budgie.budgie-desktop-view
|
||||
budgie.budgie-screensaver
|
||||
|
||||
# Required by the Budgie Desktop session.
|
||||
(gnome.gnome-session.override { gnomeShellSupport = false; })
|
||||
budgie.budgie-session
|
||||
|
||||
# Required by Budgie Menu.
|
||||
gnome-menus
|
||||
|
|
|
|||
|
|
@ -33,14 +33,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
''
|
||||
with subtest("Wait for login"):
|
||||
# wait_for_x() checks graphical-session.target, which is expected to be
|
||||
# inactive on Budgie before #228946 (i.e. systemd managed gnome-session) is
|
||||
# done on upstream.
|
||||
# https://github.com/BuddiesOfBudgie/budgie-desktop/blob/v10.7.2/src/session/budgie-desktop.in#L16
|
||||
# inactive on Budgie before Budgie manages user session with systemd.
|
||||
# https://github.com/BuddiesOfBudgie/budgie-desktop/blob/39e9f0895c978f76/src/session/budgie-desktop.in#L16
|
||||
#
|
||||
# Previously this was unconditionally touched by xsessionWrapper but was
|
||||
# changed in #233981 (we have Budgie:GNOME in XDG_CURRENT_DESKTOP).
|
||||
# machine.wait_for_x()
|
||||
machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')
|
||||
machine.wait_until_succeeds('journalctl -t budgie-session-binary --grep "Entering running state"')
|
||||
machine.wait_for_file("${user.home}/.Xauthority")
|
||||
machine.succeed("xauth merge ${user.home}/.Xauthority")
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
|||
|
||||
testScript = ''
|
||||
start_all()
|
||||
node.wait_for_unit("netbird.service")
|
||||
node.wait_for_unit("netbird-wt0.service")
|
||||
node.wait_for_file("/var/run/netbird/sock")
|
||||
node.succeed("netbird status | grep -q 'Daemon status: NeedsLogin'")
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -26,16 +26,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
|
||||
pname = "neovide";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovide";
|
||||
repo = "neovide";
|
||||
rev = version;
|
||||
sha256 = "sha256-lmhTTBlhyEepUNHrm2hq42G1kA7siAsJUcYjBfajaHA=";
|
||||
sha256 = "sha256-M19LKNjUmC0WkVGm4t7vjxgMMe0FdMTmB1mLcG33OUg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-1R1JrNhcgC16anr5Gl1b9rHgfRLPJElef5D65joHxj0=";
|
||||
cargoHash = "sha256-2fPprZVT7V+Ot8aCpWj6WTdyFylmzlujFdTJCrtE0rk=";
|
||||
|
||||
SKIA_SOURCE_DIR =
|
||||
let
|
||||
|
|
|
|||
|
|
@ -952,8 +952,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-markdownlint";
|
||||
publisher = "DavidAnson";
|
||||
version = "0.53.0";
|
||||
sha256 = "sha256-ApCX636M51zN9obFqrUHmaJB3YoFmJPQfjKEWf9bosk=";
|
||||
version = "0.54.0";
|
||||
sha256 = "sha256-BrPFFRspJIz1U08hPbLziCmRUeZv2NhRrTCx6qvhOJw=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog";
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "http://www.fceux.com/";
|
||||
description = "A Nintendo Entertainment System (NES) Emulator";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ sbruder scubed2 ];
|
||||
maintainers = with maintainers; [ sbruder ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -36,20 +36,20 @@ let
|
|||
pcsx2_patches = fetchFromGitHub {
|
||||
owner = "PCSX2";
|
||||
repo = "pcsx2_patches";
|
||||
rev = "619e75bb8db50325b44863f2ccf3c39470c3d5a3";
|
||||
sha256 = "sha256-2KE0W3WwBJCLe8DosyDVsFtEofKgBsChpQEQe+3O+Hg=";
|
||||
rev = "189f79d73f8cd9fd85c7394a14ee4419ddfa267b";
|
||||
sha256 = "sha256-gxwAxR7N7QU4sTGHTdd656dmsW8MrcfroYPvv2UoeRc=";
|
||||
};
|
||||
in
|
||||
llvmPackages_17.stdenv.mkDerivation rec {
|
||||
pname = "pcsx2";
|
||||
version = "1.7.5474";
|
||||
version = "1.7.5497";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PCSX2";
|
||||
repo = "pcsx2";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5ZCXw6PEQ6Ed6kEP27m9O0U79uVGEFR/vwee6/dZBD8=";
|
||||
sha256 = "sha256-gbJkeelSyEHwD4DH/hbzPNNv47hmdgc4kyvX38txYhc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "komikku";
|
||||
version = "1.35.0";
|
||||
version = "1.36.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
|
|
@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oyXeh+/9tzykt2fhsKNrk1iaO8556LyCHGVxAxRojLw=";
|
||||
hash = "sha256-sX/4Sez6gKSgaUJC7iW2BeVp0y9h64YqQi7FL5fzZ4o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bemenu";
|
||||
version = "0.6.16";
|
||||
version = "0.6.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cloudef";
|
||||
repo = finalAttrs.pname;
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-K9a9BUodpKwvEOhnF2/TGo5zLm7F9RzqSCcWzuhKcWA=";
|
||||
sha256 = "sha256-HfA8VtYP8YHMQNXrg3E6IwX7rR3rp/gyE62InsddjZE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nwg-bar";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-e64qCthZfGeFIe/g4Bu342d/C46qzJRBdxzzP6rM408=";
|
||||
sha256 = "sha256-5N+WKZ+fuHQ0lVLd95/KkNAwzg/C4ImZ4DnSuKNGunk=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-paths.patch ];
|
||||
|
|
@ -24,7 +24,7 @@ buildGoModule rec {
|
|||
substituteInPlace tools.go --subst-var out
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-YMpq9pgA3KjQMcw7JDwEDbHZ5h3N7ziFVIGvQ+xA3Ds=";
|
||||
vendorHash = "sha256-/kqhZcIuoN/XA0i1ua3lzVGn4ghkekFYScL1o3kgBX4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "process-compose";
|
||||
version = "0.80.0";
|
||||
version = "0.81.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "F1bonacc1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9a850AKcHpKaZJ5C7l8y2dz6zHWyoZ7dIdEqtmXN3ww=";
|
||||
hash = "sha256-HGrqW56gU5IiX5vyMmJyr63LlJaalCY1kWZi7ahrr0o=";
|
||||
# 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;
|
||||
|
|
@ -43,7 +43,7 @@ buildGoModule rec {
|
|||
installShellFiles
|
||||
];
|
||||
|
||||
vendorHash = "sha256-NYb5FLMXRoOTEH7nD3+1LUGD7wY0N8FTTUZ85uxTPrk=";
|
||||
vendorHash = "sha256-vcx8wHqJzL+huCPdzN5h3dLs3PE7NaFWJEFJX22EZV4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@ stdenv.mkDerivation rec {
|
|||
sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c
|
||||
'';
|
||||
|
||||
# Fails the build on clang-16 and on upcoming gcc-14.
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int";
|
||||
|
||||
# Needs the path to `tclConfig.sh' and `tkConfig.sh'.
|
||||
configureFlags = [
|
||||
"--with-tcl=${tcl}/lib"
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubedog";
|
||||
version = "0.12.2";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "kubedog";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-B6ITVr+Zk1+uMU9RAupvUIBwj8SICp7UyXi0RfIFiME=";
|
||||
hash = "sha256-dk6ieIUoS1N2UtiLig5dFq0476xh69bjueN05ZKjcLg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lLyIVA7Mkj1bfA/u8VMTwmKmhNfibYpT+dgIWFdOiPs=";
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "terraform-compliance";
|
||||
version = "1.3.46";
|
||||
version = "1.3.47";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-compliance";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-30aQA+VJY2qarpYGZpgt5ebYFt5UHUHJcuBNgKiGnt0=";
|
||||
sha256 = "sha256-QJDKBM5CTOdF7oT42vL+Yp1UsQXWvkSZzo+WSsDxAZw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "discordo";
|
||||
version = "unstable-2023-12-12";
|
||||
version = "unstable-2024-01-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayn2op";
|
||||
repo = pname;
|
||||
rev = "320ec7753d552974d4d5ede3fcf6fb3c0d52b6e4";
|
||||
hash = "sha256-LVWOXw8+GbCE6N6kVSXDjjNqOcq7PS4KU7LXoowhBdQ=";
|
||||
rev = "301b7c7a792b427595803679e37fe99007de9451";
|
||||
hash = "sha256-ufAlwlH++g9L3aaA5soJ6r2oiJZi8Ny/6P530oV+BiY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8qr1erKGyJvR4LDKHkZf7nR0tQOcvUHQyJt7OlqNS44=";
|
||||
vendorHash = "sha256-fy3FI1K57hLAgbw3WfmVNZT9ywCSXwRKSq+ATjG+Qpo=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, makeWrapper
|
||||
, makeBinaryWrapper
|
||||
, wrapGAppsHook
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook ];
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeBinaryWrapper wrapGAppsHook ];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
|
|
@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
|
|||
chmod -R g-w "$out"
|
||||
|
||||
# Wrap the startup command
|
||||
makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \
|
||||
makeBinaryWrapper $out/opt/ArmCord/armcord $out/bin/armcord \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WebRTCPipeWireCapturer }}" \
|
||||
|
|
|
|||
|
|
@ -1,60 +1,106 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, appimageTools
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, libpng
|
||||
, libX11
|
||||
, libXi
|
||||
, libXtst
|
||||
, zlib
|
||||
, electron
|
||||
, xorg
|
||||
, pipewire
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
buildNpmPackage rec {
|
||||
pname = "jitsi-meet-electron";
|
||||
version = "2022.10.1";
|
||||
version = "2023.11.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
|
||||
sha256 = "sha256-98zuAsGT30paxszSO1XcMY8tsrMBeBLDFjK/JWhLC8s=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jitsi";
|
||||
repo = "jitsi-meet-electron";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gE5CP0l3SrAHGNS6Hr5/MefTtE86JTmc85CwOmylEpg=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
name = "${pname}-${version}";
|
||||
inherit src;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
# robotjs node-gyp dependencies
|
||||
buildInputs = [
|
||||
libpng
|
||||
libX11
|
||||
libXi
|
||||
libXtst
|
||||
zlib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
npmDepsHash = "sha256-JZVJcKzG4X7YIUvIRWZsDQnHx+dNqCj6kFm8mZaSH2k=";
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace main.js \
|
||||
--replace "require('electron-is-dev')" "false"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
# remove some prebuilt binaries
|
||||
find node_modules -type d -name prebuilds -exec rm -r {} +
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
# generate .asar file
|
||||
# asarUnpack makes sure to unwrap binaries so that nix can see the RPATH
|
||||
npm exec electron-builder -- \
|
||||
--dir \
|
||||
-c.asarUnpack="**/*.node" \
|
||||
-c.electronDist=${electron}/libexec/electron \
|
||||
-c.electronVersion=${electron.version}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/${pname} $out/share/applications
|
||||
mkdir -p $out/share/jitsi-meet-electron
|
||||
cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/jitsi-meet-electron
|
||||
|
||||
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
|
||||
cp -a ${appimageContents}/jitsi-meet.desktop $out/share/applications/${pname}.desktop
|
||||
cp -a ${appimageContents}/usr/share/icons $out/share
|
||||
makeWrapper ${lib.getExe electron} $out/bin/jitsi-meet-electron \
|
||||
--add-flags $out/share/jitsi-meet-electron/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pipewire ]} \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--inherit-argv0
|
||||
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
install -Dm644 resources/icons/512x512.png $out/share/icons/hicolor/512x512/apps/jitsi-meet-electron.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXtst pipewire ]}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
'';
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "jitsi-meet-electron";
|
||||
exec = "jitsi-meet-electron %U";
|
||||
icon = "jitsi-meet-electron";
|
||||
desktopName = "Jitsi Meet";
|
||||
comment = meta.description;
|
||||
categories = [ "VideoConference" "AudioVideo" "Audio" "Video" "Network" ];
|
||||
mimeTypes = [ "x-scheme-handler/jitsi-meet" ];
|
||||
terminal = false;
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/jitsi/jitsi-meet-electron/releases/tag/${src.rev}";
|
||||
description = "Jitsi Meet desktop application powered by Electron";
|
||||
homepage = "https://github.com/jitsi/jitsi-meet-electron";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.jitsi.members;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "jitsi-meet-electron";
|
||||
maintainers = teams.jitsi.members ++ [ maintainers.tomasajt ];
|
||||
inherit (electron.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "teams-for-linux";
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Gp+Euuuo51syHmQzzQALxZjejYLoJtGJbo4Gl40UASs=";
|
||||
hash = "sha256-aaUWc0G7KY3PwlIysoL++l7na2M5sxQFW2YsO0AIRY8=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.4.0";
|
||||
version = "2.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "paperless-ngx";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bIiUG5yLpKOoxByef2Wm7MmSoL5zAYE9x6/zZywG9aE=";
|
||||
hash = "sha256-uFaywZF1e1ELU6EcRxzMqGu3uiFK8MMfrTxb01Drd7k=";
|
||||
};
|
||||
|
||||
python = python3;
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.67.1";
|
||||
version = "0.67.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
hash = "sha256-Bx1Q7eXJuu/Vh6UuZYlkUlvw6FXTObYAynHV+60cNVY=";
|
||||
hash = "sha256-YmbnV5/wwaDiuDUTx00sIdbVgtqD8vtvpTNFxXutP3U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
, extraPkgs ? [ ]
|
||||
}:
|
||||
let
|
||||
version = "8.1.18";
|
||||
version = "8.3.1";
|
||||
|
||||
cbangSrc = fetchFromGitHub {
|
||||
owner = "cauldrondevelopmentllc";
|
||||
repo = "cbang";
|
||||
rev = "bastet-v${version}";
|
||||
hash = "sha256-G0rknVmZiyC4sRTOowFjf7EQ5peGf+HLPPcLWXXFlX4=";
|
||||
hash = "sha256-cuyfJG5aDJ6e2SllxwKTViG0j8FWHvjcTaaBBtkgEdU=";
|
||||
};
|
||||
|
||||
fah-client = stdenv.mkDerivation {
|
||||
|
|
@ -25,7 +25,7 @@ let
|
|||
owner = "FoldingAtHome";
|
||||
repo = "fah-client-bastet";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IgT/5NqCwN8N8OObjtASuT4IRb2EN4bdixxUdjiyddI=";
|
||||
hash = "sha256-Ztc2im4Xmk8f6GotGRgA5zDkcyQFnodUvroJVl+ApT4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ scons ];
|
||||
|
|
@ -45,14 +45,15 @@ let
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,share/applications,share/feh-client}
|
||||
mkdir -p $out/{bin,share/applications}
|
||||
|
||||
cp fah-client $out/bin/fah-client
|
||||
|
||||
cp install/lin/fah-client.desktop $out/share/applications/
|
||||
cp -r images $out/share/feh-client/
|
||||
|
||||
sed -e "s|Icon=.*|Icon=$out/share/feh-client/images/fahlogo.png|g" -i $out/share/applications/fah-client.desktop
|
||||
cp install/lin/fah-client.desktop.in $out/share/applications/fah-client.desktop
|
||||
sed \
|
||||
-e "s|Icon=.*|Icon=$out/share/feh-client/images/fahlogo.png|g" \
|
||||
-e "s|%(PACKAGE_URL)s|https://github.com/FoldingAtHome/fah-client-bastet|g" \
|
||||
-i $out/share/applications/fah-client.desktop
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "5.12.184";
|
||||
version = "5.12.186";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "git-mit";
|
||||
|
|
@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
|
|||
owner = "PurpleBooth";
|
||||
repo = "git-mit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KFfRfLOl6So9AnmrLiiG3sUG2OHQegb8Nx/ndcO1IjE=";
|
||||
hash = "sha256-895QAtKUzqiWffw5IgovXBiARncelrmz1FUEbeHYoW0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-17Ojhu7xPZYdFeV/rCa/K9HLHD/vsm0FU6Ag9EPngcQ=";
|
||||
cargoHash = "sha256-E3xwZ9oB7oe5gVLAasvo1MWPjDPLKZgSX98VZAq2O3k=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
|
|||
cmake
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
rm -rf "$out/share"
|
||||
mkdir -p "$out/share/obs"
|
||||
mv "$out/data/obs-plugins" "$out/share/obs"
|
||||
rm -rf "$out/obs-plugins" "$out/data"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A comprehensive blur plugin for OBS that provides several different blur algorithms, and proper compositing";
|
||||
homepage = "https://github.com/FiniteSingularity/obs-composite-blur";
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.29.0";
|
||||
version = "1.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Vy/sW8Y9SFSBaoectehF7ROxuypD7k7tAkcfrEK+pmI=";
|
||||
sha256 = "sha256-RL4JkEJMVduG06udIVlVdr+bj9wIGbun3rpeTCUehhk=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -39,13 +39,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crun";
|
||||
version = "1.13";
|
||||
version = "1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-doGZ1rHHXDRClrTEXYJcU6AqlBTanpNpV6EIbxQgcXY=";
|
||||
hash = "sha256-ElmdYJ4X5C+2BKWgUoL7bg/whvAg2CFBDFAGnJXscB4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -321,7 +321,7 @@ stdenv.mkDerivation {
|
|||
hardening_unsupported_flags+=" pic"
|
||||
''
|
||||
|
||||
+ optionalString targetPlatform.isAvr ''
|
||||
+ optionalString (targetPlatform.isAvr || targetPlatform.isWindows) ''
|
||||
hardening_unsupported_flags+=" relro bindnow"
|
||||
''
|
||||
|
||||
|
|
|
|||
|
|
@ -7,12 +7,17 @@
|
|||
, completeBuildDeps
|
||||
, completeDeps
|
||||
, crateAuthors
|
||||
, crateLinks
|
||||
, crateDescription
|
||||
, crateHomepage
|
||||
, crateFeatures
|
||||
, crateHomepage
|
||||
, crateLicense
|
||||
, crateLicenseFile
|
||||
, crateLinks
|
||||
, crateName
|
||||
, crateReadme
|
||||
, crateRenames
|
||||
, crateRepository
|
||||
, crateRustVersion
|
||||
, crateVersion
|
||||
, extraLinkFlags
|
||||
, extraRustcOptsForBuildRs
|
||||
|
|
@ -120,6 +125,8 @@ in ''
|
|||
|
||||
EXTRA_BUILD=""
|
||||
BUILD_OUT_DIR=""
|
||||
|
||||
# Set up Cargo Environment variables: https://doc.rust-lang.org/cargo/reference/environment-variables.html
|
||||
export CARGO_PKG_NAME=${crateName}
|
||||
export CARGO_PKG_VERSION=${crateVersion}
|
||||
export CARGO_PKG_AUTHORS="${authors}"
|
||||
|
|
@ -147,6 +154,11 @@ in ''
|
|||
export CARGO_PKG_VERSION_PATCH=${lib.elemAt version 2}
|
||||
export CARGO_PKG_VERSION_PRE="${versionPre}"
|
||||
export CARGO_PKG_HOMEPAGE="${crateHomepage}"
|
||||
export CARGO_PKG_LICENSE="${crateLicense}"
|
||||
export CARGO_PKG_LICENSE_FILE="${crateLicenseFile}"
|
||||
export CARGO_PKG_README="${crateReadme}"
|
||||
export CARGO_PKG_REPOSITORY="${crateRepository}"
|
||||
export CARGO_PKG_RUST_VERSION="${crateRustVersion}"
|
||||
export NUM_JOBS=$NIX_BUILD_CORES
|
||||
export RUSTC="rustc"
|
||||
export RUSTDOC="rustdoc"
|
||||
|
|
|
|||
|
|
@ -314,11 +314,16 @@ crate_: lib.makeOverridable
|
|||
# Either set to a concrete sub path to the crate root
|
||||
# or use `null` for auto-detect.
|
||||
workspace_member = crate.workspace_member or ".";
|
||||
crateVersion = crate.version;
|
||||
crateDescription = crate.description or "";
|
||||
crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [ ];
|
||||
crateDescription = crate.description or "";
|
||||
crateHomepage = crate.homepage or "";
|
||||
crateLicense = crate.license or "";
|
||||
crateLicenseFile = crate.license-file or "";
|
||||
crateLinks = crate.links or "";
|
||||
crateReadme = crate.readme or "";
|
||||
crateRepository = crate.repository or "";
|
||||
crateRustVersion = crate.rust-version or "";
|
||||
crateVersion = crate.version;
|
||||
crateType =
|
||||
if lib.attrByPath [ "procMacro" ] false crate then [ "proc-macro" ] else
|
||||
if lib.attrByPath [ "plugin" ] false crate then [ "dylib" ] else
|
||||
|
|
@ -341,6 +346,7 @@ crate_: lib.makeOverridable
|
|||
inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription
|
||||
crateFeatures crateRenames libName build workspace_member release libPath crateVersion crateLinks
|
||||
extraLinkFlags extraRustcOptsForBuildRs
|
||||
crateLicense crateLicenseFile crateReadme crateRepository crateRustVersion
|
||||
crateAuthors crateHomepage verbose colors codegenUnits;
|
||||
};
|
||||
buildPhase = buildCrate {
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ runCommand testName {
|
|||
}
|
||||
package.meta;
|
||||
} ''
|
||||
touch "$out"
|
||||
for moduleName in $moduleNames; do
|
||||
echo "checking pkg-config module $moduleName in $buildInputs"
|
||||
set +e
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bitmagnet";
|
||||
version = "0.4.1";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitmagnet-io";
|
||||
repo = "bitmagnet";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Geukd4JYwmdG7M+HDCCqpiUjor1TWsqBY42ACd+LasU=";
|
||||
hash = "sha256-tqxmPr7O3WkFgo8tYk4iFr/k76Z5kq75YF+6uDuBOik=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TbfbrvXbO+eOb1Ot/gWRBjggTj9jkSGulHIJdziqsVc=";
|
||||
vendorHash = "sha256-YfsSz72CeHdrh5610Ilo1NYxlCT993hxWRWh0OsvEQc=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
43
pkgs/by-name/bu/bullshit/package.nix
Normal file
43
pkgs/by-name/bu/bullshit/package.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, gawk
|
||||
, nix-update-script
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "bullshit";
|
||||
version = "0-unstable-2018-05-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fceschmidt";
|
||||
repo = "bullshit-arch";
|
||||
rev = "d65e4bbbea76bb752842c2c464154a7b417783fa";
|
||||
hash = "sha256-sqtQDaWtfhn9XYRsF8lVLHYb+7o9Hf7rLKsX6dw3Sh4=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm555 src/bullshit -t $out/bin
|
||||
install -Dm444 src/bullshit_lib $out/share/wordlists/bullshit.txt
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
fixupPhase = ''
|
||||
runHook preFixup
|
||||
patchShebangs $out/bin/bullshit
|
||||
substituteInPlace $out/bin/bullshit \
|
||||
--replace /usr/lib/bullshit $out/share/wordlists/bullshit.txt \
|
||||
--replace awk '${gawk}/bin/awk'
|
||||
runHook postFixup
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A nonsense phrase generator";
|
||||
homepage = "https://github.com/fceschmidt/bullshit-arch";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ krloer ];
|
||||
inherit (gawk.meta) platforms;
|
||||
};
|
||||
}
|
||||
58
pkgs/by-name/co/cook-cli/package.nix
Normal file
58
pkgs/by-name/co/cook-cli/package.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, buildNpmPackage
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, openssl
|
||||
, darwin
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cook-cli";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cooklang";
|
||||
repo = "cookcli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3gLVsk6GCxOG24Md7E9fk28Vnc4kVDdwyZUD/GtSwFE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6lnURuE1cgNAniHl5ozXo1W3cLYYje7er+ZhvZDKdVg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config openssl ];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
|
||||
|
||||
postPatch = ''
|
||||
rm -rf "ui/public"
|
||||
ln -s ${passthru.ui} "ui/public"
|
||||
'';
|
||||
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
passthru.ui = buildNpmPackage {
|
||||
name = "ui";
|
||||
src = "${src}/ui";
|
||||
npmDepsHash = "sha256-uMyOAYLVHhY4ytvEFvVzdoQ7ExzQ4sH+ZtDrEacu5bk=";
|
||||
makeCacheWritable = true;
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mv public/ $out
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/cooklang/cookcli/releases/tag/v${version}";
|
||||
description = "A suite of tools to create shopping lists and maintain recipes";
|
||||
homepage = "https://cooklang.org/";
|
||||
license = [ licenses.mit ];
|
||||
mainProgram = "cook";
|
||||
maintainers = [ maintainers.emilioziniades ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
60
pkgs/by-name/gt/gtimelog/package.nix
Normal file
60
pkgs/by-name/gt/gtimelog/package.nix
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
{ lib, fetchFromGitHub, python3Packages, wrapGAppsHook
|
||||
, glibcLocales, gobject-introspection, gtk3, libsoup_3, libsecret
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gtimelog";
|
||||
version = "unstable-2023-10-05";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "ba606cbe8eef0e3dc098c6ab3bcbe381bf7ef410";
|
||||
hash = "sha256-+iBHfbUJtAtI/vcHj0Y8f9OxAp1SnhQyMqedVzSYPZQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
|
||||
buildInputs = [ glibcLocales gtk3 libsoup_3 libsecret ];
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pygobject3
|
||||
];
|
||||
checkInputs = with python3Packages; [
|
||||
freezegun
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
patchShebangs ./runtests
|
||||
./runtests
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "gtimelog" ];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
# Arguments to be passed to `makeWrapper`, only used by buildPython*
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 gtimelog.desktop $out/share/applications/gtimelog.desktop
|
||||
install -Dm644 src/gtimelog/gtimelog.png $out/share/icons/hicolor/48x48/apps/gtimelog.png
|
||||
install -Dm644 src/gtimelog/gtimelog-large.png $out/share/icons/hicolor/256x256/apps/gtimelog.png
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A time tracking app";
|
||||
longDescription = ''
|
||||
GTimeLog is a small time tracking application for GNOME.
|
||||
It's main goal is to be as unintrusive as possible.
|
||||
|
||||
To run gtimelog successfully on a system that does not have full GNOME
|
||||
installed, the following NixOS options should be set:
|
||||
- programs.dconf.enable = true;
|
||||
'';
|
||||
homepage = "https://gtimelog.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ oxzi ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "pmtiles";
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protomaps";
|
||||
repo = "go-pmtiles";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Zxf8o0+Vc4l8XV9vYGEWxXSr+KyzTqZNxbgaZtkJ+JQ=";
|
||||
hash = "sha256-yIH5vJTrSH1y30nHU7jrem1kbXp1fO0mhLoGMrv4IAE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Y32vDgF7BNjSyGtwgsJdoRy2gGDfhTKtYpSjTjp5dnI=";
|
||||
vendorHash = "sha256-tSQjCdgEXIGlSWcIB6lLQulAiEAebgW3pXL9Z2ujgIs=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ];
|
||||
|
||||
|
|
|
|||
109
pkgs/by-name/sp/spotube/package.nix
Normal file
109
pkgs/by-name/sp/spotube/package.nix
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, makeWrapper
|
||||
, undmg
|
||||
, wrapGAppsHook
|
||||
|
||||
, libappindicator
|
||||
, libnotify
|
||||
, libsecret
|
||||
, mpv-unwrapped
|
||||
, xdg-user-dirs
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "spotube";
|
||||
version = "3.4.1";
|
||||
|
||||
meta = {
|
||||
description = "An open source, cross-platform Spotify client compatible across multiple platforms";
|
||||
longDescription = ''
|
||||
Spotube is an open source, cross-platform Spotify client compatible across
|
||||
multiple platforms utilizing Spotify's data API and YouTube (or Piped.video or JioSaavn)
|
||||
as an audio source, eliminating the need for Spotify Premium
|
||||
'';
|
||||
downloadPage = "https://github.com/KRTirtho/spotube/releases";
|
||||
homepage = "https://spotube.netlify.app/";
|
||||
license = lib.licenses.bsdOriginal;
|
||||
mainProgram = "spotube";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
|
||||
fetchArtifact = { filename, hash }:
|
||||
fetchurl {
|
||||
url = "https://github.com/KRTirtho/spotube/releases/download/v${version}/${filename}";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
darwin = stdenv.mkDerivation {
|
||||
inherit pname version meta;
|
||||
|
||||
src = fetchArtifact {
|
||||
filename = "Spotube-macos-universal.dmg";
|
||||
hash = "sha256-VobLCxsmE5kGIlDDa3v5xIHkw2x2YV14fgHHcDb+bLo=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/Applications $out/bin
|
||||
cp -r spotube.app $out/Applications
|
||||
ln -s $out/Applications/spotube.app/Contents/MacOS/spotube $out/bin/spotube
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
linux = stdenv.mkDerivation {
|
||||
inherit pname version meta;
|
||||
|
||||
src = fetchArtifact {
|
||||
filename = "Spotube-linux-x86_64.deb";
|
||||
hash = "sha256-NEGhzNz0E8jK2NPmigzoPAvYcU7zN9YHikuXHpzWfx0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
makeWrapper
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libappindicator
|
||||
libnotify
|
||||
libsecret
|
||||
mpv-unwrapped
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -r usr/* $out
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
patchelf $out/share/spotube/lib/libmedia_kit_native_event_loop.so \
|
||||
--replace-needed libmpv.so.1 libmpv.so
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper $out/share/spotube/spotube $out/bin/spotube \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--prefix LD_LIBRARY_PATH : $out/share/spotube/lib:${lib.makeLibraryPath [ mpv-unwrapped ]} \
|
||||
--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
|
||||
'';
|
||||
};
|
||||
in
|
||||
if stdenv.isDarwin then darwin else linux
|
||||
|
|
@ -3,12 +3,12 @@
|
|||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20240105034708";
|
||||
version = "20240123112230";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-8taKbZUWttpTY56lzgWJeAPpt0q9srSwRkNqkOsmY2Y=";
|
||||
hash = "sha256-tt6/JEX1WM6ayBU4NnY/yjz9S6IDAfr6hJmyF9mPHAo=";
|
||||
};
|
||||
vendorHash = "sha256-azvMUi8eLNoNofRa2X4SKTTiMd6aOyO6H/rOiKjkpIY=";
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
, glib
|
||||
, gnome
|
||||
, gnome-desktop
|
||||
, gnome-menus
|
||||
, graphene
|
||||
, gst_all_1
|
||||
, gtk-doc
|
||||
|
|
@ -32,19 +31,20 @@
|
|||
, sassc
|
||||
, upower
|
||||
, vala
|
||||
, xfce
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "budgie-desktop";
|
||||
version = "10.8.2";
|
||||
version = "10.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BuddiesOfBudgie";
|
||||
repo = "budgie-desktop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-K5XUYcFjDJCHhjb/UTO206+UT6lI2P7X1v3SqlYbwPM=";
|
||||
hash = "sha256-yyuLBzTDEQH7rBOWTYBvS+3x2mlbF34f7U7oOUO8BeA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -68,8 +68,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
budgie-screensaver
|
||||
glib
|
||||
gnome-desktop
|
||||
gnome-menus
|
||||
gnome.gnome-bluetooth_1_0
|
||||
gnome.gnome-settings-daemon
|
||||
gnome.mutter
|
||||
gnome.zenity
|
||||
|
|
@ -89,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
polkit
|
||||
sassc
|
||||
upower
|
||||
xfce.libxfce4windowing
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
|
|
|
|||
101
pkgs/desktops/budgie/budgie-session/default.nix
Normal file
101
pkgs/desktops/budgie/budgie-session/default.nix
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gnome
|
||||
, glib
|
||||
, gtk3
|
||||
, gsettings-desktop-schemas
|
||||
, gnome-desktop
|
||||
, dbus
|
||||
, json-glib
|
||||
, libICE
|
||||
, xmlto
|
||||
, docbook_xsl
|
||||
, docbook_xml_dtd_412
|
||||
, python3
|
||||
, libxslt
|
||||
, gettext
|
||||
, makeWrapper
|
||||
, systemd
|
||||
, xorg
|
||||
, libepoxy
|
||||
, bash
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "budgie-session";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BuddiesOfBudgie";
|
||||
repo = "budgie-session";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-mz+Yh3NK2Tag+MWVofFFXYYXspxhmYBD6YCiuATpZSI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
gsettings = "${glib.bin}/bin/gsettings";
|
||||
dbusLaunch = "${dbus.lib}/bin/dbus-launch";
|
||||
bash = "${bash}/bin/bash";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
makeWrapper
|
||||
xmlto
|
||||
libxslt
|
||||
docbook_xsl
|
||||
docbook_xml_dtd_412
|
||||
python3
|
||||
dbus # for DTD
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libICE
|
||||
gnome-desktop
|
||||
json-glib
|
||||
xorg.xtrans
|
||||
gnome.adwaita-icon-theme
|
||||
gnome.gnome-settings-daemon
|
||||
gsettings-desktop-schemas
|
||||
systemd
|
||||
libepoxy
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py # patchShebangs requires executable file
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
# `bin/budgie-session` will reset the environment when run in wayland, we
|
||||
# therefor wrap `libexec/budgie-session-binary` instead which is the actual
|
||||
# binary needing wrapping
|
||||
preFixup = ''
|
||||
wrapProgram "$out/libexec/budgie-session-binary" \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
|
||||
--suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg"
|
||||
'';
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
meta = {
|
||||
description = "Session manager for Budgie";
|
||||
homepage = "https://github.com/BuddiesOfBudgie/budgie-session";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [federicoschonborn];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
35
pkgs/desktops/budgie/budgie-session/fix-paths.patch
Normal file
35
pkgs/desktops/budgie/budgie-session/fix-paths.patch
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
diff --git a/gnome-session/budgie-session.in b/gnome-session/budgie-session.in
|
||||
index 8a91e061..3e2ef031 100755
|
||||
--- a/gnome-session/budgie-session.in
|
||||
+++ b/gnome-session/budgie-session.in
|
||||
@@ -7,13 +7,15 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
|
||||
! (echo "$SHELL" | grep -q "false") &&
|
||||
! (echo "$SHELL" | grep -q "nologin"); then
|
||||
if [ "$1" != '-l' ]; then
|
||||
- exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
|
||||
+ # Make sure the shell actually sets up the environment.
|
||||
+ unset __NIXOS_SET_ENVIRONMENT_DONE
|
||||
+ exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'"
|
||||
else
|
||||
shift
|
||||
fi
|
||||
fi
|
||||
|
||||
-SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region)
|
||||
+SETTING=$(G_MESSAGES_DEBUG='' @gsettings@ get org.gnome.system.locale region)
|
||||
REGION=${SETTING#\'}
|
||||
REGION=${REGION%\'}
|
||||
|
||||
diff --git a/gnome-session/main.c b/gnome-session/main.c
|
||||
index 327c7c7f..301ec7ee 100644
|
||||
--- a/gnome-session/main.c
|
||||
+++ b/gnome-session/main.c
|
||||
@@ -219,7 +219,7 @@ require_dbus_session (int argc,
|
||||
}
|
||||
new_argv[i + 2] = NULL;
|
||||
|
||||
- if (!execvp ("dbus-launch", new_argv)) {
|
||||
+ if (!execvp ("@dbusLaunch@", new_argv)) {
|
||||
g_set_error (error,
|
||||
G_SPAWN_ERROR,
|
||||
G_SPAWN_ERROR_FAILED,
|
||||
|
|
@ -8,5 +8,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { };
|
||||
budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { };
|
||||
budgie-screensaver = callPackage ./budgie-screensaver { };
|
||||
budgie-session = callPackage ./budgie-session { };
|
||||
magpie = callPackage ./magpie { };
|
||||
})
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
, libepoxy
|
||||
, bash
|
||||
, gnome-session-ctl
|
||||
, gnomeShellSupport ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -114,7 +113,7 @@ stdenv.mkDerivation rec {
|
|||
wrapProgram "$out/libexec/gnome-session-binary" \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
|
||||
${lib.optionalString gnomeShellSupport "--suffix XDG_DATA_DIRS : \"${gnome.gnome-shell}/share\""} \
|
||||
--suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share" \
|
||||
--suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg"
|
||||
'';
|
||||
|
||||
|
|
|
|||
18
pkgs/desktops/xfce/core/libxfce4windowing/default.nix
Normal file
18
pkgs/desktops/xfce/core/libxfce4windowing/default.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{ lib, mkXfceDerivation, gobject-introspection, glib, gtk3, libwnck, wayland }:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "libxfce4windowing";
|
||||
version = "4.19.2";
|
||||
|
||||
sha256 = "sha256-mXxxyfwZB/AJFVVGFAAXLqC5p7pZAeqmhljQym55hyM=";
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection ];
|
||||
buildInputs = [ glib gtk3 libwnck wayland ];
|
||||
|
||||
meta = {
|
||||
description = "Windowing concept abstraction library for X11 and Wayland";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = with lib; [ maintainers.federicoschonborn ] ++ teams.xfce.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -32,6 +32,8 @@ makeScopeWithSplicing' {
|
|||
|
||||
libxfce4util = callPackage ./core/libxfce4util { };
|
||||
|
||||
libxfce4windowing = callPackage ./core/libxfce4windowing { };
|
||||
|
||||
thunar = callPackage ./core/thunar {
|
||||
thunarPlugins = [ ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,17 +7,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "risor";
|
||||
version = "1.1.2";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "risor-io";
|
||||
repo = "risor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7/pGC2+7KKc+1JZrPnchG3/Zj15lfcvTppuFUcpu/aU=";
|
||||
hash = "sha256-E4Huto3jvPziWEZqHwVBchZYDX/Tuq/TCBvoviin5UY=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-6Zb30IXZsRQ0mvJOf4yDPkk7I+s18ok/V90mSKB/Ev4=";
|
||||
vendorHash = "sha256-0NYvZhVkDX6WlKN4QFXyrNnEy0sjUQ1Us+iNEPIgNX0=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/risor"
|
||||
|
|
|
|||
|
|
@ -19,12 +19,20 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
# Upstram fix for builds on GCC 13. Should be removable with next release after 0.5.1
|
||||
(fetchpatch {
|
||||
name = "add-cstdint-include.patch";
|
||||
url = "https://github.com/facebookincubator/fbjni/commit/59461eff6c7881d58e958287481e1f1cd99e08d3.patch";
|
||||
hash = "sha256-r27C+ODTCZdd1tEz3cevnNNyZlrRhq1jOzwnIYlkglM=";
|
||||
})
|
||||
|
||||
# Part of https://github.com/facebookincubator/fbjni/pull/76
|
||||
# fix cmake file installation directory
|
||||
(fetchpatch {
|
||||
url = "https://github.com/facebookincubator/fbjni/commit/ab02e60b5da28647bfcc864b0bb1b9a90504cdb1.patch";
|
||||
sha256 = "sha256-/h6kosulRH/ZAU2u0zRSaNDK39jsnFt9TaSxyBllZqM=";
|
||||
})
|
||||
|
||||
# install headers
|
||||
(fetchpatch {
|
||||
url = "https://github.com/facebookincubator/fbjni/commit/74e125caa9a815244f1e6bd08eaba57d015378b4.patch";
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libbacktrace";
|
||||
version = "unstable-2022-12-16";
|
||||
version = "unstable-2023-11-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ianlancetaylor";
|
||||
repo = "libbacktrace";
|
||||
rev = "da7eff2f37e38136c5a0c8922957b9dfab5483ef";
|
||||
sha256 = "ADp8n1kUf8OysFY/Jv1ytxKjqgz1Nu2VRcFGlt1k/HM=";
|
||||
rev = "14818b7783eeb9a56c3f0fca78cefd3143f8c5f6";
|
||||
sha256 = "DQZQsqzeQ/0v87bfqs6sXqS2M5Tunc1OydTWRSB3PCw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{ lib
|
||||
, bigstringaf
|
||||
, buildDunePackage
|
||||
, cstruct
|
||||
, fetchurl
|
||||
, iomux
|
||||
, mdx
|
||||
, poll
|
||||
, ptime
|
||||
, telemetry
|
||||
, uri
|
||||
|
|
@ -10,24 +11,29 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "riot";
|
||||
version = "0.0.5";
|
||||
version = "0.0.7";
|
||||
|
||||
minimalOCamlVersion = "5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/leostera/riot/releases/download/${version}/riot-${version}.tbz";
|
||||
hash = "sha256-Abe4LMxlaxK3MVlg2d8X60aCuPGvaOn+4zFx/uH5z4g=";
|
||||
hash = "sha256-t+PMBh4rZXi82dUljv3nLzZX5o1iagBbQ9FfGnr/dp4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bigstringaf
|
||||
iomux
|
||||
cstruct
|
||||
poll
|
||||
ptime
|
||||
telemetry
|
||||
uri
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
mdx
|
||||
mdx.bin
|
||||
];
|
||||
|
||||
doCheck = false; # fails on sandbox
|
||||
|
||||
meta = {
|
||||
description = "An actor-model multi-core scheduler for OCaml 5";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aioresponses
|
||||
, pydantic
|
||||
, pydantic_1
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioopenexchangerates";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,12 +21,11 @@ buildPythonPackage rec {
|
|||
owner = "MartinHjelmare";
|
||||
repo = "aioopenexchangerates";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6lgjblCyc4NSnw+nlCH0SKV7f9aa4qcfa7v9pgzusKo=";
|
||||
hash = "sha256-BfmXHcAPYPBkHlR5tp8w8Za1mb8GgjvyWIhfrVk38pY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'pydantic = "^1.9"' 'pydantic = "*"' \
|
||||
--replace " --cov=aioopenexchangerates --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
|
|
@ -36,7 +35,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
pydantic
|
||||
pydantic_1
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiortm";
|
||||
version = "0.8.7";
|
||||
version = "0.8.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -24,12 +24,12 @@ buildPythonPackage rec {
|
|||
owner = "MartinHjelmare";
|
||||
repo = "aiortm";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rWULiyQGBA01hWfRDulDuHX0c1LPo6CTZ9HFOn3MD+E=";
|
||||
hash = "sha256-bHFQd/jD5S+2YHr+f8W9WxDw69i59gzzptwDUS0UWAY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=aiortm --cov-report=term-missing:skip-covered" ""
|
||||
--replace-warn " --cov=aiortm --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "anthropic";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "anthropics";
|
||||
repo = "anthropic-sdk-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1g3Bbij9HbMK+JJASe+VTBXx5jCQheXLrcnAD0qMs8g=";
|
||||
hash = "sha256-MwZc+uGNjALNnGTzZwxDd/o/htbn/IFotdkh/066yM4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bip-utils";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "ebellocchia";
|
||||
repo = "bip_utils";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PUWKpAn6Z1E7uMk8+XFm6FDtupzj6eMSkyXR9vN1w3I=";
|
||||
hash = "sha256-D+LalbrwsjxwYW8l38D1l4tGAsjrZ+bS+/Ppgaxkzy4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-cleanup";
|
||||
version = "8.0.0";
|
||||
version = "8.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-xzmgVUTh5I3ISIcchw2/FZX4Uz0kUjvGc2DkNWLtrw0=";
|
||||
hash = "sha256-cN+QUHakTnoRGzEZgZmvYz3uCIduGZ5tzjbKjda4sQ8=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
48
pkgs/development/python-modules/dploot/default.nix
Normal file
48
pkgs/development/python-modules/dploot/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, poetry-core
|
||||
, pythonRelaxDepsHook
|
||||
, fetchPypi
|
||||
, impacket
|
||||
, cryptography
|
||||
, pyasn1
|
||||
, lxml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dploot";
|
||||
version = "2.2.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-40/5KOlEFvPL9ohCfR3kqoikpKFfJO22MToq3GhamKM=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
impacket
|
||||
cryptography
|
||||
pyasn1
|
||||
lxml
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "dploot" ];
|
||||
|
||||
# No tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/zblurx/dploot";
|
||||
description = "DPAPI looting remotely in Python";
|
||||
changelog = "https://github.com/zblurx/dploot/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ vncsb ];
|
||||
};
|
||||
}
|
||||
|
|
@ -74,6 +74,8 @@ buildPythonPackage rec {
|
|||
disabledTestPaths = [
|
||||
# missing test inputs
|
||||
"dulwich/contrib/test_swift_smoke.py"
|
||||
# flaky on high core count >4
|
||||
"dulwich/tests/compat/test_client.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -6,28 +6,33 @@
|
|||
, idna
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools
|
||||
, urllib3
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "frigidaire";
|
||||
version = "0.18.13";
|
||||
format = "setuptools";
|
||||
version = "0.18.15";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bm1549";
|
||||
repo = pname;
|
||||
repo = "frigidaire";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FikBV4KjutQfupGPXcVT1h+BfQ099WRrmbrEJOaVCQI=";
|
||||
hash = "sha256-5+epdQyeTGJp8iTrX6vyp4JgM45Fl5cb67Z8trNBe+8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'version = "SNAPSHOT"' 'version = "${version}"'
|
||||
--replace-warn 'version = "SNAPSHOT"' 'version = "${version}"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
certifi
|
||||
chardet
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gitlike-commands";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -17,18 +16,9 @@ buildPythonPackage rec {
|
|||
owner = "unixorn";
|
||||
repo = "gitlike-commands";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VjweN4gigzCNvg6TccZx2Xw1p7SusKplxUTZjItTQc0=";
|
||||
hash = "sha256-Z0l8nCKov1iMJvI3YTHvg0ey+oPju3rgaKtmk6OX44g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Replace distutils, https://github.com/unixorn/gitlike-commands/pull/8
|
||||
(fetchpatch {
|
||||
name = "replace-distutils.patch";
|
||||
url = "https://github.com/unixorn/gitlike-commands/commit/8a97206aff50a25ac6860032aa03925899c3d0aa.patch";
|
||||
hash = "sha256-a2utKbf9vrQlYlPcdj/+OAqWf7VkuC5kvbJ53SK52IA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "glfw";
|
||||
version = "2.6.4";
|
||||
version = "2.6.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "FlorianRhiem";
|
||||
repo = "pyGLFW";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ANydW+4uLIJelUdDCHZ6WJgIJHNXzdc9jK/nZbZHi+I=";
|
||||
hash = "sha256-mh2l63Nt9YMCPM3AplKWPx5HQZi2/cm+dUS56JB8fGA=";
|
||||
};
|
||||
|
||||
# Patch path to GLFW shared object
|
||||
|
|
|
|||
|
|
@ -1,60 +0,0 @@
|
|||
{ lib, fetchFromGitHub, makeWrapper
|
||||
, glibcLocales, gobject-introspection, gtk3, libsoup, libsecret
|
||||
, buildPythonPackage, python
|
||||
, pygobject3, freezegun, mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gtimelog";
|
||||
version = "unstable-2020-05-16";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "80682ddbf9e0d68b8c67257289784f3b49b543d8";
|
||||
sha256 = "0qv2kv7vc3qqlzxsisgg31cmrkkqgnmxspbj10c5fhdmwzzwi0i9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper gobject-introspection ];
|
||||
buildInputs = [
|
||||
glibcLocales gtk3 libsoup libsecret
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pygobject3 freezegun mock
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
substituteInPlace runtests --replace "/usr/bin/env python3" "${python.interpreter}"
|
||||
./runtests
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "gtimelog" ];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/gtimelog \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
--prefix LD_LIBRARY_PATH ":" "${gtk3.out}/lib" \
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A time tracking app";
|
||||
longDescription = ''
|
||||
GTimeLog is a small time tracking application for GNOME.
|
||||
It's main goal is to be as unintrusive as possible.
|
||||
|
||||
To run gtimelog successfully on a system that does not have full GNOME 3
|
||||
installed, the following NixOS options should be set:
|
||||
- programs.dconf.enable = true;
|
||||
- services.gnome.gnome-keyring.enable = true;
|
||||
|
||||
In addition, the following packages should be added to the environment:
|
||||
- gnome.adwaita-icon-theme
|
||||
- gnome.dconf
|
||||
'';
|
||||
homepage = "https://gtimelog.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ oxzi ];
|
||||
};
|
||||
}
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2024.1.8";
|
||||
version = "2024.1.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = "hahomematic";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ln+Dich2I503LA5nIWK9k3B83LjIBsRUmBv2xJmFRQI=";
|
||||
hash = "sha256-IBROclNIkOedf2WxNUqz7+3izGEH08R7acrmnvm42Og=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, fetchFromGitHub
|
||||
, json-stream
|
||||
, json-stream-rs-tokenizer
|
||||
, pythonOlder
|
||||
, rustc
|
||||
, rustPlatform
|
||||
, setuptools
|
||||
|
|
@ -15,14 +16,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "json-stream-rs-tokenizer";
|
||||
version = "0.4.22";
|
||||
format = "setuptools";
|
||||
version = "0.4.25";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smheidrich";
|
||||
repo = "py-json-stream-rs-tokenizer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EW726gUXTBX3gTxlFQ45RgkUa2Z4tIjUZxO4GBLXgEs=";
|
||||
hash = "sha256-zo/jRAWSwcOnO8eU4KhDNz44P6xDGcrZf9CflwsSvF0=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "preshed";
|
||||
version = "4.0.0";
|
||||
version = "3.0.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XisLKgfdGo3uqtZhIBmEXGAu4kkH9pNuqvF6q9VuVEw=";
|
||||
hash = "sha256-chhjxSRP/NJlGtCSiVGix8d7EC9OEaJRrYXTfudiFmA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-docs-theme";
|
||||
version = "2023.9";
|
||||
version = "2024.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "python";
|
||||
repo = "python-docs-theme";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-XVwMEfprTNdNnaW38HMCAu4CswdVjBXYtNWBgqXfbno=";
|
||||
hash = "sha256-nU8KQu89/xWvR6xoIOKsGrOqDjFhA3TgHROHfbAqCRU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.204.0";
|
||||
version = "2.205.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
|||
owner = "aws";
|
||||
repo = "sagemaker-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Bku13l4CPz1SYNpqnnteE97jX+X9sv6ea9X2tiZzeXY=";
|
||||
hash = "sha256-TqPTzmJZa6ntxEIv/M9m6pvk9g0CcJW0PPyUJtwHNpk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ytmusicapi";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "sigma67";
|
||||
repo = "ytmusicapi";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-TlTCW9KeW9O00FzDiH8BXW/3795hsEUW1VXUy5qOk3w=";
|
||||
hash = "sha256-9HpGmilaV5AhzN90/KLFpJjOZJMKS8SjuSE8cXLcBNA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pgweb";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sosedoff";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gM7hqFriXkcwNO+I3d138kfp1F4YsO/Qbq0NzMszkwM=";
|
||||
hash = "sha256-We7MyKOdauf93tBihvjouEiZ4FnkvsUtfJpswK6ef7Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "earthly";
|
||||
version = "0.8.0";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "earthly";
|
||||
repo = "earthly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CB3ybV/jW1l0esSPNA6hBsceVw0UlmyDydz9dLmd3N4=";
|
||||
hash = "sha256-FfmjQf66+oG4OmB15+hGbXVaVDtXk7koVv4aKByASR8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IU/D//ucQQIb/+M5rN7mtoVqDFmq799b6IoQfjD86Ls=";
|
||||
vendorHash = "sha256-vfLEPP0mYpduuHkGD7u5EBjnp9oq7JhB9EvuOgO+Irs=";
|
||||
subPackages = [ "cmd/earthly" "cmd/debugger" ];
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "jira-cli-go";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ankitpokhrel";
|
||||
repo = "jira-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FdDoKww/6WzKCZBrgvh72TRovMXLOOzlmoFreMGWAeo=";
|
||||
hash = "sha256-edytj9hB8lDwy3qGSyLudu5G4DSRGKhD0vDoWz5eUgs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DAdzbANqr0fa4uO8k/yJFoirgbZiKOQhOH8u8d+ncao=";
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kool";
|
||||
version = "2.2.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kool-dev";
|
||||
repo = "kool";
|
||||
rev = version;
|
||||
hash = "sha256-YVgUKA7bMcncZDYaxaN2kCbE3JUmM9aM3GoQkOXEWpA=";
|
||||
hash = "sha256-+vdizU2/q2nrEanpRPy1scgfTYh/I7feW4jz8efelWY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zsrqppHl7Z8o+J1SzZnv1jOdPO04JaF1K38a//+uAxU=";
|
||||
vendorHash = "sha256-PmS96KVhe9TDmtYBx2hROLCbGMQ0OY3MN405dUmxPzk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "okteto";
|
||||
version = "2.24.1";
|
||||
version = "2.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = version;
|
||||
hash = "sha256-AM92VtkTRR4QSEg0mrki8UzOxVx7g+IsKUDHTE62d08=";
|
||||
hash = "sha256-E3+3SPqovw/2zqDsqu9qQ5MFwNQhRIxXiWhZbhLxfuo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vSvHjQZFLzUIC9u+myI6Xi4YhetVkiQxBIkm5/RoV2U=";
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-make";
|
||||
version = "0.37.7";
|
||||
version = "0.37.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sagiegurari";
|
||||
repo = "cargo-make";
|
||||
rev = version;
|
||||
hash = "sha256-1WITPilqdJeOPWleEGP4ApHE0pIOQZabeY8x2joq6N4=";
|
||||
hash = "sha256-hjrR5hCyR+s1/d9LvxRfklmLhReAU98NsEjyRrjD8sI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kT7IbknQ/TF4l/X7GIpX1btHCp10Z15GHd6GjPMCpJs=";
|
||||
cargoHash = "sha256-KaBpq9ykTvSdGpziV15V7S5zMsEyVHJdLLMZydNYyF8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "snazy";
|
||||
version = "0.52.7";
|
||||
version = "0.52.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chmouel";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-NUDKTJtSzzY+kaqreHroJDW18lta9AcnL94t/jdEOlY=";
|
||||
hash = "sha256-0r5xhmU9a9I+q24mjJ+C4EKK1Nw/67YThuBFibAx3Dw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-raDkfP7EeyXbMr2puR+dHUKVqguVvkV7noNuLw/KttI=";
|
||||
cargoHash = "sha256-ljYsF5lBRqiTqx9nta5h/75052GWOBJ9uJnqZkWJvwI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
|
|||
gpl3 # Game engine
|
||||
unfreeRedistributable # Game assets, freeware
|
||||
];
|
||||
maintainers = [ lib.maintainers.scubed2 ];
|
||||
maintainers = [ ];
|
||||
homepage = "https://github.com/nxengine/nxengine-evo";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-compute-runtime";
|
||||
version = "23.43.27642.18";
|
||||
version = "23.48.27912.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "compute-runtime";
|
||||
rev = version;
|
||||
hash = "sha256-AXHNIWCezPYTzc+SXp1B4BzhfSfM2GUCpWLtCT1SE7I=";
|
||||
hash = "sha256-9VKmD7FxvBrDVqT1TzKommjrTvalfR4diReaDRy+Lk0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"testing": {
|
||||
"version": "6.8-rc1",
|
||||
"hash": "sha256:0rnrd1iy73vkrablx6rqlmxv9bv9zjfh6zj09aqca9rr5h8iz1p3"
|
||||
"version": "6.8-rc2",
|
||||
"hash": "sha256:0zlk5kq06lan0x689dxrxnfpz2zmlmykm1h0cfpgiy05f52kbhlk"
|
||||
},
|
||||
"6.5": {
|
||||
"version": "6.5.13",
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ stdenv, lib, fetchsvn, linux
|
||||
, scripts ? fetchsvn {
|
||||
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
|
||||
rev = "19473";
|
||||
sha256 = "0k9pgjg6k9j00x4m3g6chnhgznr5r1yyqd9x8q7a9q9j88vygszs";
|
||||
rev = "19482";
|
||||
sha256 = "0y9w9jwlhxv88mjr67g64wgypjf3ikc6c5gr8wrvxiawi24kdhca";
|
||||
}
|
||||
, ...
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -2,35 +2,20 @@
|
|||
, stdenv
|
||||
, windows
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
let
|
||||
version = "10.0.0";
|
||||
version = "11.0.1";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "mingw-w64";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
|
||||
hash = "sha256-umtDCu1yxjo3aFMfaj/8Kw/eLFejslFFDc9ImolPCJQ=";
|
||||
hash = "sha256-P2a84Gnui+10OaGhPafLkaXmfqYXDyExesf1eUYl7hA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream patches to fix build parallelism
|
||||
(fetchpatch {
|
||||
name = "crt-suff-make-4.4.patch";
|
||||
url = "https://github.com/mirror/mingw-w64/commit/953bcd32ae470c4647e94de8548dda5a8f07d82d.patch";
|
||||
hash = "sha256-lrS4ZDa/Uwsj5DXajOUv+knZXan0JVU70KHHdIjJ07Y=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "dll-dep-make-4.4.patch";
|
||||
url = "https://github.com/mirror/mingw-w64/commit/e1b0c1420bbd52ef505c71737c57393ac1397b0a.patch";
|
||||
hash = "sha256-/56Cmmy0UYTaDKIWG7CgXsThvCHK6lSbekbBOoOJSIQ=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "homepage-dashboard";
|
||||
version = "0.8.6";
|
||||
version = "0.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gethomepage";
|
||||
repo = "homepage";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ws4zPt6N4gPRLgJAeozPlbSJm0mOQKmkOZpKeB1y+J0=";
|
||||
hash = "sha256-H8BUyIsbn8UL6VuA2SEJXzJ77S/880rQIoNKFJNApqQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-RC2Y4XZqO+mLEKQxq+j2ukZYi/uu9XIjYadxek9P+SM=";
|
||||
|
|
|
|||
|
|
@ -21,16 +21,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2024-01-18T22-51-28Z";
|
||||
version = "2024-01-28T22-35-53Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-O0MvwX8fD6QKaFTSfat9eVV+gY9ZaWIvxOpevwZaODw=";
|
||||
sha256 = "sha256-FI+YVpl8BeY2GbMrjUCLkXARLqeU3qwqbnFU6iZPRG8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zB5yaWY0MhksqhrJfmfkpwlZio0p291t9ETESgADBjg=";
|
||||
vendorHash = "sha256-v6Mn0f8xNsaV1ixnuVs9cPi5FghAGKjX5nWiBZLhBUU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "knot-exporter";
|
||||
version = "3.3.3";
|
||||
version = "3.3.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "knot_exporter";
|
||||
inherit version;
|
||||
hash = "sha256-A7WRwWwcfgrkR5ixEaDCcCdJ1J8/zeG5aFCBnFbD3Qo=";
|
||||
hash = "sha256-jZNNJiJxq3pNSZFwu2UEHhrA0odIDY0UO+d4PJII1ZI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet";
|
||||
version = "1.0.7712";
|
||||
version = "1.0.7762";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
|
||||
sha256 = "NNO+lXSPGtEDN7cqBatH2l8jqaQnTdNXfo9uzc+SwUA=";
|
||||
sha256 = "SsmMQdR6JczL63/o/LHbg5sjnBA+TuYPu4WR+tlGaC4=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vikunja-api";
|
||||
version = "0.22.0";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-vikunja";
|
||||
repo = "api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hqyopIV/cLLC8An+ELN0a/cFAq6BoCZZjBRviaJ5ygI=";
|
||||
hash = "sha256-tYhlAF1VuM/Xz4HP7DtI0hGsiNyYxzFiNIEbm8n9DC8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
|
@ -24,7 +24,7 @@ buildGoModule rec {
|
|||
in
|
||||
[ fakeGit mage ];
|
||||
|
||||
vendorHash = "sha256-+V6a6h5pg8FU87pA4JxZo07HGBXIgCv4FjmtjIpQUP4=";
|
||||
vendorHash = "sha256-OD/7RCCrRdlrsRW7CRT01cDUvNnedNdTZ8YgDFGaE4o=";
|
||||
|
||||
# checks need to be disabled because of needed internet for some checks
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vikunja-frontend";
|
||||
version = "0.22.0";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip";
|
||||
hash = "sha256-LYU1IGAhSZOwMI44HW5IfcBKs9RkU/IXGVgPGDKnKAs=";
|
||||
hash = "sha256-jkFF6sucLZWpWkPcovTdD9MOyJNPRWIBfK9388X5onc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
}:
|
||||
|
||||
yarn2nix-moretea.mkYarnPackage {
|
||||
version = "1.1.19";
|
||||
version = "1.1.20";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.19.tgz";
|
||||
sha256 = "0kphzzhzc29jmldbfdfczw0395a1kr38bpyz0hjl9hm0d6glz74h";
|
||||
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.20.tgz";
|
||||
sha256 = "1iykx1lrsd09z3jbykspjgibsbpcgrw5b60dmpzcc1i4fr0zpnz9";
|
||||
};
|
||||
|
||||
patches = [ ./fix-js-include-paths.patch ];
|
||||
|
|
@ -21,7 +21,7 @@ yarn2nix-moretea.mkYarnPackage {
|
|||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = ./yarn.lock;
|
||||
hash = "sha256-tKS7Nrd5tWuRFfl5hZXCmVBxUe+W3+uhtw0YF0IBGZU=";
|
||||
hash = "sha256-zLbD0UhCRQNTka1WUjDuZLseS1PMURQSPFEa0SvwS7E=";
|
||||
};
|
||||
|
||||
# Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "meshcentral",
|
||||
"version": "1.1.19",
|
||||
"version": "1.1.20",
|
||||
"keywords": [
|
||||
"Remote Device Management",
|
||||
"Remote Device Monitoring",
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ update-source-version meshcentral "$version" "$hash" "$tarball"
|
|||
new_yarn_hash=$(prefetch-yarn-deps "$expr_dir/yarn.lock")
|
||||
new_yarn_hash=$(nix-hash --type sha256 --to-sri "$new_yarn_hash")
|
||||
old_yarn_hash=$(nix-instantiate --eval -A meshcentral.offlineCache.outputHash | tr -d '"')
|
||||
sed -i "$expr_dir/default.nix" -re "s|\"$old_yarn_hash\"|\"$new_yarn_hash\"|"
|
||||
sed -i "$expr_dir/default.nix" -e "s|\"$old_yarn_hash\"|\"$new_yarn_hash\"|"
|
||||
|
||||
# Only clean up if everything worked
|
||||
cd /
|
||||
|
|
|
|||
|
|
@ -65,16 +65,16 @@
|
|||
"@aws-sdk/util-utf8-browser" "^3.0.0"
|
||||
tslib "^1.11.1"
|
||||
|
||||
"@aws-sdk/client-cognito-identity@3.496.0":
|
||||
version "3.496.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.496.0.tgz#fe7e3b56b2d1186c0164f2bbf591fb7371c5921f"
|
||||
integrity sha512-rb0Pv8jzJ8XBNmhKl/Up8jnaLWPKuW622s9RR9JyVEu/uUR5tyhdEJvEsS88A9a0+BTRt4G7X1VnUXWAgi8hxQ==
|
||||
"@aws-sdk/client-cognito-identity@3.501.0":
|
||||
version "3.501.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.501.0.tgz#232543d91b1d236cfeac7c0168c56eddff1aafd3"
|
||||
integrity sha512-ynWW9VVT7CTMQBh8l7WFt2SNekg3667gwjQmeGN8+DDMDqt2Z+L52717S0AN1pQDUMbh/DuKKPk+Sr30HBK3vA==
|
||||
dependencies:
|
||||
"@aws-crypto/sha256-browser" "3.0.0"
|
||||
"@aws-crypto/sha256-js" "3.0.0"
|
||||
"@aws-sdk/client-sts" "3.496.0"
|
||||
"@aws-sdk/client-sts" "3.501.0"
|
||||
"@aws-sdk/core" "3.496.0"
|
||||
"@aws-sdk/credential-provider-node" "3.496.0"
|
||||
"@aws-sdk/credential-provider-node" "3.501.0"
|
||||
"@aws-sdk/middleware-host-header" "3.496.0"
|
||||
"@aws-sdk/middleware-logger" "3.496.0"
|
||||
"@aws-sdk/middleware-recursion-detection" "3.496.0"
|
||||
|
|
@ -154,15 +154,15 @@
|
|||
"@smithy/util-utf8" "^2.1.1"
|
||||
tslib "^2.5.0"
|
||||
|
||||
"@aws-sdk/client-sts@3.496.0":
|
||||
version "3.496.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.496.0.tgz#e0c142cf8bb1aec7a9c7b09dd9739f6773d94fd0"
|
||||
integrity sha512-3pSdqgegdwbK3CT1WvGHhA+Bf91R9cr8G1Ynp+iU2wZvy8ueJfMUk0NYfjo3EEv0YhSbMLKuduzZfvQHFHXYhw==
|
||||
"@aws-sdk/client-sts@3.501.0":
|
||||
version "3.501.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.501.0.tgz#f3ab15d11517f28f1fdd3bd2b0c4dcf15a88b5aa"
|
||||
integrity sha512-Uwc/xuxsA46dZS5s+4U703LBNDrGpWF7RB4XYEEMD21BLfGuqntxLLQux8xxKt3Pcur0CsXNja5jXt3uLnE5MA==
|
||||
dependencies:
|
||||
"@aws-crypto/sha256-browser" "3.0.0"
|
||||
"@aws-crypto/sha256-js" "3.0.0"
|
||||
"@aws-sdk/core" "3.496.0"
|
||||
"@aws-sdk/credential-provider-node" "3.496.0"
|
||||
"@aws-sdk/credential-provider-node" "3.501.0"
|
||||
"@aws-sdk/middleware-host-header" "3.496.0"
|
||||
"@aws-sdk/middleware-logger" "3.496.0"
|
||||
"@aws-sdk/middleware-recursion-detection" "3.496.0"
|
||||
|
|
@ -212,12 +212,12 @@
|
|||
"@smithy/types" "^2.9.1"
|
||||
tslib "^2.5.0"
|
||||
|
||||
"@aws-sdk/credential-provider-cognito-identity@3.496.0":
|
||||
version "3.496.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.496.0.tgz#cb4105e9247bdee4b6cef4551f6d5939f9519bb4"
|
||||
integrity sha512-LIB9hom5mqGxk+hdbpZnxIJ4F1c5ZuY5uu3aWy9luowci03Z5nzYYepzBwpoE5Lk102gqVKeia//mRr25blzWQ==
|
||||
"@aws-sdk/credential-provider-cognito-identity@3.501.0":
|
||||
version "3.501.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.501.0.tgz#9df440eea01125130226fdd1619f5b728f4db9c0"
|
||||
integrity sha512-U9fjzliKzMiPx/EWLNLCEoF5wWhVtlluTEc4/WhNtSryV2PyihqIAK8nK4+MFaXB4xOrlRnpYMd7oqm03wMGyw==
|
||||
dependencies:
|
||||
"@aws-sdk/client-cognito-identity" "3.496.0"
|
||||
"@aws-sdk/client-cognito-identity" "3.501.0"
|
||||
"@aws-sdk/types" "3.496.0"
|
||||
"@smithy/property-provider" "^2.1.1"
|
||||
"@smithy/types" "^2.9.1"
|
||||
|
|
@ -248,14 +248,14 @@
|
|||
"@smithy/util-stream" "^2.1.1"
|
||||
tslib "^2.5.0"
|
||||
|
||||
"@aws-sdk/credential-provider-ini@3.496.0":
|
||||
version "3.496.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.496.0.tgz#4de82fc173ba1581af4bf6fcad610f2fc0fd8ca1"
|
||||
integrity sha512-2nD1jp1sIwcQaWK1y/9ruQOkW16RUxZpzgjbW/gnK3iiUXwx+/FNQWxshud+GTSx3Q4x6eIhqsbjtP4VVPPuUA==
|
||||
"@aws-sdk/credential-provider-ini@3.501.0":
|
||||
version "3.501.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.501.0.tgz#66f56d56858267460614260b6bfd70cd18ba868b"
|
||||
integrity sha512-6UXnwLtYIr298ljveumCVXsH+x7csGscK5ylY+veRFy514NqyloRdJt8JY26hhh5SF9MYnkW+JyWSJ2Ls3tOjQ==
|
||||
dependencies:
|
||||
"@aws-sdk/credential-provider-env" "3.496.0"
|
||||
"@aws-sdk/credential-provider-process" "3.496.0"
|
||||
"@aws-sdk/credential-provider-sso" "3.496.0"
|
||||
"@aws-sdk/credential-provider-sso" "3.501.0"
|
||||
"@aws-sdk/credential-provider-web-identity" "3.496.0"
|
||||
"@aws-sdk/types" "3.496.0"
|
||||
"@smithy/credential-provider-imds" "^2.2.1"
|
||||
|
|
@ -264,15 +264,15 @@
|
|||
"@smithy/types" "^2.9.1"
|
||||
tslib "^2.5.0"
|
||||
|
||||
"@aws-sdk/credential-provider-node@3.496.0":
|
||||
version "3.496.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.496.0.tgz#734fc5aa824c387c893ff5624b201c0243ea1c7c"
|
||||
integrity sha512-IVF9RvLePfRa5S5/eBIRChJCWOzQkGwM8P/L79Gl84u/cH2oSG4NtUI/YTDlrtmnYn7YsGhINSV0WnzfF2twfQ==
|
||||
"@aws-sdk/credential-provider-node@3.501.0":
|
||||
version "3.501.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.501.0.tgz#6cb96dc5c1bfaf8dcb580063beeed9ef9db33961"
|
||||
integrity sha512-NM62D8gYrQ1nyLYwW4k48B2/lMHDzHDcQccS1wJakr6bg5sdtG06CumwlVcY+LAa0o1xRnhHmh/yiwj/nN4avw==
|
||||
dependencies:
|
||||
"@aws-sdk/credential-provider-env" "3.496.0"
|
||||
"@aws-sdk/credential-provider-ini" "3.496.0"
|
||||
"@aws-sdk/credential-provider-ini" "3.501.0"
|
||||
"@aws-sdk/credential-provider-process" "3.496.0"
|
||||
"@aws-sdk/credential-provider-sso" "3.496.0"
|
||||
"@aws-sdk/credential-provider-sso" "3.501.0"
|
||||
"@aws-sdk/credential-provider-web-identity" "3.496.0"
|
||||
"@aws-sdk/types" "3.496.0"
|
||||
"@smithy/credential-provider-imds" "^2.2.1"
|
||||
|
|
@ -292,13 +292,13 @@
|
|||
"@smithy/types" "^2.9.1"
|
||||
tslib "^2.5.0"
|
||||
|
||||
"@aws-sdk/credential-provider-sso@3.496.0":
|
||||
version "3.496.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.496.0.tgz#1c5f2d25b64936b79095f49cabbcd7832fb87087"
|
||||
integrity sha512-eP7GxpT2QYubSDG7uk1GJW4eNymZCq65IxDyEFCXOP/kfqkxriCY+iVEFG6/Mo3LxvgrgHXU4jxrCAXMAWN43g==
|
||||
"@aws-sdk/credential-provider-sso@3.501.0":
|
||||
version "3.501.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.501.0.tgz#a96b859b59d3825f54158de8c692d69bd6edf5e6"
|
||||
integrity sha512-y90dlvvZ55PwecODFdMx0NiNlJJfm7X6S61PKdLNCMRcu1YK+eWn0CmPHGHobBUQ4SEYhnFLcHSsf+VMim6BtQ==
|
||||
dependencies:
|
||||
"@aws-sdk/client-sso" "3.496.0"
|
||||
"@aws-sdk/token-providers" "3.496.0"
|
||||
"@aws-sdk/token-providers" "3.501.0"
|
||||
"@aws-sdk/types" "3.496.0"
|
||||
"@smithy/property-provider" "^2.1.1"
|
||||
"@smithy/shared-ini-file-loader" "^2.3.1"
|
||||
|
|
@ -316,20 +316,20 @@
|
|||
tslib "^2.5.0"
|
||||
|
||||
"@aws-sdk/credential-providers@^3.186.0":
|
||||
version "3.496.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.496.0.tgz#ca41a6ee1a8de4b3a44c08624ebd0137cbfd5097"
|
||||
integrity sha512-JqdSHFY3t+QMdS7Iok/ymvU3bZjVY7YuX9xroJJjMM/gkw+TxnJtVw/uIGsmoK1FT2KX+Dg4i/gmVyQAWubSJw==
|
||||
version "3.501.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.501.0.tgz#15321a2028e9ee36d5333da222386abb81e24553"
|
||||
integrity sha512-nyfGzzYKcAny2kUyQjVDhSzfFTwkfZjGyJZ79WaLkNcCsVSsHBbptPRmRV2b4N0EoHTCfGqkbB02as4av/OQrw==
|
||||
dependencies:
|
||||
"@aws-sdk/client-cognito-identity" "3.496.0"
|
||||
"@aws-sdk/client-cognito-identity" "3.501.0"
|
||||
"@aws-sdk/client-sso" "3.496.0"
|
||||
"@aws-sdk/client-sts" "3.496.0"
|
||||
"@aws-sdk/credential-provider-cognito-identity" "3.496.0"
|
||||
"@aws-sdk/client-sts" "3.501.0"
|
||||
"@aws-sdk/credential-provider-cognito-identity" "3.501.0"
|
||||
"@aws-sdk/credential-provider-env" "3.496.0"
|
||||
"@aws-sdk/credential-provider-http" "3.496.0"
|
||||
"@aws-sdk/credential-provider-ini" "3.496.0"
|
||||
"@aws-sdk/credential-provider-node" "3.496.0"
|
||||
"@aws-sdk/credential-provider-ini" "3.501.0"
|
||||
"@aws-sdk/credential-provider-node" "3.501.0"
|
||||
"@aws-sdk/credential-provider-process" "3.496.0"
|
||||
"@aws-sdk/credential-provider-sso" "3.496.0"
|
||||
"@aws-sdk/credential-provider-sso" "3.501.0"
|
||||
"@aws-sdk/credential-provider-web-identity" "3.496.0"
|
||||
"@aws-sdk/types" "3.496.0"
|
||||
"@smithy/credential-provider-imds" "^2.2.1"
|
||||
|
|
@ -402,10 +402,10 @@
|
|||
"@smithy/util-middleware" "^2.1.1"
|
||||
tslib "^2.5.0"
|
||||
|
||||
"@aws-sdk/token-providers@3.496.0":
|
||||
version "3.496.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.496.0.tgz#5b5baf0801fd591de4a28146afbdc8250197f9fa"
|
||||
integrity sha512-fyi8RcObEa1jNETJdc2H6q9VHrrdKCj/b6+fbLvymb7mUVRd0aWUn+24SNUImnSOnrwYnwaMfyyEC388X4MbFQ==
|
||||
"@aws-sdk/token-providers@3.501.0":
|
||||
version "3.501.0"
|
||||
resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.501.0.tgz#33fc8130ffecfa99b88a54ebaa74ff3225f79875"
|
||||
integrity sha512-MvLPhNxlStmQqVm2crGLUqYWvK/AbMmI9j4FbEfJ15oG/I+730zjSJQEy2MvdiqbJRDPZ/tRCL89bUedOrmi0g==
|
||||
dependencies:
|
||||
"@aws-crypto/sha256-browser" "3.0.0"
|
||||
"@aws-crypto/sha256-js" "3.0.0"
|
||||
|
|
@ -498,9 +498,9 @@
|
|||
tslib "^2.3.1"
|
||||
|
||||
"@babel/cli@^7.16.0":
|
||||
version "7.23.4"
|
||||
resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.23.4.tgz#f5cc90487278065fa0c3b1267cf0c1d44ddf85a7"
|
||||
integrity sha512-j3luA9xGKCXVyCa5R7lJvOMM+Kc2JEnAEIgz2ggtjQ/j5YUVgfsg/WsG95bbsgq7YLHuiCOzMnoSasuY16qiCw==
|
||||
version "7.23.9"
|
||||
resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.23.9.tgz#06b3e76376ee53f14ac8ac422c884950c69e1b9e"
|
||||
integrity sha512-vB1UXmGDNEhcf1jNAHKT9IlYk1R+hehVTLFlCLHBi8gfuHQGP6uRjgXVYU0EVlI/qwAWpstqkBdf2aez3/z/5Q==
|
||||
dependencies:
|
||||
"@jridgewell/trace-mapping" "^0.3.17"
|
||||
commander "^4.0.1"
|
||||
|
|
@ -513,7 +513,7 @@
|
|||
"@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3"
|
||||
chokidar "^3.4.0"
|
||||
|
||||
"@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5":
|
||||
"@babel/code-frame@^7.23.5":
|
||||
version "7.23.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
|
||||
integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
|
||||
|
|
@ -527,20 +527,20 @@
|
|||
integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
|
||||
|
||||
"@babel/core@^7.16.5":
|
||||
version "7.23.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.7.tgz#4d8016e06a14b5f92530a13ed0561730b5c6483f"
|
||||
integrity sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==
|
||||
version "7.23.9"
|
||||
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1"
|
||||
integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==
|
||||
dependencies:
|
||||
"@ampproject/remapping" "^2.2.0"
|
||||
"@babel/code-frame" "^7.23.5"
|
||||
"@babel/generator" "^7.23.6"
|
||||
"@babel/helper-compilation-targets" "^7.23.6"
|
||||
"@babel/helper-module-transforms" "^7.23.3"
|
||||
"@babel/helpers" "^7.23.7"
|
||||
"@babel/parser" "^7.23.6"
|
||||
"@babel/template" "^7.22.15"
|
||||
"@babel/traverse" "^7.23.7"
|
||||
"@babel/types" "^7.23.6"
|
||||
"@babel/helpers" "^7.23.9"
|
||||
"@babel/parser" "^7.23.9"
|
||||
"@babel/template" "^7.23.9"
|
||||
"@babel/traverse" "^7.23.9"
|
||||
"@babel/types" "^7.23.9"
|
||||
convert-source-map "^2.0.0"
|
||||
debug "^4.1.0"
|
||||
gensync "^1.0.0-beta.2"
|
||||
|
|
@ -647,14 +647,14 @@
|
|||
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
|
||||
integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
|
||||
|
||||
"@babel/helpers@^7.23.7":
|
||||
version "7.23.8"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.8.tgz#fc6b2d65b16847fd50adddbd4232c76378959e34"
|
||||
integrity sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==
|
||||
"@babel/helpers@^7.23.9":
|
||||
version "7.23.9"
|
||||
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.9.tgz#c3e20bbe7f7a7e10cb9b178384b4affdf5995c7d"
|
||||
integrity sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==
|
||||
dependencies:
|
||||
"@babel/template" "^7.22.15"
|
||||
"@babel/traverse" "^7.23.7"
|
||||
"@babel/types" "^7.23.6"
|
||||
"@babel/template" "^7.23.9"
|
||||
"@babel/traverse" "^7.23.9"
|
||||
"@babel/types" "^7.23.9"
|
||||
|
||||
"@babel/highlight@^7.23.4":
|
||||
version "7.23.4"
|
||||
|
|
@ -666,21 +666,21 @@
|
|||
js-tokens "^4.0.0"
|
||||
|
||||
"@babel/node@^7.16.5":
|
||||
version "7.22.19"
|
||||
resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.22.19.tgz#d0bd1e84e3d45eb2eeb68046d6dc22161786222b"
|
||||
integrity sha512-VsKSO9aEHdO16NdtqkJfrXZ9Sxlna1BVnBbToWr1KGdI3cyIk6KqOoa8mWvpK280lJDOwJqxvnl994KmLhq1Yw==
|
||||
version "7.23.9"
|
||||
resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.23.9.tgz#fc40dc371439f1a45535ebf515232f4f046ef7a9"
|
||||
integrity sha512-/d4ju/POwlGIJlZ+NqWH1qu61wt6ZlTZZZutrK2MOSdaH1JCh726nLw/GSvAjG+LTY6CO9SsB8uWcttnFKm6yg==
|
||||
dependencies:
|
||||
"@babel/register" "^7.22.15"
|
||||
"@babel/register" "^7.23.7"
|
||||
commander "^4.0.1"
|
||||
core-js "^3.30.2"
|
||||
node-environment-flags "^1.0.5"
|
||||
regenerator-runtime "^0.14.0"
|
||||
v8flags "^3.1.1"
|
||||
|
||||
"@babel/parser@^7.22.15", "@babel/parser@^7.23.6", "@babel/parser@^7.4.3":
|
||||
version "7.23.6"
|
||||
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b"
|
||||
integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==
|
||||
"@babel/parser@^7.23.9", "@babel/parser@^7.4.3":
|
||||
version "7.23.9"
|
||||
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b"
|
||||
integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==
|
||||
|
||||
"@babel/plugin-syntax-jsx@^7.23.3":
|
||||
version "7.23.3"
|
||||
|
|
@ -700,7 +700,7 @@
|
|||
"@babel/plugin-syntax-jsx" "^7.23.3"
|
||||
"@babel/types" "^7.23.4"
|
||||
|
||||
"@babel/register@^7.22.15":
|
||||
"@babel/register@^7.23.7":
|
||||
version "7.23.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.23.7.tgz#485a5e7951939d21304cae4af1719fdb887bc038"
|
||||
integrity sha512-EjJeB6+kvpk+Y5DAkEAmbOBEFkh9OASx0huoEkqYTFxAZHzOAX2Oh5uwAUuL2rUddqfM0SA+KPXV2TbzoZ2kvQ==
|
||||
|
|
@ -711,19 +711,19 @@
|
|||
pirates "^4.0.6"
|
||||
source-map-support "^0.5.16"
|
||||
|
||||
"@babel/template@^7.22.15", "@babel/template@^7.4.0":
|
||||
version "7.22.15"
|
||||
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
|
||||
integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
|
||||
"@babel/template@^7.22.15", "@babel/template@^7.23.9", "@babel/template@^7.4.0":
|
||||
version "7.23.9"
|
||||
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.23.9.tgz#f881d0487cba2828d3259dcb9ef5005a9731011a"
|
||||
integrity sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==
|
||||
dependencies:
|
||||
"@babel/code-frame" "^7.22.13"
|
||||
"@babel/parser" "^7.22.15"
|
||||
"@babel/types" "^7.22.15"
|
||||
"@babel/code-frame" "^7.23.5"
|
||||
"@babel/parser" "^7.23.9"
|
||||
"@babel/types" "^7.23.9"
|
||||
|
||||
"@babel/traverse@^7.23.7", "@babel/traverse@^7.4.3":
|
||||
version "7.23.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.7.tgz#9a7bf285c928cb99b5ead19c3b1ce5b310c9c305"
|
||||
integrity sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==
|
||||
"@babel/traverse@^7.23.9", "@babel/traverse@^7.4.3":
|
||||
version "7.23.9"
|
||||
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.9.tgz#2f9d6aead6b564669394c5ce0f9302bb65b9d950"
|
||||
integrity sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==
|
||||
dependencies:
|
||||
"@babel/code-frame" "^7.23.5"
|
||||
"@babel/generator" "^7.23.6"
|
||||
|
|
@ -731,15 +731,15 @@
|
|||
"@babel/helper-function-name" "^7.23.0"
|
||||
"@babel/helper-hoist-variables" "^7.22.5"
|
||||
"@babel/helper-split-export-declaration" "^7.22.6"
|
||||
"@babel/parser" "^7.23.6"
|
||||
"@babel/types" "^7.23.6"
|
||||
"@babel/parser" "^7.23.9"
|
||||
"@babel/types" "^7.23.9"
|
||||
debug "^4.3.1"
|
||||
globals "^11.1.0"
|
||||
|
||||
"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.23.6", "@babel/types@^7.4.0":
|
||||
version "7.23.6"
|
||||
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd"
|
||||
integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==
|
||||
"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.4.0":
|
||||
version "7.23.9"
|
||||
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002"
|
||||
integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==
|
||||
dependencies:
|
||||
"@babel/helper-string-parser" "^7.23.4"
|
||||
"@babel/helper-validator-identifier" "^7.22.20"
|
||||
|
|
@ -1425,9 +1425,9 @@
|
|||
"@types/node" "*"
|
||||
|
||||
"@types/node@*":
|
||||
version "20.11.5"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.5.tgz#be10c622ca7fcaa3cf226cf80166abc31389d86e"
|
||||
integrity sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==
|
||||
version "20.11.9"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.9.tgz#959d436f20ce2ee3df897c3eaa0617c98fa70efb"
|
||||
integrity sha512-CQXNuMoS/VcoAMISe5pm4JnEd1Br5jildbQEToEMQvutmv+EaQr90ry9raiudgpyDuqFiV9e4rnjSfLNq12M5w==
|
||||
dependencies:
|
||||
undici-types "~5.26.4"
|
||||
|
||||
|
|
@ -2489,9 +2489,9 @@ axios@^0.27.2:
|
|||
form-data "^4.0.0"
|
||||
|
||||
axios@^1.6.0:
|
||||
version "1.6.5"
|
||||
resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.5.tgz#2c090da14aeeab3770ad30c3a1461bc970fb0cd8"
|
||||
integrity sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==
|
||||
version "1.6.7"
|
||||
resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7"
|
||||
integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==
|
||||
dependencies:
|
||||
follow-redirects "^1.15.4"
|
||||
form-data "^4.0.0"
|
||||
|
|
@ -3222,12 +3222,12 @@ brotli@^1.3.3:
|
|||
base64-js "^1.1.2"
|
||||
|
||||
browserslist@^4.22.2:
|
||||
version "4.22.2"
|
||||
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b"
|
||||
integrity sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==
|
||||
version "4.22.3"
|
||||
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.3.tgz#299d11b7e947a6b843981392721169e27d60c5a6"
|
||||
integrity sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==
|
||||
dependencies:
|
||||
caniuse-lite "^1.0.30001565"
|
||||
electron-to-chromium "^1.4.601"
|
||||
caniuse-lite "^1.0.30001580"
|
||||
electron-to-chromium "^1.4.648"
|
||||
node-releases "^2.0.14"
|
||||
update-browserslist-db "^1.0.13"
|
||||
|
||||
|
|
@ -3411,10 +3411,10 @@ camelcase@^5.0.0:
|
|||
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
|
||||
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
|
||||
|
||||
caniuse-lite@^1.0.30001565:
|
||||
version "1.0.30001579"
|
||||
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001579.tgz#45c065216110f46d6274311a4b3fcf6278e0852a"
|
||||
integrity sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==
|
||||
caniuse-lite@^1.0.30001580:
|
||||
version "1.0.30001581"
|
||||
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001581.tgz#0dfd4db9e94edbdca67d57348ebc070dece279f4"
|
||||
integrity sha512-whlTkwhqV2tUmP3oYhtNfaWGYHDdS3JYFQBKXxcUR9qqPWsRhFHhoISO2Xnl/g0xyKzht9mI1LZpiNWfMzHixQ==
|
||||
|
||||
caseless@~0.12.0:
|
||||
version "0.12.0"
|
||||
|
|
@ -3946,9 +3946,9 @@ core-js@^2.0.1, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0:
|
|||
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
|
||||
|
||||
core-js@^3.30.2:
|
||||
version "3.35.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.35.0.tgz#58e651688484f83c34196ca13f099574ee53d6b4"
|
||||
integrity sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg==
|
||||
version "3.35.1"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.35.1.tgz#9c28f8b7ccee482796f8590cc8d15739eaaf980c"
|
||||
integrity sha512-IgdsbxNyMskrTFxa9lWHyMwAJU5gXOPP+1yO+K59d50VLVAIDAbs7gIv705KzALModfK3ZrSZTPNpC0PQgIZuw==
|
||||
|
||||
core-util-is@1.0.2:
|
||||
version "1.0.2"
|
||||
|
|
@ -4371,10 +4371,10 @@ ee-first@1.1.1:
|
|||
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
|
||||
integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
|
||||
|
||||
electron-to-chromium@^1.4.601:
|
||||
version "1.4.640"
|
||||
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.640.tgz#76290a36fa4b5f1f4cadaf1fc582478ebb3ac246"
|
||||
integrity sha512-z/6oZ/Muqk4BaE7P69bXhUhpJbUM9ZJeka43ZwxsDshKtePns4mhBlh8bU5+yrnOnz3fhG82XLzGUXazOmsWnA==
|
||||
electron-to-chromium@^1.4.648:
|
||||
version "1.4.648"
|
||||
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.648.tgz#c7b46c9010752c37bb4322739d6d2dd82354fbe4"
|
||||
integrity sha512-EmFMarXeqJp9cUKu/QEciEApn0S/xRcpZWuAm32U7NgoZCimjsilKXHRO9saeEW55eHZagIDg6XTUOv32w9pjg==
|
||||
|
||||
emoji-regex@^7.0.1:
|
||||
version "7.0.3"
|
||||
|
|
@ -5330,9 +5330,9 @@ globalthis@^1.0.3:
|
|||
define-properties "^1.1.3"
|
||||
|
||||
google-auth-library@^9.0.0:
|
||||
version "9.4.2"
|
||||
resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.4.2.tgz#4831150d2c049c37450a81141be34027657c38b6"
|
||||
integrity sha512-rTLO4gjhqqo3WvYKL5IdtlCvRqeQ4hxUx/p4lObobY2xotFW3bCQC+Qf1N51CYOfiqfMecdMwW9RIo7dFWYjqw==
|
||||
version "9.5.0"
|
||||
resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.5.0.tgz#fd97b78bc1512025b9c9ad3998c60e2d75b6137e"
|
||||
integrity sha512-OUbP509lWVlZxuMY+Cgomw49VzZFP9myIcVeYEpeBlbXJbPC4R+K4BmO9hd3ciYM5QIwm5W1PODcKjqxtkye9Q==
|
||||
dependencies:
|
||||
base64-js "^1.3.0"
|
||||
ecdsa-sig-formatter "^1.0.11"
|
||||
|
|
@ -6963,9 +6963,9 @@ lower-case@^1.1.1:
|
|||
integrity sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==
|
||||
|
||||
lru-cache@^10.0.1:
|
||||
version "10.1.0"
|
||||
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484"
|
||||
integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==
|
||||
version "10.2.0"
|
||||
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
|
||||
integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==
|
||||
|
||||
lru-cache@^4.0.1:
|
||||
version "4.1.5"
|
||||
|
|
@ -9502,9 +9502,9 @@ spdx-correct@^3.0.0:
|
|||
spdx-license-ids "^3.0.0"
|
||||
|
||||
spdx-exceptions@^2.1.0:
|
||||
version "2.3.0"
|
||||
resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
|
||||
integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
|
||||
version "2.4.0"
|
||||
resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.4.0.tgz#c07a4ede25b16e4f78e6707bbd84b15a45c19c1b"
|
||||
integrity sha512-hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw==
|
||||
|
||||
spdx-expression-parse@^3.0.0:
|
||||
version "3.0.1"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "audiowaveform";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bbc";
|
||||
repo = "audiowaveform";
|
||||
rev = version;
|
||||
sha256 = "sha256-I9reh4ktBOvhtjh5L1LzpkZSjDb0adIYJFtjGfBBvA8=";
|
||||
sha256 = "sha256-FcQq0xWs3jH2MfhFQ5r5Vaz8B3akBHBSg8Z/k9An/Wg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gtest ];
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "maskromtool";
|
||||
version = "2024-01-1";
|
||||
version = "2024-01-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "travisgoodspeed";
|
||||
repo = "maskromtool";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iKzq0hH45uHtWr2QZsVSPUZjmU6rXUGqVQ8SlIhOuJ0=";
|
||||
hash = "sha256-jYnJgZ4bn5NDSzNyhb46xnmzbF9Y59shw8y/2zmxiVM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "github-backup";
|
||||
version = "0.44.1";
|
||||
version = "0.45.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tOCIrquhBS7aNeFocu8M9JV19vfFwrfIsaaePCp2vPw=";
|
||||
hash = "sha256-bT5eqhpSK9u6Q4hO8FTgbpjjv0x2am1m2fOw5OqxixQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ytcast";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MarcoLucidi01";
|
||||
repo = "ytcast";
|
||||
rev = "v${version}";
|
||||
sha256 = "0f45ai1s4njhcvbv088yn10i3vdvlm6wlfi0ijq5gak1dg02klma";
|
||||
sha256 = "sha256-iy9+MgXwP4ALz4NHJyn2ghC5boR53H3ioB2+7tcJunE=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
686
pkgs/tools/networking/bandwhich/Cargo.lock
generated
686
pkgs/tools/networking/bandwhich/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bandwhich";
|
||||
version = "0.21.1";
|
||||
version = "0.22.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imsnif";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9+7ol2QSIXLkkRt/YlAobZHb3Tm+SmnjW/JufwimMTE=";
|
||||
hash = "sha256-/uG1xjhxnIkS3rq7Tv1q1v8X7p1baDB8OiSEV9OLyfo=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
|||
|
|
@ -31,16 +31,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "netbird";
|
||||
version = "0.25.4";
|
||||
version = "0.25.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-M6n7uD1HPG0RA8PqNc7misIM9+w3uoJDjRhRcBQZKZM=";
|
||||
hash = "sha256-b+zwDKuB6RRWCZTIjFIW9KA9N7KJhX7gdFJvDk0RtGc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HPP1XOOX0YShrsMFwmfJ1CZq9wHjqYSFK+a+b7FEFdc=";
|
||||
vendorHash = "sha256-vdGF7mIpE1PgCRsRCWE7cziKp9ZaIcxYUU6FREsFb70=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,21 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dalfox";
|
||||
version = "2.9.1";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hahwul";
|
||||
repo = pname;
|
||||
repo = "dalfox";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-7wSmPmS8m+rYhYlREzKlPUiUfDvru9zwFFvSCDq6JY8=";
|
||||
hash = "sha256-sKW6UYSPgXkZbLiOeYru/XpG/Cpvvhwos6Z5J/WxjXo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-W+37EL3e7G+U0EZUDuVqjZpfIf5+HcirH8NVsC+1NvA=";
|
||||
vendorHash = "sha256-0eNaH82iCmxaie+nA9qxEWb8Uq6LaEQoU9wRFJ+GFv0=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
];
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,172 +1,106 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
impacket = super.impacket.overridePythonAttrs {
|
||||
version = "0.12.0.dev1";
|
||||
version = "0.12.0.dev1-unstable-2023-11-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Pennyw0rth";
|
||||
repo = "impacket";
|
||||
rev = "d370e6359a410063b2c9c68f6572c3b5fb178a38";
|
||||
hash = "sha256-Jozn4lKAnLQ2I53+bx0mFY++OH5P4KyqVmrS5XJUY3E=";
|
||||
};
|
||||
};
|
||||
bloodhound-py = super.bloodhound-py.overridePythonAttrs (old: {
|
||||
propagatedBuildInputs =
|
||||
lib.lists.remove super.impacket old.propagatedBuildInputs
|
||||
++ [ self.impacket ];
|
||||
});
|
||||
# Fix version to be compliant with Python packaging rules
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'version="{}.{}.{}.{}{}"' 'version="{}.{}.{}"'
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
python-easyconfig = buildPythonPackage rec {
|
||||
pname = "python-easyconfig";
|
||||
version = "0.1.7";
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Python-EasyConfig";
|
||||
hash = "sha256-tUjxmrhQtVFU9hFi8xTj27J24R47JpUbio+gaDwGuyk=";
|
||||
};
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
six
|
||||
pyyaml
|
||||
];
|
||||
};
|
||||
|
||||
jsonform = buildPythonPackage rec {
|
||||
pname = "jsonform";
|
||||
version = "0.0.2";
|
||||
doCheck = false;
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "JsonForm";
|
||||
hash = "sha256-cfi3ohU44wyphLad3gTwKYDNbNwhg6GKp8oC2VCZiOY=";
|
||||
};
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
jsonschema
|
||||
];
|
||||
};
|
||||
|
||||
jsonsir = buildPythonPackage rec {
|
||||
pname = "jsonsir";
|
||||
version = "0.0.2";
|
||||
doCheck = false;
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "JsonSir";
|
||||
hash = "sha256-QBRHxekx94h4Uc6b8kB/401aqwsUZ7sku787dg5b0/s=";
|
||||
};
|
||||
};
|
||||
|
||||
dploot = buildPythonPackage rec {
|
||||
pname = "dploot";
|
||||
version = "2.2.4";
|
||||
pyproject = true;
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-40/5KOlEFvPL9ohCfR3kqoikpKFfJO22MToq3GhamKM=";
|
||||
};
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
impacket
|
||||
cryptography
|
||||
pyasn1
|
||||
lxml
|
||||
];
|
||||
};
|
||||
|
||||
resource = buildPythonPackage rec {
|
||||
pname = "resource";
|
||||
version = "0.2.1";
|
||||
doCheck = false;
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Resource";
|
||||
hash = "sha256-mDVKvY7+c9WhDyEJnYC774Xs7ffKIqQW/yAlClGs2RY=";
|
||||
};
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
python-easyconfig
|
||||
jsonform
|
||||
jsonsir
|
||||
];
|
||||
};
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "netexec";
|
||||
version = "1.1.0";
|
||||
version = "1.1.0-unstable-2024-01-15";
|
||||
pyproject = true;
|
||||
doCheck = true;
|
||||
pythonRelaxDeps = true;
|
||||
pythonRemoveDeps = [
|
||||
# Fail to detect dev version requirement
|
||||
"neo4j"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Pennyw0rth";
|
||||
repo = "NetExec";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cNkZoIdfrKs5ZvHGKGBybCWGwA6C4rqjCOEM+pX70S8=";
|
||||
rev = "9df72e2f68b914dfdbd75b095dd8f577e992615f";
|
||||
hash = "sha256-oQHtTE5hdlxHX4uc412VfNUrN0UHVbwI0Mm9kmJpNW4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '{ git = "https://github.com/Pennyw0rth/impacket.git", branch = "gkdi" }' '"*"' \
|
||||
--replace '{ git = "https://github.com/Pennyw0rth/oscrypto" }' '"*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
requests
|
||||
aardwolf
|
||||
aioconsole
|
||||
aiosqlite
|
||||
argcomplete
|
||||
asyauth
|
||||
beautifulsoup4
|
||||
bloodhound-py
|
||||
dploot
|
||||
dsinternals
|
||||
impacket
|
||||
lsassy
|
||||
termcolor
|
||||
masky
|
||||
minikerberos
|
||||
msgpack
|
||||
neo4j
|
||||
oscrypto
|
||||
paramiko
|
||||
pyasn1-modules
|
||||
pylnk3
|
||||
pypsrp
|
||||
paramiko
|
||||
impacket
|
||||
dsinternals
|
||||
xmltodict
|
||||
terminaltables
|
||||
aioconsole
|
||||
pywerview
|
||||
minikerberos
|
||||
pypykatz
|
||||
aardwolf
|
||||
dploot
|
||||
bloodhound-py
|
||||
asyauth
|
||||
masky
|
||||
sqlalchemy
|
||||
aiosqlite
|
||||
pyasn1-modules
|
||||
rich
|
||||
python-libnmap
|
||||
resource
|
||||
oscrypto
|
||||
pywerview
|
||||
requests
|
||||
rich
|
||||
sqlalchemy
|
||||
termcolor
|
||||
terminaltables
|
||||
xmltodict
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python.pkgs; [
|
||||
pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '{ git = "https://github.com/Pennyw0rth/impacket.git", branch = "gkdi" }' '"*"'
|
||||
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '{ git = "https://github.com/Pennyw0rth/oscrypto" }' '"*"'
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Network service exploitation tool (Maintaned fork of CrackMapExec)";
|
||||
description = "Network service exploitation tool (maintained fork of CrackMapExec)";
|
||||
homepage = "https://github.com/Pennyw0rth/NetExec";
|
||||
changelog = "https://github.com/Pennyw0rth/NetExec/releases/tag/v${version}";
|
||||
license = with licenses; [ bsd2 ];
|
||||
mainProgram = "nxc";
|
||||
maintainers = with maintainers; [ vncsb ];
|
||||
# FIXME: failing fixupPhase:
|
||||
# $ Rewriting #!/nix/store/<hash>-python3-3.11.7/bin/python3.11 to #!/nix/store/<hash>-python3-3.11.7
|
||||
# $ /nix/store/<hash>-wrap-python-hook/nix-support/setup-hook: line 65: 47758 Killed: 9 sed -i "$f" -e "1 s^#!/nix/store/<hash>-python3-3.11.7^#!/nix/store/<hash>-python3-3.11.7^"
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "markdownlint-cli";
|
||||
version = "0.38.0";
|
||||
version = "0.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "igorshubovych";
|
||||
repo = "markdownlint-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3PiienQjyJQ/ElY4j0Ccu+r6KtIu1kuPlobHqXE0GY4=";
|
||||
hash = "sha256-kNnTSSu55zqOwKCPxXhCmGOseDzAWaB6oToyWDSe0Cc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-WoXyWn58E4+Lj3LWqr/8JbvAo5IcjLgnzhIt59bSqV4=";
|
||||
npmDepsHash = "sha256-mpqLI9wYxp9g6uO/Peau51KS4KdNmVulb6sVO1uDC6c=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -31759,8 +31759,6 @@ with pkgs;
|
|||
|
||||
gthumb = callPackage ../applications/graphics/gthumb { };
|
||||
|
||||
gtimelog = with python3Packages; toPythonApplication gtimelog;
|
||||
|
||||
inherit (gnome) gucharmap;
|
||||
|
||||
guitarix = callPackage ../applications/audio/guitarix {
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue