Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -2,13 +2,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "open-stage-control";
|
||||
version = "1.24.2";
|
||||
version = "1.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jean-emmanuel";
|
||||
repo = "open-stage-control";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mM81u1irVfFFJUddOXKcs46tcGwVAcir+daKdkxFLsE=";
|
||||
hash = "sha256-HbJFxgY/xba6X73TK40xXyLZiIxv1Ku/sVAekjApYFg=";
|
||||
};
|
||||
|
||||
# Remove some Electron stuff from package.json
|
||||
|
||||
@@ -16,9 +16,12 @@ stdenv.mkDerivation rec {
|
||||
pname = "koreader";
|
||||
version = "2023.04";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
|
||||
|
||||
src = if stdenv.isAarch64 then fetchurl {
|
||||
url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb";
|
||||
sha256 = "sha256-uuspjno0750hQMIB5HEhbV63wCna2izKOHEGIg/X0bU=";
|
||||
} else fetchurl {
|
||||
url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
|
||||
sha256 = "sha256-tRUeRB1+UcWT49dchN0YDvd0L5n1YRdtMSFc8yy6m5o=";
|
||||
};
|
||||
|
||||
@@ -63,7 +66,7 @@ stdenv.mkDerivation rec {
|
||||
description =
|
||||
"An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = intersectLists platforms.x86_64 platforms.linux;
|
||||
platforms = [ "aarch64-linux" "x86_64-linux" ];
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ contrun neonfuz];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, openssl
|
||||
, libgit2
|
||||
, libssh2
|
||||
, zlib
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.12.146";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "git-mit";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PurpleBooth";
|
||||
repo = "git-mit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VN1TbK9wi5Nt2K3yKx2lYSP30zSpwNETQ4OyHj8zxBg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YtUuRLjmehG+5kUiCo4LK0PkKAckr28UahlrAjm9MYw=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl libgit2 libssh2 zlib ];
|
||||
|
||||
meta = {
|
||||
description = "Minimalist set of hooks to aid pairing and link commits to issues";
|
||||
homepage = "https://github.com/PurpleBooth/git-mit";
|
||||
license = lib.licenses.cc0;
|
||||
};
|
||||
}
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "i3status-rust";
|
||||
version = "0.31.2";
|
||||
version = "0.31.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greshake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4lr2ibtBtJYXeeArBK4M35L4CUNqZcUDB+3Nm1kqp4w=";
|
||||
hash = "sha256-+Xd+2MsthH16o0NsB2m5qTfmxIjkVAFdQbqnwm4FRnk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5LIXzfYSuHOdxYxfp1eMdxsqyP+3sldBCV0mgv7SRRI=";
|
||||
cargoHash = "sha256-qBUPhAcxl8m+uIrMcuggxlhrD8+JIIauj4vJ/P0yxjc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
let
|
||||
pname = "psysh";
|
||||
version = "0.11.16";
|
||||
version = "0.11.17";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz";
|
||||
sha256 = "sha256-4FEjMtp7MRTjpdb1ZpKqCa0erxrW90JyGy1ZmMBVdZE=";
|
||||
sha256 = "sha256-GQhX4vL059ztDb4eqcY1r3jdQS8gQkaQ7/+NMR4jH2M=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "logging-journald";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "mosquito";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-g8oDFuqTBVutS7Uq7JCN+SXYL7UEQ+7G2nxzndjKAh8=";
|
||||
hash = "sha256-EyKXc/Qr9mRFngDqbCPNVs/0eD9OCbQq0FbymA6kpLQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydeps";
|
||||
version = "1.12.3";
|
||||
version = "1.12.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "thebjorn";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Zw5LGsNie2BAsJUWfL16HRdATpb5twkB5trBbIHNCc4=";
|
||||
hash = "sha256-WnxSUylD6PAqmAcN5odM68C12suuOlWp4qpq1Vu8aYY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-roborock";
|
||||
version = "0.17.3";
|
||||
version = "0.17.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "humbertogontijo";
|
||||
repo = "python-roborock";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lDSIed+/n/3D2kI44FcTbcTl9xAl+EbCPGrhfN5q4JE=";
|
||||
hash = "sha256-0AmtB0T8xqsd8TOh2MN+CBSLLq8hIl7QT+a2HdmGRYI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fblog";
|
||||
version = "4.3.0";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brocode";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7+LoCYFI75268Qg2b64I1OOEMZuuxSI9S9Z0/XRLc70=";
|
||||
hash = "sha256-f4iJ9Fp6Rd1jv2ywRCjvFHjbdCGb116NiQ42fvQUE8A=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-VMuCSX+FSssha472Lxij2DAYmfmTxLbDWFiRuN9488Q=";
|
||||
cargoHash = "sha256-dt8OMlqNxd78sDxMPHG6jHEmF4LuFIMSo0BuQDWOM6o=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A small command-line JSON log viewer";
|
||||
|
||||
@@ -33,13 +33,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "godot";
|
||||
version = "3.5.1";
|
||||
version = "3.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "godotengine";
|
||||
repo = "godot";
|
||||
rev = "${version}-stable";
|
||||
sha256 = "sha256-uHwTthyhfeQN0R1XjqZ+kGRa5WcpeQzA/DO9hZk4lvU=";
|
||||
sha256 = "sha256-C+1J5N0ETL1qKust+2xP9uB4x9NwrMqIm8aFAivVYQw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
@@ -2,18 +2,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "viceroy";
|
||||
version = "0.4.5";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EfkN0cKCoe6NA3thCVb2uY664GmQdSitv1yg/DTYtls=";
|
||||
hash = "sha256-V4eNHs+g4uumdRTSMMAKFVcJGHUF/WdT0SScyfUPnC8=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
cargoHash = "sha256-BT1wslIrCCmehWfs9QuT5/HqKJVq5BkoyfKvUIx2nQw=";
|
||||
cargoHash = "sha256-MxsYJPt7/4UmC5qSbGHyhK1pEDC6yKw189pHnP9BaXM=";
|
||||
|
||||
cargoTestFlags = [
|
||||
"--package viceroy-lib"
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
, stdenv
|
||||
, wayland
|
||||
|
||||
, mods ? [ ]
|
||||
, mods-dat ? null
|
||||
, versionsJson ? ./versions.json
|
||||
, username ? ""
|
||||
, token ? "" # get/reset token at https://factorio.com/profile
|
||||
, experimental ? false # true means to always use the latest branch
|
||||
}:
|
||||
, ...
|
||||
} @ args:
|
||||
|
||||
assert releaseType == "alpha"
|
||||
|| releaseType == "headless"
|
||||
@@ -35,6 +35,8 @@ let
|
||||
|
||||
inherit (lib) importJSON;
|
||||
|
||||
mods = args.mods or [ ];
|
||||
|
||||
helpMsg = ''
|
||||
|
||||
===FETCH FAILED===
|
||||
|
||||
@@ -1,264 +0,0 @@
|
||||
{
|
||||
"name": "heroic",
|
||||
"version": "2.7.1",
|
||||
"private": true,
|
||||
"main": "build/electron/main.js",
|
||||
"homepage": "./",
|
||||
"license": "GPL-3.0-only",
|
||||
"description": "An Open Source Launcher for GOG and Epic Games",
|
||||
"repository": {
|
||||
"type": "Github",
|
||||
"url": "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher"
|
||||
},
|
||||
"author": {
|
||||
"name": "Heroic Games Launcher",
|
||||
"email": "heroicgameslauncher@protonmail.com"
|
||||
},
|
||||
"build": {
|
||||
"appId": "com.heroicgameslauncher.hgl",
|
||||
"productName": "Heroic",
|
||||
"afterSign": "sign/notarize.js",
|
||||
"files": [
|
||||
"build/**/*",
|
||||
"node_modules/**/*",
|
||||
"!build/bin/*",
|
||||
"build/bin/legendary.LICENSE"
|
||||
],
|
||||
"asarUnpack": [
|
||||
"build/icon.png",
|
||||
"build/icon.icns",
|
||||
"build/win_icon.ico",
|
||||
"build/icon-dark.png",
|
||||
"build/icon-light.png",
|
||||
"build/webviewPreload.js"
|
||||
],
|
||||
"protocols": [
|
||||
{
|
||||
"name": "heroic",
|
||||
"schemes": [
|
||||
"heroic"
|
||||
]
|
||||
}
|
||||
],
|
||||
"win": {
|
||||
"artifactName": "${productName}-${version}-Setup-${arch}.${ext}",
|
||||
"icon": "build/win_icon.ico",
|
||||
"asarUnpack": [
|
||||
"build/bin/win32/legendary.exe",
|
||||
"build/bin/win32/gogdl.exe"
|
||||
],
|
||||
"files": [
|
||||
"build/bin/win32/*"
|
||||
]
|
||||
},
|
||||
"portable": {
|
||||
"artifactName": "${productName}-${version}-Portable-${arch}.${ext}"
|
||||
},
|
||||
"mac": {
|
||||
"artifactName": "${productName}-${version}-macOS-${arch}.${ext}",
|
||||
"category": "public.app-category.games",
|
||||
"icon": "build/icon.icns",
|
||||
"entitlements": "build/entitlements.mac.plist",
|
||||
"entitlementsInherit": "build/entitlements.mac.plist",
|
||||
"extendInfo": {
|
||||
"com.apple.security.cs.allow-jit": true
|
||||
},
|
||||
"asarUnpack": [
|
||||
"build/bin/darwin/legendary",
|
||||
"build/bin/darwin/gogdl"
|
||||
],
|
||||
"files": [
|
||||
"build/bin/darwin/*"
|
||||
]
|
||||
},
|
||||
"dmg": {
|
||||
"background": "public/dmg.png",
|
||||
"window": {
|
||||
"width": "600",
|
||||
"height": "500"
|
||||
},
|
||||
"contents": [
|
||||
{
|
||||
"x": 10,
|
||||
"y": 215,
|
||||
"type": "file"
|
||||
},
|
||||
{
|
||||
"x": 420,
|
||||
"y": 215,
|
||||
"type": "link",
|
||||
"path": "/Applications"
|
||||
}
|
||||
]
|
||||
},
|
||||
"linux": {
|
||||
"category": "Game",
|
||||
"icon": "build/icon.icns",
|
||||
"description": "An Open Source Launcher for GOG and Epic Games",
|
||||
"desktop": {
|
||||
"Name": "Heroic Games Launcher",
|
||||
"Comment[de]": "Ein Open Source Spielelauncher for GOG und Epic Games"
|
||||
},
|
||||
"asarUnpack": [
|
||||
"build/bin/linux/legendary",
|
||||
"build/bin/linux/gogdl"
|
||||
],
|
||||
"files": [
|
||||
"build/bin/linux/*"
|
||||
]
|
||||
},
|
||||
"deb": {
|
||||
"packageCategory": "games",
|
||||
"depends": [
|
||||
"curl"
|
||||
]
|
||||
},
|
||||
"pacman": {
|
||||
"packageCategory": "games",
|
||||
"depends": [
|
||||
"curl"
|
||||
]
|
||||
},
|
||||
"rpm": {
|
||||
"packageCategory": "games",
|
||||
"depends": [
|
||||
"curl"
|
||||
]
|
||||
},
|
||||
"snap": {
|
||||
"allowNativeWayland": true,
|
||||
"category": "Games",
|
||||
"synopsis": "An Open Source Launcher for GOG and Epic Games",
|
||||
"description": "Heroic is an Open Source Games Launcher. Right now it supports launching games from the Epic Games Store using Legendary and GOG Games using our custom implementation with gogdl.",
|
||||
"publish": {
|
||||
"provider": "snapStore",
|
||||
"channels": [
|
||||
"edge"
|
||||
],
|
||||
"repo": "heroic"
|
||||
}
|
||||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.10.6",
|
||||
"@emotion/styled": "^11.10.6",
|
||||
"@fontsource/cabin": "^4.5.10",
|
||||
"@fontsource/rubik": "^4.5.14",
|
||||
"@fortawesome/fontawesome-svg-core": "^6.3.0",
|
||||
"@fortawesome/free-brands-svg-icons": "^6.3.0",
|
||||
"@fortawesome/free-regular-svg-icons": "^6.3.0",
|
||||
"@fortawesome/free-solid-svg-icons": "^6.3.0",
|
||||
"@fortawesome/react-fontawesome": "^0.2.0",
|
||||
"@mui/icons-material": "^5.11.11",
|
||||
"@mui/material": "^5.11.12",
|
||||
"@node-steam/vdf": "^2.2.0",
|
||||
"@shockpkg/icon-encoder": "^2.1.3",
|
||||
"axios": "^0.26.1",
|
||||
"check-disk-space": "^3.3.1",
|
||||
"classnames": "^2.3.1",
|
||||
"crc": "^4.3.2",
|
||||
"discord-rich-presence-typescript": "^0.0.8",
|
||||
"electron-store": "^8.0.1",
|
||||
"electron-updater": "^5.0.1",
|
||||
"filesize": "^10.0.6",
|
||||
"font-list": "^1.4.5",
|
||||
"fs-extra": "^11.1.0",
|
||||
"fuse.js": "^6.6.2",
|
||||
"graceful-fs": "^4.2.10",
|
||||
"howlongtobeat": "^1.7.0",
|
||||
"i18next": "^22.4.11",
|
||||
"i18next-fs-backend": "^2.1.1",
|
||||
"i18next-http-backend": "^2.1.1",
|
||||
"ini": "^3.0.0",
|
||||
"plist": "^3.0.5",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-i18next": "^12.2.0",
|
||||
"react-markdown": "^8.0.5",
|
||||
"react-router-dom": "^6.9.0",
|
||||
"recharts": "^2.4.3",
|
||||
"sanitize-filename": "^1.6.3",
|
||||
"shlex": "^2.1.2",
|
||||
"short-uuid": "^4.2.2",
|
||||
"simple-keyboard": "^3.5.33",
|
||||
"steam-shortcut-editor": "^3.1.1",
|
||||
"systeminformation": "^5.17.12",
|
||||
"tslib": "^2.5.0"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "vite",
|
||||
"codecheck": "tsc --noEmit",
|
||||
"find-deadcode": "ts-prune --error",
|
||||
"test": "jest",
|
||||
"test-watch": "jest --watch --maxWorkers=25%",
|
||||
"test:ci": "jest --runInBand --silent",
|
||||
"release:linux": "vite build && electron-builder -p always --linux deb AppImage rpm pacman tar.xz snap",
|
||||
"release:mac": "vite build && electron-builder -p always --mac --x64 --arm64",
|
||||
"release:win": "vite build && electron-builder -p always --win portable --x64 --arm64",
|
||||
"sign:win": "vite build && electron-builder -p never --win nsis --x64 --arm64",
|
||||
"dist:linux": "vite build && electron-builder --linux",
|
||||
"dist:mac": "export CSC_IDENTITY_AUTO_DISCOVERY=false && vite build && electron-builder --mac",
|
||||
"dist:win": "vite build && electron-builder --win",
|
||||
"dist:flatpak": "yarn dist:linux appimage && yarn flatpak:prepare && yarn flatpak:build",
|
||||
"lint": "eslint --cache -c .eslintrc --ext .tsx,ts .",
|
||||
"lint-fix": "eslint --fix -c .eslintrc --ext .tsx,ts ./src",
|
||||
"flatpak:build": "cd flatpak-build && flatpak-builder build com.heroicgameslauncher.hgl.yml --install --force-clean --user",
|
||||
"flatpak:prepare": "node ./flatpak/prepareFlatpak.js",
|
||||
"flatpak:prepare-release": "node ./flatpak/prepareFlatpak.js release",
|
||||
"i18n": "i18next --silent",
|
||||
"prepare": "husky install",
|
||||
"prettier": "prettier --check . '!flatpak-build'",
|
||||
"prettier-fix": "prettier --write . '!flatpak-build'"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": [
|
||||
"react-app",
|
||||
"react-app/jest"
|
||||
]
|
||||
},
|
||||
"devDependencies": {
|
||||
"@electron/notarize": "^1.2.3",
|
||||
"@testing-library/dom": "^9.0.1",
|
||||
"@testing-library/jest-dom": "^5.16.4",
|
||||
"@testing-library/react": "^14.0.0",
|
||||
"@testing-library/user-event": "^14.1.1",
|
||||
"@types/classnames": "^2.3.1",
|
||||
"@types/i18next-fs-backend": "^1.1.2",
|
||||
"@types/ini": "^1.3.31",
|
||||
"@types/jest": "^29.4.0",
|
||||
"@types/node": "^18.15.0",
|
||||
"@types/plist": "^3.0.2",
|
||||
"@types/react": "^18.0.28",
|
||||
"@types/react-dom": "^18.0.11",
|
||||
"@types/react-router-dom": "^5.3.3",
|
||||
"@types/tmp": "^0.2.3",
|
||||
"@typescript-eslint/eslint-plugin": "^5.47.1",
|
||||
"@typescript-eslint/parser": "^5.47.1",
|
||||
"@vitejs/plugin-react-swc": "^3.2.0",
|
||||
"electron": "^23.1.3",
|
||||
"electron-builder": "^23.6.0",
|
||||
"electron-devtools-installer": "^3.2.0",
|
||||
"eslint": "^8.36.0",
|
||||
"eslint-config-prettier": "^8.7.0",
|
||||
"eslint-plugin-import": "^2.27.5",
|
||||
"eslint-plugin-react": "^7.31.11",
|
||||
"husky": "^8.0.3",
|
||||
"i18next-parser": "^7.7.0",
|
||||
"jest": "^29.5.0",
|
||||
"prettier": "^2.8.1",
|
||||
"pretty-quick": "^3.1.3",
|
||||
"sass": "^1.59.2",
|
||||
"tmp": "^0.2.1",
|
||||
"ts-jest": "^29.0.5",
|
||||
"ts-prune": "^0.10.3",
|
||||
"type-fest": "^3.6.1",
|
||||
"typescript": "^4.9.4",
|
||||
"unimported": "^1.26.0",
|
||||
"vite": "^3.2.5",
|
||||
"vite-plugin-electron": "^0.10.2",
|
||||
"vite-plugin-svgr": "^2.4.0"
|
||||
},
|
||||
"resolutions": {
|
||||
"ts-morph": "^17.0.1"
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,27 +1,13 @@
|
||||
{ lib
|
||||
, pkgs
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python3
|
||||
, ffmpeg
|
||||
}:
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
google-auth-oauthlib = super.google-auth-oauthlib.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.5.2b1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gilesknap";
|
||||
repo = "google-auth-library-python-oauthlib";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-o4Jakm/JgLszumrSoTTnU+nc79Ei70abjpmn614qGyc=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gphotos-sync";
|
||||
version = "3.04";
|
||||
version = "3.1.2";
|
||||
format = "pyproject";
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
@@ -30,36 +16,37 @@ py.pkgs.buildPythonApplication rec {
|
||||
owner = "gilesknap";
|
||||
repo = "gphotos-sync";
|
||||
rev = version;
|
||||
sha256 = "0mnlnqmlh3n1b6fjwpx2byl1z41vgghjb95598kz5gvdi95iirrs";
|
||||
hash = "sha256-lLw450Rk7tIENFTZWHoinkhv3VtctDv18NKxhox+NgI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./skip-network-tests.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [
|
||||
nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ];
|
||||
pythonRelaxDeps = [
|
||||
"psutil"
|
||||
"exif"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
appdirs
|
||||
attrs
|
||||
exif
|
||||
google-auth-oauthlib
|
||||
psutil
|
||||
pyyaml
|
||||
psutil
|
||||
requests-oauthlib
|
||||
types-pyyaml
|
||||
types-requests
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# this is a patched release that we include via packageOverrides above
|
||||
substituteInPlace setup.cfg \
|
||||
--replace " @ https://github.com/gilesknap/google-auth-library-python-oauthlib/archive/refs/tags/v0.5.2b1.zip" ""
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg
|
||||
];
|
||||
|
||||
nativeCheckInputs = with py.pkgs; [
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
mock
|
||||
pytestCheckHook
|
||||
setuptools-scm
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mods";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "mods";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-r7j7iMkfkFsohguu2vkhyxUbaMwJQURfUJrnC6yUCFI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+0yGFCGd/9bIBjXYp8UPGqKum2di5O1ALMyDSxcVujg=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X=main.version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "AI on the command line";
|
||||
homepage = "https://github.com/charmbracelet/mods";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "star-history";
|
||||
version = "1.0.11";
|
||||
version = "1.0.12";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Cbhg0KLDi2GOEP9KwwExcoX5wE2kMM41biXLrlWLKvY=";
|
||||
sha256 = "sha256-znISDhxmAEw38TWAtA3xCZrplYs1pQ+DvfCucGDJZSU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-RbTwJx8ueMAOl9cx6YxGEsjARxcZhJXHhyWWYPTdpI4=";
|
||||
cargoSha256 = "sha256-GBms5Ha7agwG5u2U+perN8Uo5ihL4QFRZh2wxlV+Wxo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "dae";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daeuniverse";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-J/LKVmWda88kaLY1w0elEoksrWswDvuhb6RTZvl6uH0=";
|
||||
sha256 = "sha256-suCs02q6W9Znmb2mS4NOPTn6I8Xxt0fNbToF7HEbKzw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
}:
|
||||
let
|
||||
pname = "motrix";
|
||||
version = "1.8.14";
|
||||
version = "1.8.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/agalwood/Motrix/releases/download/v${version}/Motrix-${version}.AppImage";
|
||||
hash = "sha256-h4TZzExl1zThwzlKBtL0u3V1jFjjNM2Cscy4hGir9Ts=";
|
||||
hash = "sha256-oSO+VH3bZcjnXjECqZgOmsvlOONbfgOq50qVLvHdKfo=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-05-12";
|
||||
version = "2023-05-14";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-G7ig1MtdAWz8eCxNhGjP1ekSp61aIyncbtAexBoOCXY=";
|
||||
hash = "sha256-LC/BIyA6dbTut+2tU9D7PS9AfauRIHfdSY0gF2rVOLI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,30 +1,20 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nerdfix";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "loichyan";
|
||||
repo = "nerdfix";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-71P0ESPLTUq8z0mSU4v8KmS069DNUi5fPHz01Kg3aKg=";
|
||||
hash = "sha256-cqTaup/MrtLcBIoY+1vQLLlU+Cmu3iODH4jmZImjGrg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XAelHpTVvz+jsDzfB+jsEuUdB0hN7c+hVDvCyOixx9E=";
|
||||
|
||||
patches = [
|
||||
# fixes failing tests due to outdated snapshots
|
||||
(fetchpatch {
|
||||
name = "test-cli-udpate-stdout.patch";
|
||||
url = "https://github.com/loichyan/nerdfix/commit/4070f9e894337ca7d3f7641258428ad6d7cd6332.patch";
|
||||
hash = "sha256-oDuHKgoMcOaO1mtBbT1Uwn5ZUp/FvqsD4S+A1LdOhcE=";
|
||||
})
|
||||
];
|
||||
cargoHash = "sha256-V/M70ARqOyN0f/uudWPHc4bGc3WXK3PpcM8r2MBEWAs=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nerdfix helps you to find/fix obsolete nerd font icons in your project";
|
||||
|
||||
Generated
+2900
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,12 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }:
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, pkg-config
|
||||
, oniguruma
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "termbook-cli";
|
||||
@@ -11,12 +19,37 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "Bo3DI0cMXIfP7ZVr8MAW/Tmv+4mEJBIQyLvRfVBDG8c=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-9fFvJJlDzBmbI7hes/wfjAk1Cl2H55T5n8HLnUmDw/c=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
oniguruma
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
env = {
|
||||
RUSTONIG_SYSTEM_LIBONIG = true;
|
||||
};
|
||||
|
||||
# update dependencies to fix build failure caused by unaligned packed structs
|
||||
postPatch = ''
|
||||
ln -sf ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd termbook \
|
||||
--bash <($out/bin/termbook completions bash) \
|
||||
--fish <($out/bin/termbook completions fish) \
|
||||
--zsh <($out/bin/termbook completions zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A runner for `mdbooks` to keep your documentation tested";
|
||||
homepage = "https://github.com/Byron/termbook/";
|
||||
|
||||
@@ -882,6 +882,8 @@ with pkgs;
|
||||
|
||||
mod = callPackage ../development/tools/mod { };
|
||||
|
||||
mods = callPackage ../tools/misc/mods { };
|
||||
|
||||
mongosh = callPackage ../development/tools/mongosh { };
|
||||
|
||||
mysql-shell = callPackage ../development/tools/mysql-shell {
|
||||
@@ -1963,6 +1965,8 @@ with pkgs;
|
||||
|
||||
git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { });
|
||||
|
||||
git-mit = callPackage ../applications/version-management/git-mit { };
|
||||
|
||||
git-my = callPackage ../applications/version-management/git-my { };
|
||||
|
||||
git-machete = python3Packages.callPackage ../applications/version-management/git-machete { };
|
||||
@@ -32515,6 +32519,8 @@ with pkgs;
|
||||
|
||||
mpvScripts = recurseIntoAttrs {
|
||||
acompressor = callPackage ../applications/video/mpv/scripts/acompressor.nix {};
|
||||
autocrop = callPackage ../applications/video/mpv/scripts/autocrop.nix { };
|
||||
autodeint = callPackage ../applications/video/mpv/scripts/autodeint.nix { };
|
||||
autoload = callPackage ../applications/video/mpv/scripts/autoload.nix { };
|
||||
convert = callPackage ../applications/video/mpv/scripts/convert.nix { };
|
||||
inhibit-gnome = callPackage ../applications/video/mpv/scripts/inhibit-gnome.nix { };
|
||||
|
||||
Reference in New Issue
Block a user