Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
957375996a
|
|
@ -1237,12 +1237,6 @@
|
|||
githubId = 29887;
|
||||
name = "Andrew Smith";
|
||||
};
|
||||
andsild = {
|
||||
email = "andsild@gmail.com";
|
||||
github = "andsild";
|
||||
githubId = 3808928;
|
||||
name = "Anders Sildnes";
|
||||
};
|
||||
andys8 = {
|
||||
github = "andys8";
|
||||
githubId = 13085980;
|
||||
|
|
|
|||
|
|
@ -236,7 +236,8 @@ in
|
|||
--instance ${escapeShellArg instance.url} \
|
||||
--token "$TOKEN" \
|
||||
--name ${escapeShellArg instance.name} \
|
||||
--labels ${escapeShellArg (concatStringsSep "," instance.labels)}
|
||||
--labels ${escapeShellArg (concatStringsSep "," instance.labels)} \
|
||||
--config ${configFile}
|
||||
|
||||
# and write back the configured labels
|
||||
echo "$LABELS_WANTED" > "$LABELS_FILE"
|
||||
|
|
|
|||
|
|
@ -217,7 +217,6 @@ in
|
|||
sed -e "s,#secretkey#,$KEY,g" \
|
||||
-e "s,#dbpass#,$DBPASS,g" \
|
||||
-i ${runConfig}
|
||||
chmod 440 ${runConfig} ${secretKey}
|
||||
''}
|
||||
|
||||
mkdir -p ${cfg.repositoryRoot}
|
||||
|
|
@ -239,6 +238,7 @@ in
|
|||
WorkingDirectory = cfg.stateDir;
|
||||
ExecStart = "${pkgs.gogs}/bin/gogs web";
|
||||
Restart = "always";
|
||||
UMask = "0027";
|
||||
};
|
||||
|
||||
environment = {
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ with lib;
|
|||
};
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = with pkgs; [ iptables bash iproute2 ]; # required by v2rayA TProxy functionality
|
||||
path = with pkgs; [ iptables bash iproute2 ] ++ lib.optionals nftablesEnabled [ nftables ]; # required by v2rayA TProxy functionality
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -33,14 +33,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "bitcoin" else "bitcoind";
|
||||
version = "26.0";
|
||||
version = "26.1";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
|
||||
];
|
||||
# hash retrieved from signed SHA256SUMS
|
||||
sha256 = "ab1d99276e28db62d1d9f3901e85ac358d7f1ebcb942d348a9c4e46f0fcdc0a1";
|
||||
sha256 = "9164ee5d717b4a20cb09f0496544d9d32f365734814fe399f5cdb4552a9b35ee";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
|
|
|||
|
|
@ -188,7 +188,12 @@ rec {
|
|||
libxcrypt
|
||||
lttng-ust_2_12
|
||||
musl
|
||||
]++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
|
||||
expat
|
||||
libxml2
|
||||
xz
|
||||
];
|
||||
|
||||
}).overrideAttrs (attrs: {
|
||||
postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.isLinux) ''
|
||||
(
|
||||
|
|
|
|||
|
|
@ -2093,6 +2093,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/";
|
||||
};
|
||||
|
||||
cmp_yanky = buildVimPlugin {
|
||||
pname = "cmp_yanky";
|
||||
version = "2023-11-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrisgrieser";
|
||||
repo = "cmp_yanky";
|
||||
rev = "c3d089186ccead26eba01023502f3eeadd7a92d2";
|
||||
sha256 = "sha256-jWNoKzY0x5GPFP7JsQi4nqgg1YFJV4DqxwJRqsg6KaQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/chrisgrieser/cmp_yanky";
|
||||
};
|
||||
|
||||
cobalt2-nvim = buildVimPlugin {
|
||||
pname = "cobalt2.nvim";
|
||||
version = "2024-04-01";
|
||||
|
|
@ -2381,6 +2393,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/tamago324/compe-zsh/";
|
||||
};
|
||||
|
||||
competitest-nvim = buildVimPlugin {
|
||||
pname = "competitest.nvim";
|
||||
version = "2024-01-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "xeluxee";
|
||||
repo = "competitest.nvim";
|
||||
rev = "c3cb0e2b0916a879c4d3dcb5737e6c046dd0afc5";
|
||||
sha256 = "16mycxnxa425rnl1xdk740ng6mg693ywzx5wsa56xr8nvxkms700";
|
||||
};
|
||||
meta.homepage = "https://github.com/xeluxee/competitest.nvim/";
|
||||
};
|
||||
|
||||
compiler-explorer-nvim = buildVimPlugin {
|
||||
pname = "compiler-explorer.nvim";
|
||||
version = "2023-05-29";
|
||||
|
|
|
|||
|
|
@ -404,6 +404,13 @@
|
|||
'';
|
||||
};
|
||||
|
||||
competitest-nvim = super.competitest-nvim.overrideAttrs {
|
||||
dependencies = [ self.nui-nvim ];
|
||||
|
||||
doInstallCheck = true;
|
||||
nvimRequireCheck = "competitest";
|
||||
};
|
||||
|
||||
compe-tabnine = super.compe-tabnine.overrideAttrs {
|
||||
buildInputs = [ tabnine ];
|
||||
|
||||
|
|
|
|||
|
|
@ -174,6 +174,7 @@ https://github.com/pontusk/cmp-vimwiki-tags/,HEAD,
|
|||
https://github.com/hrsh7th/cmp-vsnip/,,
|
||||
https://github.com/tamago324/cmp-zsh/,HEAD,
|
||||
https://github.com/saadparwaiz1/cmp_luasnip/,,
|
||||
https://github.com/chrisgrieser/cmp_yanky/,HEAD,
|
||||
https://github.com/lalitmee/cobalt2.nvim/,,
|
||||
https://github.com/vn-ki/coc-clap/,,
|
||||
https://github.com/neoclide/coc-denite/,,
|
||||
|
|
@ -198,6 +199,7 @@ https://github.com/hrsh7th/compe-conjure/,,
|
|||
https://github.com/GoldsteinE/compe-latex-symbols/,,
|
||||
https://github.com/tzachar/compe-tabnine/,,
|
||||
https://github.com/tamago324/compe-zsh/,,
|
||||
https://github.com/xeluxee/competitest.nvim/,HEAD,
|
||||
https://github.com/krady21/compiler-explorer.nvim/,HEAD,
|
||||
https://github.com/steelsojka/completion-buffers/,,
|
||||
https://github.com/nvim-lua/completion-nvim/,,
|
||||
|
|
|
|||
|
|
@ -2116,6 +2116,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
hbenl.vscode-test-explorer = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-test-explorer";
|
||||
publisher = "hbenl";
|
||||
version = "2.21.1";
|
||||
sha256 = "sha256-fHyePd8fYPt7zPHBGiVmd8fRx+IM3/cSBCyiI/C0VAg=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/hbenl/vscode-test-explorer/blob/master/CHANGELOG.md";
|
||||
description = "A Visual Studio Code extension that runs your tests in the sidebar";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=hbenl.vscode-test-explorer";
|
||||
homepage = "https://github.com/hbenl/vscode-test-explorer";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
hediet.vscode-drawio = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-drawio";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "overmind";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
@ -14,10 +14,10 @@ buildGoModule rec {
|
|||
owner = "DarthSim";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/reRiSeYf8tnSUJICMDp7K7XZCYvTDFInPJ1xFuAqRs=";
|
||||
sha256 = "sha256-wX29nFmzmbxbaXtwIWZNvueXFv9SKIOqexkc5pEITpw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6/S5Sf2vvCp2RpRqcJPVc9mvMuPVn4Kj9QpSIlu6YFU=";
|
||||
vendorHash = "sha256-XhF4oizOZ6g0351Q71Wp9IA3aFpocC5xGovDefIoL78=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/DarthSim/overmind";
|
||||
|
|
|
|||
|
|
@ -14,26 +14,26 @@
|
|||
|
||||
let
|
||||
|
||||
wasm-bindgen-84 = wasm-bindgen-cli.override {
|
||||
version = "0.2.84";
|
||||
hash = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk=";
|
||||
cargoHash = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50=";
|
||||
wasm-bindgen-92 = wasm-bindgen-cli.override {
|
||||
version = "0.2.92";
|
||||
hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0=";
|
||||
cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0=";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pagefind";
|
||||
version = "1.0.4";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudcannon";
|
||||
repo = "pagefind";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IN+l5Wq89tjppE0xCcvczQSkJc1CLymEFeieJhvQQ54=";
|
||||
hash = "sha256-pcgcu9zylSTjj5rxNff+afFBWVpN5sGtlpadG1wb93M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-T7DBuqfpqaEmu9iItnFYsJVnEFxG1r9uXEkfqJp1mD8=";
|
||||
cargoHash = "sha256-E4gjG5GrVWkMKgjQiAvEiSy2/tx/yHKe+5isveMZ9tU=";
|
||||
|
||||
env.npmDeps_web_js = fetchNpmDeps {
|
||||
name = "npm-deps-web-js";
|
||||
|
|
@ -50,6 +50,11 @@ rustPlatform.buildRustPackage rec {
|
|||
src = "${src}/pagefind_ui/modular";
|
||||
hash = "sha256-O0RqZUsRFtByxMQdwNGNcN38Rh+sDqqNo9YlBcrnsF4=";
|
||||
};
|
||||
env.cargoDeps_web = rustPlatform.fetchCargoTarball {
|
||||
name = "cargo-deps-web";
|
||||
src = "${src}/pagefind_web/";
|
||||
hash = "sha256-vDkVXyDePKgYTYE5ZTLLfOHwPYfgaqP9p5/fKCQQi0g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Tricky way to run npmConfigHook multiple times
|
||||
|
|
@ -60,6 +65,11 @@ rustPlatform.buildRustPackage rec {
|
|||
npmRoot=pagefind_ui/default npmDeps=$npmDeps_ui_default npmConfigHook
|
||||
npmRoot=pagefind_ui/modular npmDeps=$npmDeps_ui_modular npmConfigHook
|
||||
)
|
||||
(
|
||||
cd pagefind_web
|
||||
cargoDeps=$cargoDeps_web cargoSetupPostUnpackHook
|
||||
cargoDeps=$cargoDeps_web cargoSetupPostPatchHook
|
||||
)
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -68,7 +78,7 @@ rustPlatform.buildRustPackage rec {
|
|||
nodejs
|
||||
rustc
|
||||
rustc.llvmPackages.lld
|
||||
wasm-bindgen-84
|
||||
wasm-bindgen-92
|
||||
wasm-pack
|
||||
];
|
||||
|
||||
|
|
@ -76,22 +86,27 @@ rustPlatform.buildRustPackage rec {
|
|||
# based on "test-and-build" in https://github.com/CloudCannon/pagefind/blob/main/.github/workflows/release.yml
|
||||
preBuild = ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
echo entering pagefind_web_js...
|
||||
(
|
||||
cd pagefind_web_js
|
||||
npm run build-coupled
|
||||
)
|
||||
|
||||
echo entering pagefind_web...
|
||||
(
|
||||
cd pagefind_web
|
||||
export RUSTFLAGS="-C linker=lld"
|
||||
bash ./local_build.sh
|
||||
)
|
||||
|
||||
echo entering pagefind_ui/default...
|
||||
(
|
||||
cd pagefind_ui/default
|
||||
npm run build
|
||||
)
|
||||
|
||||
echo entering pagefind_ui/modular...
|
||||
(
|
||||
cd pagefind_ui/modular
|
||||
npm run build
|
||||
|
|
|
|||
|
|
@ -66,12 +66,12 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prusa-slicer";
|
||||
version = "2.7.2";
|
||||
version = "2.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prusa3d";
|
||||
repo = "PrusaSlicer";
|
||||
hash = "sha256-IZRw6qEe4hM/Sfhx0je11vaMHeuW/e4ZP5zMTuptb2k=";
|
||||
hash = "sha256-pV9KQlZoCQZWi12VUKntKzFUuZgGpDoh1aNMoAHTbZI=";
|
||||
rev = "version_${finalAttrs.version}";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,32 +1,65 @@
|
|||
{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, libeb, lzo
|
||||
, qtmultimedia, qttools, qtwebengine, wrapQtAppsHook }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
, qttools
|
||||
, qtwebengine
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
eb = fetchFromGitHub {
|
||||
owner = "mvf";
|
||||
repo = "eb";
|
||||
rev = "58e1c3bb9847ed5d05863f478f21e7a8ca3d74c8";
|
||||
hash = "sha256-gZP+2P6fFADWht2c0hXmljVJQX8RpCq2mWP+KDi+GzE=";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "qolibri";
|
||||
version = "2.1.4";
|
||||
version = "2.1.5-unstable-2024-03-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ludios";
|
||||
owner = "mvf";
|
||||
repo = "qolibri";
|
||||
rev = version;
|
||||
sha256 = "jyLF1MKDVH0Lt8lw+O93b+LQ4J+s42O3hebthJk83hg=";
|
||||
rev = "99f0771184fcb2c5f47aad11c16002ebb8469a3f";
|
||||
hash = "sha256-ArupqwejOO2YK9a3Ky0j20dIHs1jIqJksNIb4K2jwgI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake qttools wrapQtAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libeb lzo qtmultimedia qtwebengine
|
||||
qtwebengine
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DQOLIBRI_EB_SOURCE_DIR=${eb}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -D $src/qolibri.desktop -t $out/share/applications
|
||||
install -Dm644 $src/qolibri.desktop -t $out/share/applications
|
||||
|
||||
for size in 16 32 48 64 128; do
|
||||
install -Dm644 \
|
||||
$src/images/qolibri-$size.png \
|
||||
$out/share/icons/hicolor/''${size}x''${size}/apps/qolibri.png
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ludios/qolibri";
|
||||
description = "EPWING reader for viewing Japanese dictionaries";
|
||||
mainProgram = "qolibri";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ];
|
||||
homepage = "https://github.com/mvf/qolibri";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64; # Looks like a libcxx version mismatch problem.
|
||||
mainProgram = "qolibri";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -3,10 +3,10 @@
|
|||
{
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "124.0.1";
|
||||
version = "124.0.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "282c45e5c468419536dd8b81c8ea687b10d8002d7521403330e6eeef49207143bee88a44c3785748d461ed9a72687606f5da14f4dfb98eb40a5cd08a4a12722b";
|
||||
sha512 = "8cf340de6e34812f8ae3363265859a263330af770d981c3dd1ca1e7e0cfe513604d3e68184d4aa1446569aefbdf359d561fbc200faf19a5ed020a1709d9ef10e";
|
||||
};
|
||||
|
||||
extraPatches = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "atmos";
|
||||
version = "1.66.0";
|
||||
version = "1.67.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudposse";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8cEJw4gCyh3aosck70vdLVYGOL3zR0AOpAMNv/j6rEM=";
|
||||
sha256 = "sha256-bnecb0SucLcNrrQ0PAN31Z4nNV+0wrrzMLn7OyMOS5w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-k03pRrUzHvVjKt6w40JEiJTvbwhKa/0rjkZQsnmfe68=";
|
||||
vendorHash = "sha256-oNAEe7g9kYZ4kolmVQat6l/tag0Bus7nJEfnzCrUtjA=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "civo";
|
||||
version = "1.0.77";
|
||||
version = "1.0.80";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "civo";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-W9CJAFLGarDG/Y8g2Whoh4v9hxqb8txuLfAkooW8PNM=";
|
||||
sha256 = "sha256-jzz9mny59YM5PLcQvcus3gHuRSbl/OISAOjDoS/4Y78=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Uh2/4qdJQfqQdjXbOBkUVv2nF1AN+QRKRI0+yta+G5Q=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubeshark";
|
||||
version = "52.1.77";
|
||||
version = "52.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubeshark";
|
||||
repo = "kubeshark";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BpixzQ88JfA1cS5bLMHmLhE5Si5UbC9zRf9GAELrJwM=";
|
||||
hash = "sha256-MmKkM4nc9FkZkQIURPz63ryl0yhvxBwOvxkjrsaa67U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SmvO9DYOXxnmN2dmHPPOguVwEbWSH/xNLBB+idpzopo=";
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ let
|
|||
homepage = "https://sindresorhus.com/caprine";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ShamrockLee ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
x86_64-appimage = callPackage ./build-from-appimage.nix {
|
||||
inherit pname version metaCommon;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
, range-v3
|
||||
, tl-expected
|
||||
, hunspell
|
||||
, glibmm_2_68
|
||||
, webkitgtk_6_0
|
||||
, jemalloc
|
||||
, rnnoise
|
||||
|
|
@ -64,14 +63,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "4.15.2";
|
||||
version = "4.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telegramdesktop";
|
||||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-gzwDezOmIvSF4fPHAslf8DyBAgCYkD5ySX+MKKMXhSg=";
|
||||
hash = "sha256-llrHN/XCMKwAvbyUZ/92OUjAEOPJKPbDfldVChLZo5k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -144,7 +143,6 @@ stdenv.mkDerivation rec {
|
|||
libpulseaudio
|
||||
pipewire
|
||||
hunspell
|
||||
glibmm_2_68
|
||||
webkitgtk_6_0
|
||||
jemalloc
|
||||
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
|
||||
|
|
|
|||
|
|
@ -49,6 +49,70 @@ index 7ce90d3..dac3c2c 100644
|
|||
const auto state = DetectBatteryState();
|
||||
if (!state.has || !state.draining) {
|
||||
return false;
|
||||
Submodule Telegram/lib_webrtc contains modified content
|
||||
diff --git a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm
|
||||
index 7521c08..5e22da2 100644
|
||||
--- a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm
|
||||
+++ b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm
|
||||
@@ -364,6 +364,7 @@ EnvironmentMac::EnvironmentMac(not_null<EnvironmentDelegate*> delegate)
|
||||
DefaultCaptureDeviceChangedMonitor.registerEnvironment(this);
|
||||
AudioDeviceListChangedMonitor.registerEnvironment(this);
|
||||
|
||||
+#if 0
|
||||
if (@available(macOS 14.0, *)) {
|
||||
const auto weak = base::make_weak(this);
|
||||
id block = [^(BOOL shouldBeMuted){
|
||||
@@ -387,6 +388,7 @@ EnvironmentMac::EnvironmentMac(not_null<EnvironmentDelegate*> delegate)
|
||||
setInputMuteStateChangeHandler:block
|
||||
error:nil];
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
EnvironmentMac::~EnvironmentMac() {
|
||||
@@ -537,15 +539,18 @@ void EnvironmentMac::devicesRequested(DeviceType type) {
|
||||
}
|
||||
|
||||
void EnvironmentMac::setCaptureMuted(bool muted) {
|
||||
+#if 0
|
||||
if (@available(macOS 14.0, *)) {
|
||||
if (!_captureMuteNotification) {
|
||||
const auto value = muted ? YES : NO;
|
||||
[[AVAudioApplication sharedInstance] setInputMuted:value error:nil];
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
void EnvironmentMac::captureMuteSubscribe() {
|
||||
+#if 0
|
||||
if (@available(macOS 14.0, *)) {
|
||||
id observer = [[InputMuteObserver alloc] init];
|
||||
[[[NSWorkspace sharedWorkspace] notificationCenter]
|
||||
@@ -578,6 +583,7 @@ void EnvironmentMac::captureMuteSubscribe() {
|
||||
[observer release];
|
||||
});
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
void EnvironmentMac::captureMuteUnsubscribe() {
|
||||
@@ -595,6 +601,7 @@ void EnvironmentMac::captureMuteRestartAdm() {
|
||||
void EnvironmentMac::setCaptureMuteTracker(
|
||||
not_null<CaptureMuteTracker*> tracker,
|
||||
bool track) {
|
||||
+#if 0
|
||||
if (@available(macOS 14.0, *)) {
|
||||
if (track) {
|
||||
if (!_captureMuteTracker) {
|
||||
@@ -619,6 +626,7 @@ void EnvironmentMac::setCaptureMuteTracker(
|
||||
}
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
std::unique_ptr<Environment> CreateEnvironment(
|
||||
Submodule Telegram/lib_webview contains modified content
|
||||
diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
|
||||
index 738e574..80ff5f0 100644
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, stdenv
|
||||
, mkDerivation
|
||||
, extra-cmake-modules
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, kconfig
|
||||
, kdoctools
|
||||
, kguiaddons
|
||||
|
|
@ -37,13 +37,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kstars";
|
||||
version = "3.6.9";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KDE";
|
||||
repo = "kstars";
|
||||
rev = "stable-${finalAttrs.version}";
|
||||
hash = "sha256-28RRW+ncMiQcBb/lybEKTeV08ZkF3IqLkeTHNW5nhls=";
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kstars/kstars-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-yvN1k0LqUi5Odb34Nk8UP5qoIbFUcvUiyESpoMKmuqg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@
|
|||
, patches ? [ ]
|
||||
, extraLibs ? [ ]
|
||||
, nixosTests
|
||||
# update script dependencies
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -60,7 +62,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.st;
|
||||
passthru = {
|
||||
tests.test = nixosTests.terminal-emulators.st;
|
||||
updateScript = gitUpdater {
|
||||
url = "git://git.suckless.org/st";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://st.suckless.org/";
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitsign";
|
||||
version = "0.9.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-52Vyh2aImus9ZTb082N2FRMIsfykfQ2+AVUT2VD6lJ4=";
|
||||
hash = "sha256-WaiGkbjqty/MsTWPvx5DmmaNwWTJAEFKwVqArt2oZZc=";
|
||||
};
|
||||
vendorHash = "sha256-fQTd7J2l7W3E5RQIr2hn2wp9CPHn8N8TpDqfbb3TFgI=";
|
||||
vendorHash = "sha256-p2E010k7uozpLvl9VpfG5/JyQR4mVUBKv2p78UdFlac=";
|
||||
|
||||
subPackages = [
|
||||
"."
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ let
|
|||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ ShamrockLee ];
|
||||
mainProgram = "losslesscut";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
x86_64-appimage = callPackage ./build-from-appimage.nix {
|
||||
inherit pname version metaCommon;
|
||||
|
|
|
|||
|
|
@ -64,8 +64,10 @@ in python.pkgs.buildPythonApplication rec {
|
|||
|
||||
pythonRelaxDeps = [
|
||||
"cloup"
|
||||
"isosurfaces"
|
||||
"pillow"
|
||||
"skia-pathops"
|
||||
"watchdog"
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -64,6 +64,21 @@
|
|||
"test_PointCloudDot"
|
||||
"test_Torus"
|
||||
|
||||
# test_ImplicitFunction[/test_implicit_graph] failing with:
|
||||
# E AssertionError:
|
||||
# E Not equal to tolerance rtol=1e-07, atol=1.01
|
||||
# E Frame no -1. You can use --show_diff to visually show the difference.
|
||||
# E Mismatched elements: 1185[/633] / 1639680[/1639680] (0.0723[/0.0386]%)
|
||||
# E Max absolute difference: 125[/121]
|
||||
# E Max relative difference: 6.5[/1]
|
||||
#
|
||||
# These started failing after relaxing the “watchdog” and “isosurfaces” dependencies,
|
||||
# likely due to a tolerance difference. They should, however, start working again when [1] is
|
||||
# included in a Manim release.
|
||||
# [1]: https://github.com/ManimCommunity/manim/pull/3376
|
||||
"test_ImplicitFunction"
|
||||
"test_implicit_graph"
|
||||
|
||||
# failing with:
|
||||
# TypeError: __init__() got an unexpected keyword argument 'msg' - maybe you meant pytest.mark.skipif?
|
||||
"test_force_window_opengl_render_with_movies"
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "miriway";
|
||||
version = "unstable-2024-03-15";
|
||||
version = "unstable-2024-04-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Miriway";
|
||||
repo = "Miriway";
|
||||
rev = "dcc44916d0b25dd06d792947c837cf4cd8c24925";
|
||||
hash = "sha256-LnqhIVmC5F+FAIcYW+oT4t2ovRWeoV4zHpvbNhiY7Kw=";
|
||||
rev = "ff58ed8f9f646ce11b5a43f39a03f7a916d8d695";
|
||||
hash = "sha256-oqBGAAQxYoapCn2uvXFrc8L7P3lCXUCRbWE4q6Mp+oc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -5,8 +5,7 @@
|
|||
}:
|
||||
|
||||
telegram-desktop.overrideAttrs (old: rec {
|
||||
|
||||
pname = "64Gram";
|
||||
pname = "64gram";
|
||||
version = "1.1.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-pgo";
|
||||
version = "0.2.6";
|
||||
version = "0.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kobzol";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-u3kWYPLJYarwwudRpeBdJglP9kNbLRTYgEvZT2pBBoY=";
|
||||
hash = "sha256-yt9QAgpu667JkdNS7OiB/wB9BLXXpis0ZhWjYuETteU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Peicupa2vFDzPCH0OQYk7plkWIn82o45oGutOyMlI2s=";
|
||||
cargoHash = "sha256-T49RfBInMZeTPT7HhZIwhfK48ORKDD14fcShC6lFApI=";
|
||||
|
||||
# Integration tests do not run in Nix build environment due to needing to
|
||||
# create and build Cargo workspaces.
|
||||
|
|
|
|||
|
|
@ -2,11 +2,24 @@
|
|||
, fetchFromGitHub
|
||||
, stdenvNoCC
|
||||
, makeWrapper
|
||||
, gh
|
||||
, fzf
|
||||
, coreutils
|
||||
, gawk
|
||||
, gnused
|
||||
, withBat ? false
|
||||
, bat
|
||||
}:
|
||||
|
||||
let
|
||||
binPath = lib.makeBinPath ([
|
||||
gh
|
||||
fzf
|
||||
coreutils
|
||||
gawk
|
||||
gnused
|
||||
]
|
||||
++ lib.optional withBat bat);
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "gh-f";
|
||||
version = "1.1.5";
|
||||
|
|
@ -27,7 +40,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/gh-f" --prefix PATH : "${lib.makeBinPath [fzf bat coreutils]}"
|
||||
wrapProgram "$out/bin/gh-f" --prefix PATH : "${binPath}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,55 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, stdenvNoCC
|
||||
, makeWrapper
|
||||
, gh
|
||||
, gnugrep
|
||||
, fzf
|
||||
, python3
|
||||
, withDelta ? false
|
||||
, delta
|
||||
, withBat ? false
|
||||
, bat
|
||||
}:
|
||||
let
|
||||
binPath = lib.makeBinPath ([
|
||||
gh
|
||||
gnugrep
|
||||
fzf
|
||||
python3
|
||||
]
|
||||
++ lib.optional withBat bat
|
||||
++ lib.optional withDelta delta);
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "gh-notify";
|
||||
version = "0-unstable-2024-03-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meiji163";
|
||||
repo = "gh-notify";
|
||||
rev = "0d8fa377d79cfef0f66d2f03a5921a5e598e6807";
|
||||
hash = "sha256-Ao6gUtgW7enVlWBQhlQDc8ZW/gP90atc2F4rDNUnjj8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -D -m755 "gh-notify" "$out/bin/gh-notify"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/gh-notify" --prefix PATH : "${binPath}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/meiji163/gh-notify";
|
||||
description = "GitHub CLI extension to display GitHub notifications";
|
||||
maintainers = with maintainers; [ loicreynier ];
|
||||
license = licenses.unlicense;
|
||||
mainProgram = "gh-notify";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "primecount";
|
||||
version = "7.11";
|
||||
version = "7.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimwalisch";
|
||||
repo = "primecount";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-rk2aN56gcrR7Rt3hIQun179YNWqnW/g6drB2ldBpoE4=";
|
||||
hash = "sha256-GjLLJLGMzFAN75zFAwIfFvaTm8sSC0J20HtH8tn52h8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "lib" "man" ];
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,88 @@
|
|||
{ fetchFromGitHub
|
||||
, glib
|
||||
, gtk3
|
||||
, lib
|
||||
, libsoup_3
|
||||
, networkmanager
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, webkitgtk_4_1
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rmenu";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "imgurbot12";
|
||||
repo = "rmenu";
|
||||
hash = "sha256-mzY+M7GGJDxb8s7pusRDo/xfKE/S4uxPy4klRBjVGOA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libsoup_3
|
||||
networkmanager
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"gio-0.19.0" = "sha256-+PAQNJ9sTk8aKAhA/PLQWDCKDT/cQ+ukdbem7g1J+pU=";
|
||||
"nm-0.4.0" = "sha256-53ipJU10ZhIKIF7PCw5Eo/e/reUK0qpyTyE7uIrCD88=";
|
||||
};
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
# copy themes and plugins
|
||||
mkdir $out/themes
|
||||
mkdir $out/plugins
|
||||
cp -vfr $src/themes/* $out/themes/.
|
||||
cp -vfr $src/other-plugins/* $out/plugins/.
|
||||
mv $out/bin/* $out/plugins # everything is a plugin by default
|
||||
|
||||
# rmenu and rmenu-build are actual binaries
|
||||
mv $out/plugins/rmenu $out/bin/rmenu
|
||||
mv $out/plugins/rmenu-build $out/bin/rmenu-build
|
||||
|
||||
# fix plugin names
|
||||
# desktop network pactl-audio.sh powermenu.sh run window
|
||||
mv $out/plugins/run $out/plugins/rmenu-run
|
||||
mv $out/plugins/desktop $out/plugins/rmenu-desktop
|
||||
mv $out/plugins/network $out/plugins/rmenu-network
|
||||
mv $out/plugins/window $out/plugins/rmenu-window
|
||||
|
||||
# fix config and theme
|
||||
mkdir -p $out/share/rmenu
|
||||
cp -vf $src/rmenu/public/config.yaml $out/share/rmenu/config.yaml
|
||||
sed -i "s@~\/\.config\/rmenu\/themes@$out\/themes@g" $out/share/rmenu/config.yaml
|
||||
sed -i "s@~\/\.config\/rmenu@$out\/plugins@g" $out/share/rmenu/config.yaml
|
||||
ln -sf $out/themes/dark.css $out/share/rmenu/style.css
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--suffix XDG_CONFIG_DIRS : "$out/share"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/imgurbot12/rmenu/releases/tag/v${version}";
|
||||
description = "Another customizable Application-Launcher written in Rust";
|
||||
homepage = "https://github.com/imgurbot12/rmenu";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "rmenu";
|
||||
maintainers = with lib.maintainers; [ grimmauld ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
jdk,
|
||||
ant,
|
||||
git,
|
||||
unzip,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rtg-tools";
|
||||
version = "3.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RealTimeGenomics";
|
||||
repo = "rtg-tools";
|
||||
rev = version;
|
||||
sha256 = "sha256-fMrrjrgaGxBVxn6qMq2g0oFv6qtfhZcQlkvv1E9Os6Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
ant
|
||||
jdk
|
||||
git # Required by build.xml to manage the build revision
|
||||
unzip
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
ant rtg-tools.jar
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
cp build/rtg-tools.jar $out/bin/RTG.jar
|
||||
cp installer/rtg $out/bin/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# Use a location outside nix (must be writable)
|
||||
substituteInPlace installer/rtg \
|
||||
--replace-fail '$THIS_DIR/rtg.cfg' '$HOME/.config/rtg-tools/rtg.cfg' \
|
||||
--replace-fail 'RTG_JAVA="java"' 'RTG_JAVA="${jdk}/lib/openjdk/bin/java"'
|
||||
|
||||
sed -i '/USER_JAVA_OPTS=$RTG_JAVA_OPTS/a mkdir -p $HOME/.config/rtg-tools' installer/rtg
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/RealTimeGenomics/rtg-tools";
|
||||
description = "Useful utilities for dealing with VCF files and sequence data, especially vcfeval";
|
||||
license = licenses.bsd2;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ apraga ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,15 +8,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rwpspread";
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "0xk1f0";
|
||||
repo = "rwpspread";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ACYELJU7Y4Xv+abQ/Vgo3xaP+jbO43K/CBE2yuEddko=";
|
||||
hash = "sha256-kISC3fYtwgjNRWCFniIzNaaNLnvlFL+y5J14PdcZ7fQ=";
|
||||
};
|
||||
cargoHash = "sha256-ZNWDUOEhh36YjbGZpljyXsL0g7iW6GheLi2WxCj4w+s=";
|
||||
cargoHash = "sha256-2SjgY9YIHOUXL0+Njkh/peXUWJGlyI0fW8DVvdJXWV8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "1.62.0";
|
||||
version = "1.62.1";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "tailscale-nginx-auth";
|
||||
|
|
@ -11,7 +11,7 @@ buildGoModule {
|
|||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qotoCKUb5INgdSELvJpDaDvCuzVqet5zeIazzRnYoqo=";
|
||||
hash = "sha256-gV1k+8n6vuL9q4hNaMdQLf6083Em+CC7/uTdUpehbUU=";
|
||||
};
|
||||
vendorHash = "sha256-jyRjT/CQBlmjHzilxJvMuzZQlGyJB4X/yISgWjBVDxc=";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,19 @@
|
|||
{ lib, stdenv, fetchurl, jre, makeWrapper, gitUpdater }:
|
||||
{
|
||||
fetchurl,
|
||||
gitUpdater,
|
||||
jre,
|
||||
lib,
|
||||
makeWrapper,
|
||||
stdenvNoCC,
|
||||
testers,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "wiremock";
|
||||
version = "3.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/org/wiremock/wiremock-standalone/${version}/wiremock-standalone-${version}.jar";
|
||||
url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar";
|
||||
hash = "sha256-27DIcfP5R1Qiwl2fhvUQjFsE8pTHTv5MuFqHGa+whVY=";
|
||||
};
|
||||
|
||||
|
|
@ -15,25 +23,31 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
mkdir -p "$out"/{share/wiremock,bin}
|
||||
cp ${src} "$out/share/wiremock/wiremock.jar"
|
||||
cp ${finalAttrs.src} "$out/share/wiremock/wiremock.jar"
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/${pname} \
|
||||
makeWrapper ${jre}/bin/java $out/bin/${finalAttrs.meta.mainProgram} \
|
||||
--add-flags "-jar $out/share/wiremock/wiremock.jar"
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
url = "https://github.com/wiremock/wiremock.git";
|
||||
ignoredVersions = "(alpha|beta|rc).*";
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
command = "${lib.getExe finalAttrs.finalPackage} --version";
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
updateScript = gitUpdater {
|
||||
url = "https://github.com/wiremock/wiremock.git";
|
||||
ignoredVersions = "(alpha|beta|rc).*";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A flexible tool for building mock APIs";
|
||||
homepage = "https://wiremock.org/";
|
||||
changelog = "https://github.com/wiremock/wiremock/releases/tag/${version}";
|
||||
changelog = "https://github.com/wiremock/wiremock/releases/tag/${finalAttrs.version}";
|
||||
maintainers = with lib.maintainers; [ bobvanderlinden anthonyroussel ];
|
||||
mainProgram = "wiremock";
|
||||
platforms = jre.meta.platforms;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-picker";
|
||||
version = "6.0.0";
|
||||
version = "6.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-DkSgeMALhwGeU5sDHuerpPpiN3/3m19jmwtwOjZvOVo=";
|
||||
hash = "sha256-vChSlP+lGufurvLkYbljAhc8qqqbc1bxQ2UIROreK2o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "risor";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "risor-io";
|
||||
repo = "risor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bGlJe61B5jMb1u81NvNMJDW+dNem6bNFT7DJYno5jCk=";
|
||||
hash = "sha256-tvEiboH5cGRpyBmmpu8A1UlDR1Y9XPe1pUNS0/Jvooc=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ in rec {
|
|||
Privacy resolver increasing end user privacy. Stubby is developed by
|
||||
the getdns team.
|
||||
'';
|
||||
homepage = "https://dnsprivacy.org/wiki/x/JYAT";
|
||||
homepage = "https://dnsprivacy.org/dns_privacy_daemon_-_stubby/";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@
|
|||
purs-tidy = "purs-tidy";
|
||||
purty = "purty";
|
||||
pscid = "pscid";
|
||||
pyright = "pyright";
|
||||
remod-cli = "remod";
|
||||
svelte-language-server = "svelteserver";
|
||||
teck-programmer = "teck-firmware-upgrade";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.96";
|
||||
version = "9.2.97";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = "ailment";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xc9/J360ftynKT5HYNcjR/0WX04DUDmszaAHb8h3Iao=";
|
||||
hash = "sha256-R6OBc7qK4zP0t8m26V17he8Oy39eSK8/Dm84ScnBy3s=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.96";
|
||||
version = "9.2.97";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -45,7 +45,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = "angr";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eyXjmU/K8zv5nxrt+oKkyxS00tHOYrkbTc2X9esTSSA=";
|
||||
hash = "sha256-eJkxflAQFI/sEL4JMlMe+kClnaVSxtoOrPg8HQpH78g=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
@ -87,6 +87,12 @@ buildPythonPackage rec {
|
|||
unique-log-filter
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
AngrDB = [
|
||||
sqlalchemy
|
||||
];
|
||||
};
|
||||
|
||||
setupPyBuildFlags = lib.optionals stdenv.isLinux [
|
||||
"--plat-name"
|
||||
"linux"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angrop";
|
||||
version = "9.2.8";
|
||||
version = "9.2.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = "angrop";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zmWdGbFzwLDP7MUqEprZcIgA7lAdCrafWYohAehJyh0=";
|
||||
hash = "sha256-T07Y23UDp9eL2DK5gakV8kPNGsXf+4EofZJDSW/JS1Q=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -14,6 +14,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/numerodix/ansicolor/";
|
||||
description = "A library to produce ansi color output and colored highlighting and diffing";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ andsild ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.96";
|
||||
version = "9.2.97";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = "archinfo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-g/fxj/6dMVLoW4hFtVDEjHjdJiB3KE2XB3c0ihclqeM=";
|
||||
hash = "sha256-X8rMTQvNolYjSPyXbP2i5MYTPEvQlwoUQmXeEW56wQs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -365,14 +365,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.74";
|
||||
version = "1.34.76";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Lvsns5qA9BtPc/kk3VKWtkcRrJpfVTTCvw4SUOZFJh0=";
|
||||
hash = "sha256-gE/mLhn08SlXhP4ihboCigWy1RC862UyPTfUnt4YPQc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.96";
|
||||
version = "9.2.97";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = "claripy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rXJzJCyhsScFW1L/mVARciGDlOOBCFT69VBivjV6oig=";
|
||||
hash = "sha256-ZSDG1KmVi0kZX4WmrYIyd5+zRR/rjrugm8UjFlI5pfU=";
|
||||
};
|
||||
|
||||
# z3 does not provide a dist-info, so python-runtime-deps-check will fail
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.96";
|
||||
version = "9.2.97";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = "binaries";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eC9qQCrms4pSXYTrKJlfdejhl/kzUmmyfYhjlEPpgzA=";
|
||||
hash = "sha256-FiPEqfNaAXI+xSWE+So//Uwz9k3bANHQ++nRSPKkddM=";
|
||||
};
|
||||
|
||||
in
|
||||
|
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = "cle";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-osClaoAzjf3mOng38disxxSFncbc/V7Uuc1HCTdX4SQ=";
|
||||
hash = "sha256-tain1I7Td+0v7n+px3mQnz7reKZUbGYDWfKnDhvmU8I=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -1,34 +1,33 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, google-api-core
|
||||
, google-cloud-testutils
|
||||
, grpcio
|
||||
, grpcio-status
|
||||
, mock
|
||||
, proto-plus
|
||||
, protobuf
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
google-api-core,
|
||||
google-cloud-testutils,
|
||||
grpcio,
|
||||
grpcio-status,
|
||||
mock,
|
||||
proto-plus,
|
||||
protobuf,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-ai-generativelanguage";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vA/JVTaj3+NuA91LJo+Utn1hxogihr/OaBV4ujOFm7o=";
|
||||
hash = "sha256-Sr83AAcYsgxD9LkGcrOriFBziwJFfv/9EfMYTgMnLtI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
|
|
|
|||
|
|
@ -0,0 +1,96 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
|
||||
, manim
|
||||
, ffmpeg
|
||||
|
||||
, av
|
||||
, click
|
||||
, click-default-group
|
||||
, jinja2
|
||||
, lxml
|
||||
, numpy
|
||||
, opencv4
|
||||
, pillow
|
||||
, pydantic
|
||||
, pydantic-extra-types
|
||||
, python-pptx
|
||||
, qtpy
|
||||
, requests
|
||||
, rich
|
||||
, rtoml
|
||||
, tqdm
|
||||
, pyqt6
|
||||
|
||||
# Optional dependencies
|
||||
, ipython
|
||||
|
||||
# Hooks
|
||||
, pdm-backend
|
||||
, pythonRelaxDepsHook
|
||||
|
||||
# As Module or application?
|
||||
, withGui ? false
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "manim-slides";
|
||||
format = "pyproject";
|
||||
version = "5.1.3";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeertmans";
|
||||
repo = "manim-slides";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WZR95swapT2Fbu6mbuHLjMu3Okq/wKFabzN7xpZw0/g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pdm-backend pythonRelaxDepsHook ];
|
||||
|
||||
pythonRemoveDeps = [ "opencv-python" ];
|
||||
|
||||
pythonRelaxDeps = [ "rtoml" "qtpy" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
av
|
||||
click
|
||||
click-default-group
|
||||
jinja2
|
||||
lxml
|
||||
numpy
|
||||
opencv4
|
||||
pillow
|
||||
pydantic
|
||||
pydantic-extra-types
|
||||
python-pptx
|
||||
qtpy
|
||||
requests
|
||||
rich
|
||||
rtoml
|
||||
tqdm
|
||||
|
||||
# avconv is a potential alternative
|
||||
ffmpeg
|
||||
# This could also be manimgl, but that is not (yet) packaged
|
||||
manim
|
||||
]
|
||||
++ lib.lists.optional (!withGui)
|
||||
ipython
|
||||
++ lib.lists.optional withGui
|
||||
# dependency of qtpy (could also be pyqt5)
|
||||
pyqt6;
|
||||
|
||||
pythonImportsCheck = [ "manim_slides" ];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/jeertmans/manim-slides/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Tool for live presentations using manim";
|
||||
homepage = "https://github.com/jeertmans/manim-slides";
|
||||
license = licenses.mit;
|
||||
mainProgram = "manim-slides";
|
||||
maintainers = with maintainers; [ soispha ];
|
||||
};
|
||||
}
|
||||
|
|
@ -73,8 +73,8 @@ in buildPythonPackage rec {
|
|||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
buildInputs = with cudaPackages; [
|
||||
cuda_cudart
|
||||
buildInputs = lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_cudart
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.96";
|
||||
version = "9.2.97";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-60aOAm7eUlYHTCqIILz4l0oF1jvttDZUs4jSrF5+IJI=";
|
||||
hash = "sha256-GIBsWtj8nLuzGX/C6Ioe8mSfKg3QXtEJf3+d5h9M02c=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "4.2.2";
|
||||
version = "4.2.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-lyscb7YYnT4A7juT1+9CBlb4DoeE1MT46ZPhRJgCa64=";
|
||||
hash = "sha256-ausgFjhYe0b/hd+szti4GpMil3NF6/yuXSajy/1JZXY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubedock";
|
||||
version = "0.15.5";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joyrex2001";
|
||||
repo = "kubedock";
|
||||
rev = version;
|
||||
hash = "sha256-XnHCAv+l52EWw8MvTlmQ+wyhoddtXn920roB+y/ARWQ=";
|
||||
hash = "sha256-nShiBTkUNBshDDNuDvl0nnGy4BoFrn8hmtFKYOWjfpU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-me56QyJi77dP3geNecfO19SxFyuM2CqwmJRkwomsG1o=";
|
||||
vendorHash = "sha256-BYd45oaJjAr2xctp1Ew8xdwtiTASNElXzQg47xUI7yU=";
|
||||
|
||||
# config.Build not defined as it would break r-ryantm
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "neocmakelsp";
|
||||
version = "0.6.20";
|
||||
version = "0.6.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Decodetalkers";
|
||||
repo = "neocmakelsp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZeaQgGD8XsbSfg5vxT165JLPybPsmmqqsbJiG0CaL7Y=";
|
||||
hash = "sha256-qc0cWEnMH5S4fr9dMQHSWQ2NsCpfWxGvhkYJF7pgnKI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ljbJ+ZeCtDr8OlGgZ5kgO31chs7/ZD3UfHkq3vWx+h8=";
|
||||
cargoHash = "sha256-oPyMHrJTZYavE/M7PrTVv387KShLTg+Kwxg5sRYEkN4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cmake lsp based on tower-lsp and treesitter";
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopatch";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uber-go";
|
||||
repo = "gopatch";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iiVp/Aa4usShTQD/15zYk7/WQoQL/ZxVDPWYoi3JLW4=";
|
||||
hash = "sha256-zP5zC71icrVvzKzBBlxfX9h5JlKd89cf32Q6eZatX44=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Pm5RNOx54IW7L9atfVTiMkvvzFt7yjqnYu99YiWFhPA=";
|
||||
vendorHash = "sha256-ZHXzaR8pd6kApY3PBl9GV1iRc2jdDHMfewDn1j9npjc=";
|
||||
|
||||
subPackages = [
|
||||
"."
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "oh-my-posh";
|
||||
version = "19.18.1";
|
||||
version = "19.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandedobbeleer";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Y20PsyXSNu6U1v1OhBX0vGtg9UkuTVqZ1KYUYkRMcWg=";
|
||||
hash = "sha256-6c6e0/z8ATIQHY/v9V6v/W19HloYsz9SfLTGDg7t7M0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WuPEoDmp/SSf3AqHtYTtMb56PnjZLWr3weZQXEF7pbg=";
|
||||
vendorHash = "sha256-7xoA+yA6ZWQfc6PPqNoNDCpbrqZEbaU2owQIo9fdtVE=";
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-leptos";
|
||||
version = "0.2.16";
|
||||
version = "0.2.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leptos-rs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yDBVo3GarKvcuMX7mxdxx0SJSJ5VOX3bUx6XmYxLfq4=";
|
||||
hash = "sha256-W08R1ny4LyzWehnsWSMCRjCxmvV0k7ARVbmZ740hg8w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DZbZ3SHGWvje0gEqlx2mdLvCR4U3Xzkp8gS9FIbxW6g=";
|
||||
cargoHash = "sha256-kuKsBnmH3bPgwuJ1q49iHMNT47Djx9BKxcMBbJ3zqis=";
|
||||
|
||||
buildInputs = optionals isDarwin [
|
||||
SystemConfiguration
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ buildPythonApplication rec {
|
|||
homepage = "https://github.com/Kuniwak/vint";
|
||||
license = licenses.mit;
|
||||
mainProgram = "vint";
|
||||
maintainers = with maintainers; [ andsild ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
"hash": "sha256:14yjrkd63qsd2hip53x146fsd42d261pxdh85fprcvsrg656c6gp"
|
||||
},
|
||||
"6.1": {
|
||||
"version": "6.1.83",
|
||||
"hash": "sha256:145iw3wii7znhrqdmgnwhswk235g6gw8axjjji2cw4rn148rddl8"
|
||||
"version": "6.1.84",
|
||||
"hash": "sha256:0ykhl4i6yhryzgjkdbdz4pd3b1ghv84h6mpn7bdx0ra7w7mx55xg"
|
||||
},
|
||||
"5.15": {
|
||||
"version": "5.15.153",
|
||||
|
|
@ -24,15 +24,15 @@
|
|||
"hash": "sha256:10dww3cyazcf3wjzh8igpa0frb8gvl6amnksh42zfkji4mskh2r6"
|
||||
},
|
||||
"6.6": {
|
||||
"version": "6.6.23",
|
||||
"hash": "sha256:1fd824ia3ngy65c5qaaln7m66ca4p80bwlnvvk76pw4yrccx23r0"
|
||||
"version": "6.6.24",
|
||||
"hash": "sha256:1xgni9daid8c01f29xnxvrzja4sw0b1d5hhdxcw96cg8v9wzi7iy"
|
||||
},
|
||||
"6.7": {
|
||||
"version": "6.7.11",
|
||||
"hash": "sha256:0jhb175nlcncrp0y8md7p83yydlx6qqql6llav8djbv3f74rfr1c"
|
||||
"version": "6.7.12",
|
||||
"hash": "sha256:113rf3jqfpf3wcv637zbq5ww2hpaaf23y6dsmkds01l8jkipjabc"
|
||||
},
|
||||
"6.8": {
|
||||
"version": "6.8.2",
|
||||
"hash": "sha256:013xs37cnan72baqvmn2qrcbs5bbcv1gaafrcx3a166gbgc25hws"
|
||||
"version": "6.8.3",
|
||||
"hash": "sha256:11n9jsjg1wgffchpl6frk26pk4jx2m9m0w8cmizrmvhla1nvaznv"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.15.148-rt74"; # updated by ./update-rt.sh
|
||||
version = "5.15.153-rt75"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
|
|
@ -18,14 +18,14 @@ in buildLinux (args // {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "1n75lrck581mppx84cds1a1l5vj05cdkp8ahpry7dx6rgz4pb1f4";
|
||||
sha256 = "1g44gjcwcdq5552vwinljqwiy90bxax72jjvdasp71x88khv3pfp";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "0vbwqrkzigjfwmyxfbhq5n1g1qvyis949r97zqxhnmanq7c4njdk";
|
||||
sha256 = "04i22p0ap4dsqybf9jbbmrbzva11qknilnyk46z18gzrr0msjldl";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ lib.fix (self: {
|
|||
};
|
||||
|
||||
netbox_3_7 = callPackage generic {
|
||||
version = "3.7.3";
|
||||
hash = "sha256-8apjw3mO3RKT/IgJOG1+2GSjNwFhddZ9rIChdP26leE=";
|
||||
version = "3.7.4";
|
||||
hash = "sha256-jQJYtu1K13AsFXx4GTgtMOdppK1Tgoaf2/fKKhS1sQo=";
|
||||
extraPatches = [
|
||||
# Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL
|
||||
./config.patch
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then
|
|||
exit 0
|
||||
fi
|
||||
|
||||
hash_aarch64_darwin=$(nix-prefetch-url https://www.archimatetool.com/downloads/archi_5.php?/$latestVersion/Archi-Mac-Silicon-$latestVersion.dmg)
|
||||
hash_x86_64_darwin=$(nix-prefetch-url https://www.archimatetool.com/downloads/archi_5.php?/$latestVersion/Archi-Mac-$latestVersion.dmg)
|
||||
hash_x86_64_linux=$(nix-prefetch-url https://www.archimatetool.com/downloads/archi_5.php?/$latestVersion/Archi-Linux64-$latestVersion.tgz)
|
||||
hash_aarch64_darwin=$(nix-prefetch-url https://www.archimatetool.com/downloads/archi/$latestVersion/Archi-Mac-Silicon-$latestVersion.dmg)
|
||||
hash_x86_64_darwin=$(nix-prefetch-url https://www.archimatetool.com/downloads/archi/$latestVersion/Archi-Mac-$latestVersion.dmg)
|
||||
hash_x86_64_linux=$(nix-prefetch-url https://www.archimatetool.com/downloads/archi/$latestVersion/Archi-Linux64-$latestVersion.tgz)
|
||||
|
||||
update-source-version archi 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system=aarch64-darwin
|
||||
update-source-version archi $latestVersion $hash_aarch64_darwin --system=aarch64-darwin
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ with python3Packages;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "parquet-tools";
|
||||
version = "0.2.14";
|
||||
version = "0.2.16";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonApplication rec {
|
|||
owner = "ktrueda";
|
||||
repo = "parquet-tools";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2jIwDsxB+g37zV9hLc2VNC5YuZXTpTmr2aQ72AeHYJo=";
|
||||
hash = "sha256-mV66R5ejfzH1IasmoyAWAH5vzrnLVVhOqKBMfWKIVY0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -52,6 +52,11 @@ buildPythonApplication rec {
|
|||
thrift
|
||||
];
|
||||
|
||||
# TestGetMetaData.test_inspect shells out to `parquet-tools` CLI entrypoint
|
||||
preCheck = ''
|
||||
export PATH=$out/bin:$PATH
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
moto
|
||||
pytest-mock
|
||||
|
|
@ -59,9 +64,6 @@ buildPythonApplication rec {
|
|||
];
|
||||
|
||||
disabledTests = [
|
||||
# These tests try to read Python code as parquet and fail
|
||||
"test_local_wildcard"
|
||||
"test_local_and_s3_wildcard_files"
|
||||
# test file is 2 bytes bigger than expected
|
||||
"test_excute_simple"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ let
|
|||
boolToUpper = b: lib.toUpper (lib.boolToString b);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy";
|
||||
nativeBuildInputs = [ cmake pkg-config python3 ];
|
||||
buildInputs = [
|
||||
|
|
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||
# https://github.com/cern-fts/davix/releases/tag/R_0_8_0
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cern-fts/davix/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/davix-${version}.tar.gz";
|
||||
sha256 = "sha256-+c4hvMLtJI94JQWdF1d4dmFiWMNRd9dPrY+FSoGKh/k=";
|
||||
sha256 = "sha256-c4O29llcd6ncjAPFSDxn3DK9bSN1HpVs+cF0do5+61s=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ddns-go";
|
||||
version = "6.3.0";
|
||||
version = "6.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeessy2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YQaD0eWIufqyWF3bUXBdcd9nw5smvXkyWqZlROwBxBk=";
|
||||
hash = "sha256-tUJym19w9vjnriYVjZdxzZCJlIvE1DTKCaPKjDpNIq0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zUqsuph0fn1x4dwvBY0W0+S6SzS086SHya2ViNpDXGU=";
|
||||
|
|
|
|||
|
|
@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
|
|||
license = lib.licenses.bsd3;
|
||||
homepage = "https://monkey.org/~marius/pages/?page=trickle";
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "trickle";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31597,6 +31597,12 @@ with pkgs;
|
|||
|
||||
manim = callPackage ../applications/video/manim { };
|
||||
|
||||
manim-slides = python3Packages.toPythonApplication (
|
||||
python3Packages.manim-slides.override {
|
||||
withGui = true;
|
||||
}
|
||||
);
|
||||
|
||||
manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
|
||||
|
||||
mindforger = libsForQt5.callPackage ../applications/editors/mindforger { };
|
||||
|
|
|
|||
|
|
@ -7048,6 +7048,8 @@ self: super: with self; {
|
|||
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
|
||||
};
|
||||
|
||||
manim-slides = callPackage ../development/python-modules/manim-slides { };
|
||||
|
||||
manifest-ml = callPackage ../development/python-modules/manifest-ml { };
|
||||
|
||||
manifestoo = callPackage ../development/python-modules/manifestoo { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue