Merge master into staging-nixos
This commit is contained in:
@@ -567,11 +567,15 @@
|
||||
keys = [ { fingerprint = "46C0 9BA8 A20E 5C50 1E1E 0597 0B6D 17F7 2BC4 7F61"; } ];
|
||||
};
|
||||
acuteenvy = {
|
||||
name = "Lena Pastwa";
|
||||
matrix = "@acuteenvy:matrix.org";
|
||||
email = "nix@lnps.me";
|
||||
github = "acuteenvy";
|
||||
githubId = 126529524;
|
||||
name = "Lena";
|
||||
keys = [ { fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; } ];
|
||||
keys = [
|
||||
{ fingerprint = "D851 FA84 797F 85B9 C625 091F BEE5 EAC5 E14B AF90"; }
|
||||
{ fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; }
|
||||
];
|
||||
};
|
||||
adam248 = {
|
||||
email = "adamjbutler091@gmail.com";
|
||||
|
||||
@@ -24,8 +24,8 @@ let
|
||||
sha256Hash = "sha256-ciu+To5Kcus8FPDz1D43AD+qOqfPHaW4JsEBr9fx2PE=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2025.2.3.1"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 Canary 1"
|
||||
sha256Hash = "sha256-OHUKe2FBaxql3bS9kxrM8SSsSt6UpNYoZpkiPWfpafA=";
|
||||
version = "2025.2.3.3"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 Canary 3"
|
||||
sha256Hash = "sha256-cU6EFqmM1GsaWdGE1sbR/9eHXiYXKYV/m1/H0a+A1Bw=";
|
||||
};
|
||||
in
|
||||
{
|
||||
|
||||
@@ -35,10 +35,20 @@
|
||||
|
||||
## configurability of the wrapper itself
|
||||
|
||||
browser:
|
||||
browser_:
|
||||
|
||||
let
|
||||
isDarwin = stdenv.hostPlatform.isDarwin;
|
||||
browser =
|
||||
# Wrapper breaks codesigning on macOS; though plugins that may require
|
||||
# original mozilla signature (like 1Password) won't work with signatures
|
||||
# stripped, at least the wrapped browser will launch.
|
||||
if isDarwin then
|
||||
browser_.overrideAttrs (oldAttrs: {
|
||||
dontFixup = false;
|
||||
})
|
||||
else
|
||||
browser_;
|
||||
wrapper =
|
||||
{
|
||||
applicationName ? browser.binaryName or (lib.getName browser), # Note: this is actually *binary* name and is different from browser.applicationName, which is *app* name!
|
||||
|
||||
@@ -30,7 +30,7 @@ while [ $# -gt 0 ]; do
|
||||
quiet=1; shift 1 ;;
|
||||
--name)
|
||||
name="$2"; shift 2 ;;
|
||||
--repository)
|
||||
--repo)
|
||||
repository="$2"; shift 2 ;;
|
||||
--tag)
|
||||
tag="$2"; shift 2 ;;
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ascii-draw";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nokse22";
|
||||
repo = "ascii-draw";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ed8RSS9anU5gstWTrJc2APx7PLmTzVVWXg8Sif8tySM=";
|
||||
hash = "sha256-M+cRJ6gJBbgWM6HodrYK0MTvqP+AAMjz3B6pJftypEM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
ffmpeg,
|
||||
ffmpeg_7,
|
||||
libaom,
|
||||
nasm,
|
||||
nix-update-script,
|
||||
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg
|
||||
ffmpeg_7
|
||||
vapoursynth
|
||||
];
|
||||
|
||||
|
||||
@@ -24,18 +24,18 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cartero";
|
||||
version = "0.2.4";
|
||||
version = "25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danirod";
|
||||
repo = "cartero";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-l6UYsidMqTsEiabviWGAsEOFyDslpP2wIws0Yk10se4=";
|
||||
hash = "sha256-XUf5Gfg+ZyyzcbZYSxFTM4ot84FF2bgGJoQg2ZAIZ3g=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-HUwIbrWt9coPjUKRL1nnt0NurwkEGV/Z07BHySnVfQo=";
|
||||
hash = "sha256-T1OR8okOm5hFYsRLqqNYhP39Av/veHnoomkC29/JyAY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "darklua";
|
||||
version = "0.17.2";
|
||||
version = "0.17.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seaofvoices";
|
||||
repo = "darklua";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RNm2d0VeLgHEawvZQYUcXesNwLc2m9Q6R6kNZhZDslg=";
|
||||
hash = "sha256-IpTTNt/AlaDRckWq1Ck0A822rAtzeOt9RcB2F7CI5ig=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WfXIMuqO1KTiWeqMOnsylNlJKv1cKNZvp8qhalPlcnc=";
|
||||
cargoHash = "sha256-0TtABG+MSz3wdxhLgTZCFVgN8KwcDkVTwn+sZV+abbE=";
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
|
||||
fetchpatch2,
|
||||
# nativeBuildInputs
|
||||
pkg-config,
|
||||
cmake,
|
||||
@@ -12,7 +12,7 @@
|
||||
curl,
|
||||
enet,
|
||||
ffmpeg,
|
||||
fmt,
|
||||
fmt_9,
|
||||
gettext,
|
||||
libGL,
|
||||
libGLU,
|
||||
@@ -26,12 +26,13 @@
|
||||
libpthreadstubs,
|
||||
libpulseaudio,
|
||||
libusb1,
|
||||
mbedtls_2,
|
||||
mbedtls,
|
||||
miniupnpc,
|
||||
openal,
|
||||
pcre,
|
||||
portaudio,
|
||||
readline,
|
||||
SDL2,
|
||||
sfml,
|
||||
soundtouch,
|
||||
xz,
|
||||
@@ -62,6 +63,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-/9AabEJ2ZOvHeSGXWRuOucmjleBMRcJfhX+VDeldbgo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/dolphin-emu/dolphin/commit/8edef722ce1aae65d5a39faf58753044de48b6e0.patch?full_index=1";
|
||||
hash = "sha256-QEG0p+AzrExWrOxL0qRPa+60GlL0DlLyVBrbG6pGuog=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
@@ -74,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
curl
|
||||
enet
|
||||
ffmpeg
|
||||
fmt
|
||||
fmt_9
|
||||
gettext
|
||||
libGL
|
||||
libGLU
|
||||
@@ -88,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libpthreadstubs
|
||||
libpulseaudio
|
||||
libusb1
|
||||
mbedtls_2
|
||||
mbedtls
|
||||
miniupnpc
|
||||
openal
|
||||
pcre
|
||||
@@ -96,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qt6.qtbase
|
||||
qt6.qtsvg
|
||||
readline
|
||||
SDL2
|
||||
sfml
|
||||
soundtouch
|
||||
xz
|
||||
@@ -115,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "USE_SHARED_ENET" true)
|
||||
(lib.cmakeBool "ENABLE_LTO" true)
|
||||
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
(lib.cmakeBool "OSX_USE_DEFAULT_SEARCH_PATH" true)
|
||||
|
||||
@@ -28,8 +28,11 @@ php.buildComposerProject2 (finalAttrs: {
|
||||
updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update xmlstarlet
|
||||
|
||||
set -eu -o pipefail
|
||||
version=$(curl -k --silent --globoff "https://updates.drupal.org/release-history/drupal/current" | xmlstarlet sel -t -v "project/releases/release[1]/tag")
|
||||
|
||||
version=$(curl -k --silent --globoff "https://updates.drupal.org/release-history/drupal/current" | xmlstarlet sel -t -v "/project/releases/release/tag[not(contains(., 'alpha'))][not(contains(., 'beta'))][not(contains(., '-rc'))]" | grep -m 1 '.')
|
||||
|
||||
nix-update drupal --version $version
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
docbook-xsl-nons,
|
||||
dvdauthor,
|
||||
dvdplusrwtools,
|
||||
ffmpeg,
|
||||
ffmpeg_7,
|
||||
flex,
|
||||
fontconfig,
|
||||
gettext,
|
||||
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
cdrtools
|
||||
dvdauthor
|
||||
dvdplusrwtools
|
||||
ffmpeg
|
||||
ffmpeg_7
|
||||
fontconfig
|
||||
glib
|
||||
libexif
|
||||
|
||||
@@ -0,0 +1,154 @@
|
||||
diff --git i/package-lock.json w/package-lock.json
|
||||
index 07428d0..4901a94 100644
|
||||
--- i/package-lock.json
|
||||
+++ w/package-lock.json
|
||||
@@ -3 +3 @@
|
||||
- "version": "4.0.0-beta",
|
||||
+ "version": "4.0.0",
|
||||
@@ -9 +9 @@
|
||||
- "version": "4.0.0-beta",
|
||||
+ "version": "4.0.0",
|
||||
@@ -131,0 +132,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
|
||||
+ "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
|
||||
@@ -144,0 +147,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
|
||||
+ "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
|
||||
@@ -154,0 +159,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz",
|
||||
+ "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==",
|
||||
@@ -161,0 +168,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz",
|
||||
+ "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==",
|
||||
@@ -173,0 +182,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.6.0.tgz",
|
||||
+ "integrity": "sha512-8I2Q8ykA4J0x0o7cg67FPVnehcqWTBehu/lmY+bolPFHGjh49YzGBMXTvpqVgEbBdvNCSxj6iFgiIyHzf03lzg==",
|
||||
@@ -180,0 +191,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz",
|
||||
+ "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==",
|
||||
@@ -223,0 +236,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz",
|
||||
+ "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==",
|
||||
@@ -260,0 +275,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.0.tgz",
|
||||
+ "integrity": "sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==",
|
||||
@@ -267,0 +284,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.5.tgz",
|
||||
+ "integrity": "sha512-KSPA4umqSG4LHYRodq31VDwKAvaTF4xmVlzM8Aeh4PlU1JQ3IG0wiA8C25d3RQ9nJyM3mBHyI53K06VVL/oFFg==",
|
||||
@@ -304,0 +323,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.0.0.tgz",
|
||||
+ "integrity": "sha512-TNd+u1fAG8vf8YMgXzK2BI0u0xsphFv//T5rpF1eZ+8AAXby5Ll1qptr4/XVS45dvWDIzuBmmWIpVJRvnaNqzQ==",
|
||||
@@ -318,0 +339,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.0.0.tgz",
|
||||
+ "integrity": "sha512-6QEzj6bZg8atviRIL+pR0tODC854cYSjvZxkyCarr8DVaOJPEyuGys7GmEG3W0Rb8kKSQec7P6okt0sJvNneFw==",
|
||||
@@ -329,0 +352,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.0.0.tgz",
|
||||
+ "integrity": "sha512-7dwoKCGvgZGHWTZfOj2KLmbIAIdiXP9NTrwGaTO/XDfKMEmyBahZpnombiG6JDHmiOrmK3GLEJRXrWExXCDLmQ==",
|
||||
@@ -373,0 +398,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.0.0.tgz",
|
||||
+ "integrity": "sha512-bhHAP7hIOxUjiTZrpjyAYD+2RFRa+PNutWeW7JdDPcWWG3GVRiFsu3pBGw9kN2PktoiilDWFGSR0dwXBzGQang==",
|
||||
@@ -385,0 +412,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.0.tgz",
|
||||
+ "integrity": "sha512-mR7JHNIvCB4o12f75KN42he7s1O9tmcSN4wJ6l04oymfXKLn+lYJFI7z9lbe4/Ald6fm8nuF38fuY5hNPl3B+A==",
|
||||
@@ -397,0 +426,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.7.tgz",
|
||||
+ "integrity": "sha512-m+Trk77mp54Zma6xLkLuY+mvanPxlE4A7yNKs2HBiyZ4UkVs28Mv5c/pgWrHeInx+USHeX/WEPzjrWrcJiQgjw==",
|
||||
@@ -404,0 +435,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.0.0.tgz",
|
||||
+ "integrity": "sha512-LD7MNzaX+q2OpU4Fn0i/SedhnnBCAnEzRr6L0MP6ohofFFlx9kp5EXX7flbRZlUnh8icOwC3NFmXTyP76hvo0g==",
|
||||
@@ -415,0 +448,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.0.tgz",
|
||||
+ "integrity": "sha512-DUYfROyQNWm3q+JXL3S6s1/y/cOWRstnmt5zDXhdYNJ5N8TgCnHcDXKwW/dRZL7eBZupmDVHxdKCWZDUYUqmeg==",
|
||||
@@ -426,0 +461,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.0.tgz",
|
||||
+ "integrity": "sha512-W4QRSzJDMKIvWSvQWOIhs6qba1MJ6yIoy+sazSFhl2QIwn58B0Yw3iZ/zLk3QqVcCsTmKcyrSNVWUJ5RVDLStw==",
|
||||
@@ -438,0 +475,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.0.0.tgz",
|
||||
+ "integrity": "sha512-y8kX/TmyBqV0H1i3cWbhiTljcuBtgVgyVXAVub3ba1j5/G+dxhYohK1JLRkaosPGKKf3LnEJsYK+GPabpfnaHw==",
|
||||
@@ -457,0 +496,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.0.0.tgz",
|
||||
+ "integrity": "sha512-frzJNoMsQBO1fxLXrtpxt2c8hUy/ASEmBpIOEnXY2CjylPnLsVyxrEq7hcOIqVJKHn1tIPfplfiSPowOTrrUDg==",
|
||||
@@ -469,0 +510,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.0.tgz",
|
||||
+ "integrity": "sha512-AT9vkC2KD/PLHZZXIW5Tn/FnJzEU3xEZMLxNo9OggKoreDEKfTOKVM1LkYbDg6UQUOOjntXd0SsrvoHfCzS8cw==",
|
||||
@@ -482,0 +525,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.0.0.tgz",
|
||||
+ "integrity": "sha512-XTN4AIFusWbNCBU1Xm2YDxbtH94e/FOrC27U3QargSsoDT1mRm+aLfqE+oOZnUuxwtTnInRT8UHRU3MVOu52wg==",
|
||||
@@ -496,0 +541,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/testing/-/testing-2.1.35.tgz",
|
||||
+ "integrity": "sha512-DUMxGJP6Y7QTrjk4hE6kunQUfMDxCphJaO0xCsH+AmaTPbvIW2HV+7ZQTCFQXrOTFuvLssF9lbbnC0keGYbVgA==",
|
||||
@@ -523,0 +570,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.0.tgz",
|
||||
+ "integrity": "sha512-YYykfbw/lefC7yKj7nanzQXILM7r3suIvyFlCcMskc99axmsSewXWkAfXKwMbgxL76iAFVmRwmYdwNZNc8gjog==",
|
||||
@@ -728,0 +777,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.2.tgz",
|
||||
+ "integrity": "sha512-4Bb+oqXZTSTZ1q27Izly9lv8B9dlV61CROxPiVtywwzv5SnytJqhvYe6FclHYuXml4cd1VHPo1zd5PmTeJozvA==",
|
||||
@@ -765,0 +816,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.0.0.tgz",
|
||||
+ "integrity": "sha512-+DwhEHAaFPPdJ2ral3kNHFQXnTfscEEFsUxzD+d7nlcLrFK23JtNjH71RGasTcHb88b4vVi4mTyfpf8u2L8bdA==",
|
||||
@@ -828,0 +881,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.9.tgz",
|
||||
+ "integrity": "sha512-sicdRoWtYevwxjOHNMPTl3vSfJM6oyW8o1wXeI7uww6b6xHg8eBznQDNSGBCDJmsE8UMxP05JgZRtsKbTqt//Q==",
|
||||
@@ -833,0 +888,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
|
||||
+ "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==",
|
||||
@@ -886,0 +943,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
|
||||
+ "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
|
||||
@@ -1049,0 +1108,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/awilix/-/awilix-12.0.2.tgz",
|
||||
+ "integrity": "sha512-BoXlUZmTJc2j+uCDAMglNnWNf1b9KDEGmrgYs3vnOldK+bkiAiJnisgbIJWvGC1MFt/uYd3tG+Esd/0VmLreKw==",
|
||||
@@ -1293,0 +1354,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz",
|
||||
+ "integrity": "sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==",
|
||||
@@ -1569,0 +1632,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
|
||||
+ "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
|
||||
@@ -1851,0 +1916,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.12.0.tgz",
|
||||
+ "integrity": "sha512-UVIOlTEWxwIopRL1wgSQYdnVDcEvs2wyaO6DGo5mXqe3r16IoCNWkR29iHhyaP4cICWjbgbmFUGAhh0GJRuGZw==",
|
||||
@@ -1932,0 +1999,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz",
|
||||
+ "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==",
|
||||
@@ -1946,0 +2015,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.1.0.tgz",
|
||||
+ "integrity": "sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==",
|
||||
@@ -1993,0 +2064,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/espree/-/espree-10.2.0.tgz",
|
||||
+ "integrity": "sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==",
|
||||
@@ -2227,0 +2300,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
|
||||
+ "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
|
||||
@@ -2367,0 +2442,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/globals/-/globals-15.11.0.tgz",
|
||||
+ "integrity": "sha512-yeyNSjdbyVaWurlwCpcA6XNBrHTMIeDdj0/hnvX/OLJ9ekOXYbLsLinH/MucQyGvNnXhidTdNhTtJaffL2sMfw==",
|
||||
@@ -2581,0 +2658,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-12.0.0.tgz",
|
||||
+ "integrity": "sha512-W3mwgzLtWIqHndtAb82zCHbRfdPit3jcqEyYkAjM/4p15g/1tOoduYydx6IJ3sh31FHT82YoqYZB8RoTwoMy7w==",
|
||||
@@ -2874,0 +2953,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/ky/-/ky-1.7.2.tgz",
|
||||
+ "integrity": "sha512-OzIvbHKKDpi60TnF9t7UUVAF1B4mcqc02z5PIvrm08Wyb+yOcz63GRvEuVxNT18a9E1SrNouhB4W2NNLeD7Ykg==",
|
||||
@@ -3210,0 +3291,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz",
|
||||
+ "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==",
|
||||
@@ -3707,0 +3790,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
|
||||
+ "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
|
||||
@@ -3899,0 +3984,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.2.tgz",
|
||||
+ "integrity": "sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==",
|
||||
@@ -4319,0 +4406,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
|
||||
+ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
|
||||
@@ -4373,0 +4462,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
|
||||
+ "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
|
||||
@@ -4405,0 +4496,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz",
|
||||
+ "integrity": "sha512-yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg==",
|
||||
@@ -4415,0 +4508,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
|
||||
+ "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
|
||||
@@ -4427,0 +4522,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
|
||||
+ "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
|
||||
@@ -0,0 +1,65 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
esbuild,
|
||||
buildGoModule,
|
||||
}:
|
||||
let
|
||||
esbuild' = esbuild.override {
|
||||
buildGoModule =
|
||||
args:
|
||||
buildGoModule (
|
||||
args
|
||||
// rec {
|
||||
version = "0.24.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-czQJqLz6rRgyh9usuhDTmgwMC6oL5UzpwNFQ3PKpKck=";
|
||||
};
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
}
|
||||
);
|
||||
};
|
||||
in
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "fauna-shell";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fauna";
|
||||
repo = "fauna-shell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JbTS54e1pNxoqTAlEdOqKqkEyAzFJLI6he7/jivVPzI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./package-lock-fix.patch
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-RNgx3Oorc/+nHHZHdOmyA9Q3fCW7yaAzX0DqHbCMqt0=";
|
||||
|
||||
npmFlags = [ "--ignore-scripts" ];
|
||||
|
||||
env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
|
||||
|
||||
# While this errors, it makes the build complete successfully. Therefore, ????
|
||||
preBuild = ''
|
||||
npm rebuild --verbose cpu-features
|
||||
'';
|
||||
|
||||
npmBuildScript = "build:app";
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Interactive shell for FaunaDB";
|
||||
homepage = "https://github.com/fauna/fauna-shell";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ pyrox0 ];
|
||||
mainProgram = "fauna";
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,31 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p bash nodejs nix-update git curl jq
|
||||
|
||||
WORKDIR=$(mktemp -d)
|
||||
PACKAGE_DIR="$(realpath "$(dirname "$0")")"
|
||||
|
||||
# Get latest tag
|
||||
NEW_VERSION=$(curl "https://api.github.com/repos/fauna/fauna-shell/tags" | jq -r '.[] | .name' | sort --version-sort | tail -1)
|
||||
# Trim leading "v" for version comparisons
|
||||
NEW_VERSION=${NEW_VERSION:1}
|
||||
|
||||
# exit early if no change
|
||||
if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then
|
||||
echo "package is up-to-date: $UPDATE_NIX_OLD_VERSION"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Clone source
|
||||
git clone "https://github.com/fauna/fauna-shell" -b "v$NEW_VERSION" "$WORKDIR/src"
|
||||
pushd "$WORKDIR/src"
|
||||
npx --yes npm-package-lock-add-resolved
|
||||
|
||||
# Update package-lock patch
|
||||
git diff -U0 >"$PACKAGE_DIR/package-lock-fix.patch"
|
||||
popd
|
||||
|
||||
# Run nix-update
|
||||
nix-update "$UPDATE_NIX_PNAME"
|
||||
|
||||
# Cleanup
|
||||
rm -rf "$WORKDIR"
|
||||
@@ -57,6 +57,8 @@ stdenv.mkDerivation rec {
|
||||
makeWrapper $out/flowblade/flowblade $out/bin/flowblade \
|
||||
--set FREI0R_PATH ${frei0r}/lib/frei0r-1 \
|
||||
--set LADSPA_PATH ${ladspaPlugins}/lib/ladspa \
|
||||
--set GDK_BACKEND x11 \
|
||||
--set SDL_VIDEODRIVER x11 \
|
||||
--prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" \
|
||||
''${gappsWrapperArgs[@]}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
nodePackages,
|
||||
node-gyp-build,
|
||||
makeBinaryWrapper,
|
||||
nodejs,
|
||||
pnpm_10,
|
||||
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
|
||||
|
||||
buildInputs = [
|
||||
nodePackages.node-gyp-build
|
||||
node-gyp-build
|
||||
];
|
||||
|
||||
env.PYTHON = "${python3}/bin/python";
|
||||
|
||||
@@ -25,13 +25,13 @@
|
||||
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprtoolkit";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprtoolkit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-M+mlYKvzqW+TSoJ4MH9U+HcFoUmWc1etiXehyLEVB2M=";
|
||||
hash = "sha256-hbd5QccWWkzo+3FJzT8lxIKrEZM7naCRuMO7/hcBqWU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,15 +9,18 @@
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
tinyxxd,
|
||||
icu,
|
||||
pango,
|
||||
inih,
|
||||
withWindowSystem ? if stdenv.hostPlatform.isLinux then "all" else "x11",
|
||||
xorg,
|
||||
libxkbcommon,
|
||||
libGLU,
|
||||
libGL,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
versionCheckHook,
|
||||
withBackends ? [
|
||||
"farbfeld"
|
||||
"libjxl"
|
||||
@@ -41,14 +44,12 @@
|
||||
libnsbmp,
|
||||
libwebp,
|
||||
qoi,
|
||||
wayland-scanner,
|
||||
}:
|
||||
|
||||
let
|
||||
windowSystems = {
|
||||
all = windowSystems.x11 ++ windowSystems.wayland;
|
||||
x11 = [
|
||||
libGLU
|
||||
xorg.libxcb
|
||||
xorg.libX11
|
||||
];
|
||||
@@ -75,9 +76,7 @@ let
|
||||
libjpeg = libjpeg_turbo;
|
||||
};
|
||||
|
||||
backendFlags = map (
|
||||
b: if builtins.elem b withBackends then "-D${b}=enabled" else "-D${b}=disabled"
|
||||
) (builtins.attrNames backends);
|
||||
backendFlags = map (b: lib.mesonEnable b (lib.elem b withBackends)) (lib.attrNames backends);
|
||||
in
|
||||
|
||||
# check that given window system is valid
|
||||
@@ -89,7 +88,7 @@ assert builtins.all (
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imv";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
@@ -99,13 +98,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "~exec64";
|
||||
repo = "imv";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sOlWSv1GqdYzooTvcJjXxJI3pwWWJnlUpbGZgUAFYm0=";
|
||||
hash = "sha256-2JTs/hj6t9wEZKoUpcLDFulbdU/grDlQkuEAE7uayDs=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
"-Dwindows=${withWindowSystem}"
|
||||
"-Dtest=enabled"
|
||||
"-Dman=enabled"
|
||||
(lib.mesonOption "windows" withWindowSystem)
|
||||
(lib.mesonEnable "test" finalAttrs.finalPackage.doCheck)
|
||||
(lib.mesonEnable "man" true)
|
||||
]
|
||||
++ backendFlags;
|
||||
|
||||
@@ -121,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cmocka
|
||||
libGL
|
||||
icu
|
||||
libxkbcommon
|
||||
pango
|
||||
@@ -130,16 +129,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ windowSystems."${withWindowSystem}"
|
||||
++ map (b: backends."${b}") withBackends;
|
||||
|
||||
postFixup = lib.optionalString (withWindowSystem == "all") ''
|
||||
# The `bin/imv` script assumes imv-wayland or imv-x11 in PATH,
|
||||
# so we have to fix those to the binaries we installed into the /nix/store
|
||||
|
||||
substituteInPlace "$out/bin/imv" \
|
||||
--replace-fail "imv-wayland" "$out/bin/imv-wayland" \
|
||||
--replace-fail "imv-x11" "$out/bin/imv-x11"
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [
|
||||
tinyxxd
|
||||
];
|
||||
checkInputs = [
|
||||
cmocka
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "-v";
|
||||
|
||||
meta = {
|
||||
description = "Command line image viewer for tiling window managers";
|
||||
|
||||
@@ -48,7 +48,7 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ipxe";
|
||||
version = "1.21.1-unstable-2025-11-19";
|
||||
version = "1.21.1-unstable-2025-11-26";
|
||||
|
||||
nativeBuildInputs = [
|
||||
mtools
|
||||
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipxe";
|
||||
repo = "ipxe";
|
||||
rev = "81496315f22f5ab90eddf8788fc8526eab1852f9";
|
||||
hash = "sha256-5/qxoCUtCEoZxaf8j03hqWjmJHo3kpBFWpBV180gjaY=";
|
||||
rev = "d73981aece2544ee05685dccaf5a71b533fabb44";
|
||||
hash = "sha256-xhq8VRXdC6wPlViTHxI3fPcgE8gYvzcZTC2zN1b0DXo=";
|
||||
};
|
||||
|
||||
# Calling syslinux on a FAT image isn't going to work on Aarch64.
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
python3,
|
||||
xorg,
|
||||
fontconfig,
|
||||
nodePackages,
|
||||
node-gyp-build,
|
||||
ripgrep,
|
||||
pkg-config,
|
||||
libsecret,
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(python3.withPackages (ps: with ps; [ packaging ]))
|
||||
pkg-config
|
||||
nodejs
|
||||
nodePackages.node-gyp-build
|
||||
node-gyp-build
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
xcbuild
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
fixup-yarn-lock,
|
||||
nodejs,
|
||||
node-gyp-build,
|
||||
nodejs-slim,
|
||||
matrix-sdk-crypto-nodejs,
|
||||
nixosTests,
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
|
||||
fixup-yarn-lock
|
||||
nodejs-slim
|
||||
yarn
|
||||
nodejs.pkgs.node-gyp-build
|
||||
node-gyp-build
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nodejs,
|
||||
nix-update-script,
|
||||
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "node-gyp-build";
|
||||
version = "4.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prebuild";
|
||||
repo = "node-gyp-build";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-65EQGGpwL0C8AOhFyf62nVEt4e2pCS0lAv+20kt3Zdk=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
buildInputs = [
|
||||
nodejs
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/node_modules/node-gyp-build
|
||||
mkdir -p $out/bin
|
||||
|
||||
chmod +x ./{bin,build-test,optional}.js
|
||||
mv *.js package.json $out/lib/node_modules/node-gyp-build
|
||||
|
||||
ln -s $out/lib/node_modules/node-gyp-build/bin.js $out/bin/node-gyp-build
|
||||
ln -s $out/lib/node_modules/node-gyp-build/optional.js $out/bin/node-gyp-build-optional
|
||||
ln -s $out/lib/node_modules/node-gyp-build/build-test.js $out/bin/node-gyp-build-test
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Build tool and bindings loader for node-gyp that supports prebuilds";
|
||||
homepage = "https://github.com/prebuild/node-gyp-build";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pyrox0 ];
|
||||
mainProgram = "node-gyp-build";
|
||||
};
|
||||
})
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "paq";
|
||||
version = "1.3.0";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gregl83";
|
||||
repo = "paq";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rx9HkPLCRiaTbTLPPKOIhFU+WoJSr0dRtkvCUFZPn58=";
|
||||
hash = "sha256-2HlQzb3foNv/F35u7/737eJfNTsiQRCymggKAQ+mIS0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XaP5rGEPL9Zlth0QYs736eaBPiw46u38GqmSXwnttX0=";
|
||||
cargoHash = "sha256-LlqKdJhmOYnmnZA+xh7sogcnMWgpgm5qV6vwM3n3vng=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "parabolic";
|
||||
version = "2025.11.0";
|
||||
version = "2025.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NickvisionApps";
|
||||
repo = "Parabolic";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-0lzyCFp5V6eDaOKwCIDNG9QPry9fvUdnQcL+Ky9z1wo=";
|
||||
hash = "sha256-PNV7hdaP5F/VuaNH3trtJ8oQqLEps/oE6p34LgJ/tEs=";
|
||||
};
|
||||
|
||||
# Patches desktop file/dbus service bypassing wrapped executable
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
# redumper is using C++ modules, this requires latest C++20 compiler and build tools
|
||||
llvmPackages.libcxxStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "redumper";
|
||||
version = "664";
|
||||
version = "665";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superg";
|
||||
repo = "redumper";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-fc3M6Pim+x/UwHOWZDp3yjLx7ajcNaIfYgamskwPDSA=";
|
||||
hash = "sha256-eKoQuQD2Z2WzcyZNf/MloEoAH8SlwbKihCPON2Sj1NY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "teams-for-linux";
|
||||
version = "2.6.15";
|
||||
version = "2.6.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oy5wLcWgiZ/Myyl0pcnjZnicznz7j2PZl1yFsOIMnrs=";
|
||||
hash = "sha256-veOuhTo+RSKZnj+gEpd/Nf5+MipbpYcWtbZFoYYO4DI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-/aDn3RK5WY07eRYjBdI/aVi75FZuCVAsZoOx0EcnahM=";
|
||||
npmDepsHash = "sha256-iqSGqEz2YYNrNcB+B/8+KK/Ld2TzEFE+nFt3Oi6YP9w=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -34,13 +34,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xemu";
|
||||
version = "0.8.115";
|
||||
version = "0.8.116";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xemu-project";
|
||||
repo = "xemu";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RmMfS+HBZvLSCt4afKNIT8vfc3IUBCpnmF157A83iEo=";
|
||||
hash = "sha256-hmDAT2LCB+kyhYhLvGkpZnEGiXxD8RsPqt29ZFfS6q4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
|
||||
@@ -168,6 +168,7 @@ mapAliases {
|
||||
inherit (pkgs) eas-cli; # added 2025-01-08
|
||||
expo-cli = throw "expo-cli was removed because it was deprecated upstream. Use `npx expo` or eas-cli instead."; # added 2024-12-02
|
||||
fast-cli = throw "'fast-cli' has been removed because it was unmaintainable in nixpkgs"; # Added 2025-11-17
|
||||
inherit (pkgs) fauna-shell; # Added 2025-11-27
|
||||
inherit (pkgs) firebase-tools; # added 2023-08-18
|
||||
inherit (pkgs) fixjson; # added 2024-06-26
|
||||
fkill-cli = throw "'fkill-cli' has been removed because it was unmaintainable in nixpkgs"; # Added 2025-11-17
|
||||
@@ -252,6 +253,7 @@ mapAliases {
|
||||
near-cli = throw "'near-cli' has been removed as upstream has deprecated it and archived the source code repo"; # Added 2025-11-10
|
||||
neovim = pkgs.neovim-node-client; # added 2024-11-13
|
||||
nijs = throw "'nijs' has been removed as it was unmaintained upstream"; # Added 2025-11-14
|
||||
inherit (pkgs) node-gyp-build; # Added 2025-11-27
|
||||
node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21
|
||||
inherit (pkgs) node-gyp; # added 2024-08-13
|
||||
inherit (pkgs) node-pre-gyp; # added 2024-08-05
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
# Packages that provide a single executable.
|
||||
"@angular/cli" = "ng";
|
||||
aws-cdk = "cdk";
|
||||
fauna-shell = "fauna";
|
||||
grunt-cli = "grunt";
|
||||
gulp-cli = "gulp";
|
||||
pulp = "pulp";
|
||||
|
||||
@@ -14,14 +14,12 @@
|
||||
, "dotenv-vault"
|
||||
, "elasticdump"
|
||||
, "esy"
|
||||
, "fauna-shell"
|
||||
, "grunt-cli"
|
||||
, "gulp-cli"
|
||||
, "js-yaml"
|
||||
, "jsdoc"
|
||||
, "lcov-result-merger"
|
||||
, "mathjax"
|
||||
, "node-gyp-build"
|
||||
, "node2nix"
|
||||
, "postcss"
|
||||
, "prebuild-install"
|
||||
|
||||
-1693
File diff suppressed because it is too large
Load Diff
@@ -33,13 +33,6 @@ final: prev: {
|
||||
'';
|
||||
};
|
||||
|
||||
fauna-shell = prev.fauna-shell.override {
|
||||
# printReleaseNotes just pulls them from GitHub which is not allowed in sandbox
|
||||
preRebuild = ''
|
||||
sed -i 's|"node ./tools/printReleaseNotes"|"true"|' node_modules/faunadb/package.json
|
||||
'';
|
||||
};
|
||||
|
||||
node2nix = prev.node2nix.override {
|
||||
# Get latest commit for misc fixes
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywikibot";
|
||||
version = "10.4.0";
|
||||
version = "10.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ZpD/zTHUDR/owP9S7WTipZoGJuHdsORs+7w23u1Irxc=";
|
||||
hash = "sha256-waO9rPadF5N65s0mOrIhr/OJW9Ax5f9uRUoUyRMWDIw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rigour";
|
||||
version = "1.4.2";
|
||||
version = "1.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opensanctions";
|
||||
repo = "rigour";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-60/zaFw2rYJ6dHEU+0QimdsXHmfndiR5dguZCYE55Rc=";
|
||||
hash = "sha256-0uqKcjGxI22jNt7lLP0LvhIyQO2yxV5tS6fW9QiQ814=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -1,38 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
buildPackages,
|
||||
buildPythonPackage,
|
||||
cargo,
|
||||
fetchFromGitHub,
|
||||
maturin,
|
||||
nexusrpc,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
pythonOlder,
|
||||
poetry-core,
|
||||
protobuf5,
|
||||
python-dateutil,
|
||||
rustc,
|
||||
rustPlatform,
|
||||
setuptools,
|
||||
setuptools-rust,
|
||||
buildPackages,
|
||||
|
||||
# build-system
|
||||
maturin,
|
||||
|
||||
# dependencies
|
||||
nexusrpc,
|
||||
protobuf,
|
||||
types-protobuf,
|
||||
typing-extensions,
|
||||
pythonOlder,
|
||||
python-dateutil,
|
||||
|
||||
# nativeBuildInputs
|
||||
cargo,
|
||||
rustc,
|
||||
|
||||
# passthru
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "temporalio";
|
||||
version = "1.19.0";
|
||||
version = "1.20.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-KjbHm1uSsIla+kiov5qxCS4SjAS4zMk0txgS+558bgI=";
|
||||
tag = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-JScwBcVkl5kAxO4zKmt1ab6b1KlhGmPSjr7O0PRu0p8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
@@ -42,23 +45,20 @@ buildPythonPackage rec {
|
||||
src
|
||||
cargoRoot
|
||||
;
|
||||
hash = "sha256-BBXqIRj5Rpk0P/fhLb1ugnOli0NuQgS8E9jPFR39KpI=";
|
||||
hash = "sha256-vhoXn4Aur4/VSwM2qVxOiWEI5/zAmep9ViQMGLln9PU=";
|
||||
};
|
||||
|
||||
cargoRoot = "temporalio/bridge";
|
||||
|
||||
build-system = [
|
||||
maturin
|
||||
poetry-core
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export PROTOC=${buildPackages.protobuf}/bin/protoc
|
||||
'';
|
||||
env.PROTOC = "${lib.getExe buildPackages.protobuf}";
|
||||
|
||||
dependencies = [
|
||||
nexusrpc
|
||||
protobuf5
|
||||
protobuf
|
||||
types-protobuf
|
||||
typing-extensions
|
||||
]
|
||||
@@ -69,8 +69,6 @@ buildPythonPackage rec {
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.maturinBuildHook
|
||||
rustc
|
||||
setuptools
|
||||
setuptools-rust
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
jinja2,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "typesystem";
|
||||
version = "0.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "encode";
|
||||
repo = "typesystem";
|
||||
rev = version;
|
||||
hash = "sha256-fjnheHWjIDbJY1iXCRKCpqTCwtUWK9YXbynRCZquQ7c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jinja2
|
||||
pyyaml
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "typesystem" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Type system library for Python";
|
||||
homepage = "https://github.com/encode/typesystem";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@@ -37,6 +37,9 @@ buildPythonPackage rec {
|
||||
cp -r --no-preserve=all ${nlohmann_json.src}/single_include/nlohmann/json.hpp deps/json/
|
||||
cp -r --no-preserve=all ${pybind11.src} deps/pybind11/
|
||||
cp -r --no-preserve=all ${gtest.src} deps/googletest/
|
||||
|
||||
substituteInPlace deps/pog/deps/fmt/fmt/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
@@ -61,11 +64,11 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "yaramod" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Parsing of YARA rules into AST and building new rulesets in C++";
|
||||
homepage = "https://github.com/avast/yaramod";
|
||||
changelog = "https://github.com/avast/yaramod/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ msm ];
|
||||
changelog = "https://github.com/avast/yaramod/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ msm ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13530,6 +13530,10 @@ with pkgs;
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_12;
|
||||
};
|
||||
|
||||
bitwuzla = callPackage ../by-name/bi/bitwuzla/package.nix {
|
||||
cadical = cadical.override { version = "2.1.3"; };
|
||||
};
|
||||
|
||||
inherit
|
||||
(callPackage ./rocq-packages.nix {
|
||||
inherit (ocaml-ng)
|
||||
|
||||
@@ -479,6 +479,7 @@ mapAliases {
|
||||
tweedledum = throw "'tweedledum' has been removed due to lack of upstream maintenance."; # Added 2025-11-22
|
||||
typed-ast = throw "typed-ast was removed because it went end of life in July 2023"; # added 2025-05-24
|
||||
types-typed-ast = throw "types-typed-ast was removed because so was typed-ast"; # added 2025-05-24
|
||||
typesystem = throw "'typesystem' has been removed as it was broken, unmaintained, and archived upstream"; # Added 2025-11-27
|
||||
uamqp = throw "'uamqp' has been removed because it is broken and unmaintained."; # added 2025-06-11
|
||||
ufoLib2 = throw "'ufoLib2' has been renamed to/replaced by 'ufolib2'"; # Converted to throw 2025-10-29
|
||||
unicode-slugify = throw "'unicode-slugify' has been removed becaues it was broken and unmaintained. Consider using 'python-slugify' instead."; # added 2025-10-05
|
||||
|
||||
@@ -19715,8 +19715,6 @@ self: super: with self; {
|
||||
|
||||
typeshed-client = callPackage ../development/python-modules/typeshed-client { };
|
||||
|
||||
typesystem = callPackage ../development/python-modules/typesystem { };
|
||||
|
||||
typical = callPackage ../development/python-modules/typical { };
|
||||
|
||||
typing = null;
|
||||
|
||||
Reference in New Issue
Block a user