Merge master into staging-next
This commit is contained in:
@@ -52,17 +52,6 @@ The maintainer is designated by a `selector` which must be one of:
|
||||
|
||||
[`maintainer-list.nix`]: ../maintainer-list.nix
|
||||
|
||||
### `get-maintainer-pings-between.sh`
|
||||
|
||||
Gets which maintainers would be pinged between two Nixpkgs revisions.
|
||||
Outputs a JSON object on stdout mapping GitHub usernames to the attributes that they would be getting pinged for.
|
||||
|
||||
Example:
|
||||
|
||||
```sh
|
||||
maintainers/scripts/get-maintainer-pings-between.sh HEAD^ HEAD
|
||||
```
|
||||
|
||||
## Conventions
|
||||
|
||||
### `sha-to-sri.py`
|
||||
|
||||
@@ -86,7 +86,7 @@ in
|
||||
"touch /opt/excluded_file_1 /opt/excluded_file_2",
|
||||
|
||||
# test that remotebackup runs custom commands and produces a snapshot
|
||||
"timedatectl set-time '2016-12-13 13:45'",
|
||||
"date -s '2016-12-13 13:45'",
|
||||
"systemctl start restic-backups-remotebackup.service",
|
||||
"rm /root/backupCleanupCommand",
|
||||
'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
|
||||
@@ -97,23 +97,23 @@ in
|
||||
"diff -ru ${testDir} /tmp/restore-1/opt",
|
||||
|
||||
# test that we can create four snapshots in remotebackup and rclonebackup
|
||||
"timedatectl set-time '2017-12-13 13:45'",
|
||||
"date -s '2017-12-13 13:45'",
|
||||
"systemctl start restic-backups-remotebackup.service",
|
||||
"rm /root/backupCleanupCommand",
|
||||
|
||||
"timedatectl set-time '2018-12-13 13:45'",
|
||||
"date -s '2018-12-13 13:45'",
|
||||
"systemctl start restic-backups-remotebackup.service",
|
||||
"rm /root/backupCleanupCommand",
|
||||
|
||||
"timedatectl set-time '2018-12-14 13:45'",
|
||||
"date -s '2018-12-14 13:45'",
|
||||
"systemctl start restic-backups-remotebackup.service",
|
||||
"rm /root/backupCleanupCommand",
|
||||
|
||||
"timedatectl set-time '2018-12-15 13:45'",
|
||||
"date -s '2018-12-15 13:45'",
|
||||
"systemctl start restic-backups-remotebackup.service",
|
||||
"rm /root/backupCleanupCommand",
|
||||
|
||||
"timedatectl set-time '2018-12-16 13:45'",
|
||||
"date -s '2018-12-16 13:45'",
|
||||
"systemctl start restic-backups-remotebackup.service",
|
||||
"rm /root/backupCleanupCommand",
|
||||
|
||||
|
||||
@@ -247,7 +247,7 @@ in
|
||||
|
||||
restic.succeed(
|
||||
# test that remotebackup runs custom commands and produces a snapshot
|
||||
"timedatectl set-time '2016-12-13 13:45'",
|
||||
"date -s '2016-12-13 13:45'",
|
||||
"systemctl start restic-backups-remotebackup.service",
|
||||
"rm /root/backupCleanupCommand",
|
||||
'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
|
||||
@@ -255,7 +255,7 @@ in
|
||||
|
||||
restic.succeed(
|
||||
# test that remotebackup runs custom commands and produces a snapshot
|
||||
"timedatectl set-time '2016-12-13 13:45'",
|
||||
"date -s '2016-12-13 13:45'",
|
||||
"systemctl start restic-backups-remotebackup.service",
|
||||
"rm /root/backupCleanupCommand",
|
||||
'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
|
||||
@@ -297,27 +297,27 @@ in
|
||||
"grep 'check.* --some-check-option' /root/fake-restic.log",
|
||||
|
||||
# test that we can create four snapshots in remotebackup and rclonebackup
|
||||
"timedatectl set-time '2017-12-13 13:45'",
|
||||
"date -s '2017-12-13 13:45'",
|
||||
"systemctl start restic-backups-remotebackup.service",
|
||||
"rm /root/backupCleanupCommand",
|
||||
"systemctl start restic-backups-rclonebackup.service",
|
||||
|
||||
"timedatectl set-time '2018-12-13 13:45'",
|
||||
"date -s '2018-12-13 13:45'",
|
||||
"systemctl start restic-backups-remotebackup.service",
|
||||
"rm /root/backupCleanupCommand",
|
||||
"systemctl start restic-backups-rclonebackup.service",
|
||||
|
||||
"timedatectl set-time '2018-12-14 13:45'",
|
||||
"date -s '2018-12-14 13:45'",
|
||||
"systemctl start restic-backups-remotebackup.service",
|
||||
"rm /root/backupCleanupCommand",
|
||||
"systemctl start restic-backups-rclonebackup.service",
|
||||
|
||||
"timedatectl set-time '2018-12-15 13:45'",
|
||||
"date -s '2018-12-15 13:45'",
|
||||
"systemctl start restic-backups-remotebackup.service",
|
||||
"rm /root/backupCleanupCommand",
|
||||
"systemctl start restic-backups-rclonebackup.service",
|
||||
|
||||
"timedatectl set-time '2018-12-16 13:45'",
|
||||
"date -s '2018-12-16 13:45'",
|
||||
"systemctl start restic-backups-remotebackup.service",
|
||||
"rm /root/backupCleanupCommand",
|
||||
"systemctl start restic-backups-rclonebackup.service",
|
||||
|
||||
@@ -24,12 +24,6 @@ import ./make-test-python.nix (
|
||||
libDir = pkgs.stdenv.hostPlatform.libDir;
|
||||
ldsoBasename = lib.last (lib.splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker);
|
||||
|
||||
check32 = pkgs.stdenv.hostPlatform.isx86_64;
|
||||
pkgs32 = pkgs.pkgsi686Linux;
|
||||
|
||||
libDir32 = pkgs32.stdenv.hostPlatform.libDir;
|
||||
ldsoBasename32 = lib.last (lib.splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker);
|
||||
|
||||
test-exec =
|
||||
builtins.mapAttrs
|
||||
(
|
||||
@@ -45,8 +39,6 @@ import ./make-test-python.nix (
|
||||
aarch64-linux.hash = "sha256-hnldbd2cctQIAhIKoEZLIWY8H3jiFBClkNy2UlyyvAs=";
|
||||
};
|
||||
exec-name = "rustic";
|
||||
|
||||
if32 = pythonStatement: if check32 then pythonStatement else "pass";
|
||||
in
|
||||
''
|
||||
machine.start()
|
||||
@@ -54,35 +46,26 @@ import ./make-test-python.nix (
|
||||
|
||||
with subtest("Check for stub (enabled, initial)"):
|
||||
machine.succeed('test -L /${libDir}/${ldsoBasename}')
|
||||
${if32 "machine.succeed('test -L /${libDir32}/${ldsoBasename32}')"}
|
||||
|
||||
with subtest("Try FHS executable"):
|
||||
machine.copy_from_host('${test-exec.${pkgs.stdenv.hostPlatform.system}}','test-exec')
|
||||
machine.succeed('if test-exec/${exec-name} 2>outfile; then false; else [ $? -eq 127 ];fi')
|
||||
machine.succeed('grep -qi nixos outfile')
|
||||
${if32 "machine.copy_from_host('${
|
||||
test-exec.${pkgs32.stdenv.hostPlatform.system}
|
||||
}','test-exec32')"}
|
||||
${if32 "machine.succeed('if test-exec32/${exec-name} 2>outfile32; then false; else [ $? -eq 127 ];fi')"}
|
||||
${if32 "machine.succeed('grep -qi nixos outfile32')"}
|
||||
|
||||
with subtest("Disable stub"):
|
||||
machine.succeed("/run/booted-system/specialisation/nostub/bin/switch-to-configuration test")
|
||||
|
||||
with subtest("Check for stub (disabled)"):
|
||||
machine.fail('test -e /${libDir}/${ldsoBasename}')
|
||||
${if32 "machine.fail('test -e /${libDir32}/${ldsoBasename32}')"}
|
||||
|
||||
with subtest("Create file in stub location (to be overwritten)"):
|
||||
machine.succeed('mkdir -p /${libDir};touch /${libDir}/${ldsoBasename}')
|
||||
${if32 "machine.succeed('mkdir -p /${libDir32};touch /${libDir32}/${ldsoBasename32}')"}
|
||||
|
||||
with subtest("Re-enable stub"):
|
||||
machine.succeed("/run/booted-system/bin/switch-to-configuration test")
|
||||
|
||||
with subtest("Check for stub (enabled, final)"):
|
||||
machine.succeed('test -L /${libDir}/${ldsoBasename}')
|
||||
${if32 "machine.succeed('test -L /${libDir32}/${ldsoBasename32}')"}
|
||||
'';
|
||||
}
|
||||
)
|
||||
|
||||
@@ -46,6 +46,20 @@ mkDerivation rec {
|
||||
./cstring.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.8.9)" "cmake_minimum_required(VERSION 3.10)"
|
||||
substituteInPlace spuce/{,spuce}/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
|
||||
|
||||
substituteInPlace spuce/qt_{fir,iir,other,window}/CMakeLists.txt \
|
||||
--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
|
||||
|
||||
substituteInPlace {audio,blocks,comms,flow,plotters,python,soapy,widgets}/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.8.9)" "cmake_minimum_required(VERSION 3.10)"
|
||||
|
||||
'';
|
||||
|
||||
# poco 1.14 requires c++17
|
||||
NIX_CFLAGS_COMPILE = [ "-std=gnu++17" ];
|
||||
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
lib,
|
||||
}:
|
||||
rec {
|
||||
version = "4.3.6";
|
||||
version = "4.3.7";
|
||||
inherit pname;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/linux-gpib/linux-gpib%20for%203.x.x%20and%202.6.x%20kernels/${version}/linux-gpib-${version}.tar.gz";
|
||||
hash = "sha256-Gze4xrvkhEgn+J5Jhrycezjp2uhlD1v6aX0WGv4J2Jg=";
|
||||
hash = "sha256-s/+BJgaGXIW1iwEqQhim/juC0XfIwKvHlcsi20HzrWg=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@@ -21,6 +21,7 @@ stdenv.mkDerivation (
|
||||
|
||||
makeFlags = [
|
||||
"LINUX_SRCDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
"LINUX_SSRCDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
lib,
|
||||
cmake,
|
||||
qtbase,
|
||||
@@ -13,18 +14,26 @@
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vite";
|
||||
version = "unstable-2022-05-17";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.inria.fr";
|
||||
owner = "solverstack";
|
||||
repo = "vite";
|
||||
rev = "6d497cc519fac623e595bd174e392939c4de845c";
|
||||
hash = "sha256-Yf2jYALZplIXzVtd/sg6gzEYrZ+oU0zLG1ETd/hiTi0=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-z2M4BazLzO/NCcq/VKb+tgrZ6QUs+AX0BbzJW809Krg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "cmake4-fix";
|
||||
url = "https://gitlab.inria.fr/solverstack/vite/-/commit/0359f78c8b11ced3a79ac4d73f4ecb9087eba1e8.patch";
|
||||
hash = "sha256-UMg21ZlwyRSVQ4CD1oKNUkT+RNxqOIQi2WNBLbYPkJg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
@@ -51,7 +60,7 @@ stdenv.mkDerivation {
|
||||
|
||||
homepage = "http://vite.gforge.inria.fr/";
|
||||
license = lib.licenses.cecill20;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,29 +8,22 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "adminneo";
|
||||
version = "5.1.1";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adminneo-org";
|
||||
repo = "adminneo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ckz0LvKLY6xm3thPmY/ry8G5kkt29rmDsG/D6NNeRoY=";
|
||||
hash = "sha256-x92APmqRbH9XxMJjQASwHAgD0SWTK63MMYwkbiEq7U8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
php
|
||||
];
|
||||
|
||||
# Package provides a Makefile, which is currently broken
|
||||
# https://github.com/adminneo-org/adminneo/issues/161
|
||||
# As soon, as this is fixed, the buildPhase can be removed
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
${php}/bin/php bin/compile.php
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
makeFlags = [
|
||||
"PHP=${php}/bin/php"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
# NOTICE: AHK_X11 from this package does not support compiling scripts into portable executables.
|
||||
let
|
||||
pname = "ahk_x11";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
inherit (xorg)
|
||||
libXinerama
|
||||
@@ -37,7 +37,7 @@ crystal.buildCrystalPackage {
|
||||
owner = "phil294";
|
||||
repo = "AHK_X11";
|
||||
tag = version;
|
||||
hash = "sha256-t2fGUIG3T8azx22lFhFAkABHwkePv9uThhlH+fwDj8E=";
|
||||
hash = "sha256-VuqLlRgNyF6/4aVq1sNlVjOMih0TdHXbr0CqhA4QT6Y=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,60 +1,60 @@
|
||||
{
|
||||
atspi = {
|
||||
"atspi" = {
|
||||
url = "https://github.com/phil294/atspi.cr.git";
|
||||
rev = "7aec8d3604313da415e54e654c1dc6b33ae05d8d";
|
||||
sha256 = "1r6k9f00a2y406hqsgq0r58zlfmg3xbzqjmfh93nwqs4m6h0shml";
|
||||
};
|
||||
cron_parser = {
|
||||
"cron_parser" = {
|
||||
url = "https://github.com/kostya/cron_parser.git";
|
||||
rev = "v0.4.0";
|
||||
sha256 = "17fgg2nvyx99v05l10h6cnxfr7swz8yaxhmnk4l47kg2spi8w90a";
|
||||
};
|
||||
future = {
|
||||
"future" = {
|
||||
url = "https://github.com/crystal-community/future.cr.git";
|
||||
rev = "v1.0.0";
|
||||
sha256 = "1mji2djkrf4vxgs432kgkzxx54ybzk636789k2vsws3sf14l74i8";
|
||||
};
|
||||
gi-crystal = {
|
||||
"gi-crystal" = {
|
||||
url = "https://github.com/hugopl/gi-crystal.git";
|
||||
rev = "v0.23.0";
|
||||
sha256 = "0ykb7sy62036brix12sj416h6gx85liq2kivwkh2cmf71lk02cqr";
|
||||
};
|
||||
gtk3 = {
|
||||
"gtk3" = {
|
||||
url = "https://github.com/phil294/gtk3.cr.git";
|
||||
rev = "3e6cdc45c1c39d82c215b4cdf0bbb9b5598460e1";
|
||||
sha256 = "0x25p85kp2f6gbsi36nyddhji7mmmqa7v4xs18bddf3kbgh72nw3";
|
||||
};
|
||||
harfbuzz = {
|
||||
"harfbuzz" = {
|
||||
url = "https://github.com/hugopl/harfbuzz.cr.git";
|
||||
rev = "v0.2.0";
|
||||
sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694";
|
||||
rev = "v0.2.1";
|
||||
sha256 = "08zx5q1mm1h4lzfr38dk8nk7mx1y955zdjl6n48rl619bc1ywdpg";
|
||||
};
|
||||
notify = {
|
||||
"notify" = {
|
||||
url = "https://github.com/phil294/notify.cr.git";
|
||||
rev = "0c9880e6169e09f0db1cb40432e0b76651d15ad3";
|
||||
sha256 = "1waasvhx4n817d8gqk3fza4ac4a9d71f80cfii5dbh2aqzhqf070";
|
||||
};
|
||||
pango = {
|
||||
"pango" = {
|
||||
url = "https://github.com/hugopl/pango.cr.git";
|
||||
rev = "v0.3.1";
|
||||
sha256 = "0xlf127flimnll875mcq92q7xsi975rrgdpcpmnrwllhdhfx9qmv";
|
||||
};
|
||||
tasker = {
|
||||
"tasker" = {
|
||||
url = "https://github.com/spider-gazelle/tasker.git";
|
||||
rev = "v2.1.4";
|
||||
sha256 = "0254sl279nrw5nz43dz5gm89ah1zrw5bvxfma81navpx5gfg9pyb";
|
||||
};
|
||||
x11 = {
|
||||
"x11" = {
|
||||
url = "https://github.com/phil294/x11-cr.git";
|
||||
rev = "5a937d647d8eac29106602fcdeb161a78eb3d59d";
|
||||
sha256 = "11rflkxrg1dl5c80llwan4qs47ir7w7lgqdmhy2z907kxbrfkznr";
|
||||
};
|
||||
x_do = {
|
||||
"x_do" = {
|
||||
url = "https://github.com/phil294/x_do.cr.git";
|
||||
rev = "94f755a4f18a9a9820e9738b371cbe6b49731926";
|
||||
sha256 = "099mrhyb8kly6isk7xr1mzxbxfm4xizmyyw2ylmlx4ywynz9iyl6";
|
||||
};
|
||||
xtst = {
|
||||
"xtst" = {
|
||||
url = "https://github.com/phil294/xtst-cr.git";
|
||||
rev = "f731b708e1789d039258ecd62f7b0d1107a00b78";
|
||||
sha256 = "1vhzn1ck7ifkvhw5f9kpljsa278va039wa6f3hhd8w6gr2zqvzk8";
|
||||
|
||||
@@ -6,22 +6,28 @@
|
||||
openal,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "alure";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://kcat.strangesoft.net/alure-releases/alure-${version}.tar.bz2";
|
||||
sha256 = "0w8gsyqki21s1qb2s5ac1kj08i6nc937c0rr08xbw9w9wvd6lpj6";
|
||||
url = "http://deb.debian.org/debian/pool/main/a/alure/alure_${finalAttrs.version}.orig.tar.bz2";
|
||||
hash = "sha256-Rl5q2uaJJ746AjkDdkZi1kQE5AxMFS0WDjqIOLHXD3E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ openal ];
|
||||
|
||||
meta = with lib; {
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.4)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Utility library to help manage common tasks with OpenAL applications";
|
||||
homepage = "https://github.com/kcat/alure";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -28,6 +28,11 @@ stdenv.mkDerivation {
|
||||
libsndfile
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Utility library for OpenAL, providing a C++ API and managing common tasks that include file loading, caching, and streaming";
|
||||
homepage = "https://github.com/kcat/alure";
|
||||
|
||||
@@ -54,7 +54,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
mainProgram = "aranym";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
platforms = lib.platforms.unix;
|
||||
# never successfully built on Hydra for darwin or aarch64 linux
|
||||
broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -35,6 +35,11 @@ stdenv.mkDerivation rec {
|
||||
"-DBICPL_DIR=${bicpl}/lib"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/${owner}/bicgl";
|
||||
description = "Brain Imaging Centre graphics library";
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
swt,
|
||||
fetchurl,
|
||||
jre,
|
||||
wrapGAppsHook3,
|
||||
@@ -16,7 +17,18 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-NBXEY5f2kVPoZit7Gy4rM61bwQSdXovg0gURukhxJJ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook3 ];
|
||||
nativeBuildInputs = [
|
||||
swt
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
swt
|
||||
];
|
||||
|
||||
runtimeDeps = [
|
||||
swt
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
@@ -34,6 +46,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cp -r ./* $out/share/biglybt/
|
||||
|
||||
ln -s ${swt}/lib/* $out/share/biglybt/
|
||||
rm -rf $out/share/biglybt/swt/*.jar $out/share/biglybt/swt/J17/*.jar
|
||||
ln -s ${swt}/jars/swt.jar $out/share/biglybt/swt/swt-$(uname -m).jar
|
||||
ln -s ${swt}/jars/swt.jar $out/share/biglybt/swt/J17/swt-$(uname -m).jar
|
||||
|
||||
ln -s $out/share/biglybt/biglybt.desktop $out/share/applications/
|
||||
|
||||
ln -s $out/share/biglybt/biglybt.svg $out/share/icons/hicolor/scalable/apps/
|
||||
|
||||
@@ -207,7 +207,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic"
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-DLIBDIR=/does-not-exist"
|
||||
"-DSSE2NEON_INCLUDE_DIR=${sse2neon}/lib"
|
||||
"-DSSE2NEON_INCLUDE_DIR=${sse2neon}/include"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -4,18 +4,18 @@
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
portaudio,
|
||||
testers,
|
||||
catnip,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "catnip";
|
||||
version = "1.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "noriah";
|
||||
repo = "catnip";
|
||||
rev = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-M9VGpDsBambe9kXyEgDg53pKOSL2zH1ugfSbRgAiaCo=";
|
||||
};
|
||||
|
||||
@@ -31,22 +31,25 @@ buildGoModule rec {
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=main.version=${version}"
|
||||
"-X=main.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = catnip;
|
||||
};
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Terminal audio visualizer for linux/unix/macOS/windows";
|
||||
homepage = "https://github.com/noriah/catnip";
|
||||
changelog = "https://github.com/noriah/catnip/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
changelog = "https://github.com/noriah/catnip/releases/tag/${finalAttrs.src.rev}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ liberodark ];
|
||||
mainProgram = "catnip";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
llvmPackages_19,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
@@ -12,15 +13,19 @@
|
||||
opencl-headers,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
stdenv' = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv;
|
||||
in
|
||||
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "clblas";
|
||||
version = "2.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clMathLibraries";
|
||||
repo = "clBLAS";
|
||||
rev = "v${version}";
|
||||
sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Wq5oBl3TW3qpK0cyNWVgJMS5/s8xY1dulqDCkkX5lZQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -33,6 +38,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt
|
||||
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
|
||||
substituteInPlace src/library/tools/tplgen/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
@@ -59,15 +69,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/clMathLibraries/clBLAS";
|
||||
description = "Software library containing BLAS functions written in OpenCL";
|
||||
longDescription = ''
|
||||
This package contains a library of BLAS functions on top of OpenCL.
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.unix;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
})
|
||||
|
||||
@@ -37,7 +37,7 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "coc-flutter";
|
||||
version = "0-unstable-2023-03-22";
|
||||
version = "1.9.3-unstable-2023-03-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iamcco";
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
buildNpmPackage {
|
||||
pname = "coc-rust-analyzer";
|
||||
version = "0-unstable-2025-10-31";
|
||||
version = "0-unstable-2025-11-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "coc-vimlsp";
|
||||
version = "0-unstable-2023-06-26";
|
||||
version = "0.8.0-unstable-2023-06-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iamcco";
|
||||
|
||||
@@ -47,6 +47,11 @@ stdenv.mkDerivation {
|
||||
"-DBICPL_DIR=${bicpl}/lib"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
for p in $out/bin/*; do
|
||||
wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${
|
||||
|
||||
@@ -70,6 +70,11 @@ stdenv.mkDerivation {
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace extern/googletest/googletest/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.6.2)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
@@ -16,6 +17,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-oGVkDf1gFaSMRpvHq4GNLN8htBm/sYawZeVwiqQxjL8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# cmake-4 support:
|
||||
# https://github.com/sandsmark/dmsdos/pull/1
|
||||
(fetchpatch {
|
||||
name = "cmake-4.patch";
|
||||
url = "https://github.com/sandsmark/dmsdos/commit/94076ab27800e9cba41ab05e6bb2edbb421154d9.patch";
|
||||
hash = "sha256-olpnzPg/kbveUl0muwHKwI+DMGqXzxLrruFomf/SXjE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
@@ -29,6 +29,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [
|
||||
# One of the examples tests shared library support
|
||||
# and fails linking.
|
||||
"-DDOCTEST_WITH_TESTS=OFF"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Fix the build with LLVM 21 / GCC 15.
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
From 778cb2ed0d56614fd06d2129398799e46ff51720 Mon Sep 17 00:00:00 2001
|
||||
From: Marcin Serwin <marcin@serwin.dev>
|
||||
Date: Mon, 3 Nov 2025 22:25:10 +0100
|
||||
Subject: [PATCH] Add aarch64-linux support
|
||||
|
||||
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
|
||||
---
|
||||
src/Etterna/Models/Misc/StageStats.cpp | 23 +++++++++++++++++++++--
|
||||
1 file changed, 21 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/Etterna/Models/Misc/StageStats.cpp b/src/Etterna/Models/Misc/StageStats.cpp
|
||||
index 0c70cf25ae..671717505d 100644
|
||||
--- a/src/Etterna/Models/Misc/StageStats.cpp
|
||||
+++ b/src/Etterna/Models/Misc/StageStats.cpp
|
||||
@@ -19,8 +19,9 @@
|
||||
#include "Etterna/Singletons/GameManager.h"
|
||||
#include "Etterna/Models/NoteData/NoteDataUtil.h"
|
||||
|
||||
-#if !( defined(_WIN32) || defined(__APPLE__))
|
||||
- #include <cpuid.h> //We only use cpuid.h on Linux :)
|
||||
+#if !( defined(_WIN32) || defined(__APPLE__)) \
|
||||
+ && (defined(__x86_64__) || defined(__i386__))
|
||||
+ #include <cpuid.h> //We only use cpuid.h on x86 Linux :)
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
@@ -236,6 +237,8 @@ getCpuHash()
|
||||
|
||||
#else // !DARWIN
|
||||
|
||||
+#if defined(__x86_64__) || defined(__i386__)
|
||||
+
|
||||
uint16_t
|
||||
getCpuHash()
|
||||
{
|
||||
@@ -248,6 +251,22 @@ getCpuHash()
|
||||
|
||||
return hash;
|
||||
}
|
||||
+
|
||||
+#else // !x86
|
||||
+
|
||||
+uint16_t
|
||||
+getCpuHash()
|
||||
+{
|
||||
+ // https://www.kernel.org/doc/html/v6.17/arch/arm64/cpu-feature-registers.html
|
||||
+ uint64_t midr = 0;
|
||||
+ asm("mrs %0, MIDR_EL1" : "=r"(midr));
|
||||
+
|
||||
+ // Only leave implementer, variant, and architecture bits.
|
||||
+ // See https://developer.arm.com/documentation/ddi0601/2025-09/AArch64-Registers/MIDR-EL1--Main-ID-Register?lang=en
|
||||
+ return midr >> 16;
|
||||
+}
|
||||
+
|
||||
+#endif // !x86
|
||||
#endif // !DARWIN
|
||||
|
||||
std::string
|
||||
--
|
||||
2.51.0
|
||||
|
||||
@@ -27,7 +27,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-ZCQt99Qcov/7jGfrSmX9WftaP2U2B1d1APK1mxrUDBs=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-download-manager.patch ];
|
||||
patches = [
|
||||
./fix-download-manager.patch
|
||||
|
||||
# https://github.com/etternagame/etterna/pull/1396
|
||||
./0001-Add-aarch64-linux-support.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@@ -105,5 +110,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ alikindsys ];
|
||||
mainProgram = "etterna";
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -2,32 +2,23 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
wxGTK32,
|
||||
boost,
|
||||
firebird,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.3.12";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.9.14";
|
||||
pname = "flamerobin";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mariuz";
|
||||
repo = "flamerobin";
|
||||
rev = version;
|
||||
sha256 = "sha256-uWx3riRc79VKh7qniWFjxxc7v6l6cW0i31HxoN1BSdA=";
|
||||
tag = "${finalAttrs.version}";
|
||||
hash = "sha256-IwJEFF3vP0BC9PoMoY+XPLT+ygXnFXP/TWaqjdQWs8s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# rely on compiler command line for __int128 and std::decimal::decimal128
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mariuz/flamerobin/commit/8e0ea6d42aa28a4baeaa8c8b8b57c56eb9ae3540.patch";
|
||||
sha256 = "sha256-l6LWXA/sRQGQKi798bzl0iIJ2vdvXHOjG7wdFSXv+NM=";
|
||||
})
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@@ -38,12 +29,12 @@ stdenv.mkDerivation rec {
|
||||
firebird
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Database administration tool for Firebird RDBMS";
|
||||
homepage = "https://github.com/mariuz/flamerobin";
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = with maintainers; [ uralbash ];
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.bsdOriginal;
|
||||
maintainers = with lib.maintainers; [ uralbash ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "flamerobin";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
flutter332,
|
||||
flutter335,
|
||||
keybinder3,
|
||||
libayatana-appindicator,
|
||||
buildGoModule,
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
let
|
||||
pname = "flclash";
|
||||
version = "0.8.87";
|
||||
version = "0.8.90";
|
||||
|
||||
src =
|
||||
(fetchFromGitHub {
|
||||
owner = "chen08209";
|
||||
repo = "FlClash";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vGRq9Kc6XU6r3huIGAKoh5x46fFS8jmXgus9WgpvG3A=";
|
||||
hash = "sha256-wEgWjzdP7HeWgDacaP9fYNczG9BrTN790AQ5aj9scwM=";
|
||||
fetchSubmodules = true;
|
||||
}).overrideAttrs
|
||||
(_: {
|
||||
@@ -28,20 +28,20 @@ let
|
||||
GIT_CONFIG_VALUE_0 = "git@github.com:";
|
||||
});
|
||||
|
||||
metaCommon = {
|
||||
description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
|
||||
meta = {
|
||||
description = "Proxy client based on ClashMeta, simple and easy to use";
|
||||
homepage = "https://github.com/chen08209/FlClash";
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
libclash = buildGoModule {
|
||||
inherit version src;
|
||||
pname = "libclash";
|
||||
core = buildGoModule {
|
||||
pname = "core";
|
||||
inherit version src meta;
|
||||
|
||||
modRoot = "core";
|
||||
|
||||
vendorHash = "sha256-Uc+RvpW3vndPFnM7yhqrNTEexAPaolCk8YK8u/+55RQ=";
|
||||
vendorHash = "sha256-5oYJMcyKh8CpMLOLch5/svwa148hY4rnSR5inTRNK4M=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
@@ -53,11 +53,9 @@ let
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
meta = metaCommon;
|
||||
};
|
||||
in
|
||||
flutter332.buildFlutterApplication {
|
||||
flutter335.buildFlutterApplication {
|
||||
inherit pname version src;
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
@@ -98,19 +96,19 @@ flutter332.buildFlutterApplication {
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p libclash/linux
|
||||
cp ${libclash}/bin/FlClashCore libclash/linux/FlClashCore
|
||||
cp ${core}/bin/FlClashCore libclash/linux/FlClashCore
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 assets/images/icon.png $out/share/pixmaps/flclash.png
|
||||
install -D --mode=0644 assets/images/icon.png $out/share/pixmaps/flclash.png
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit libclash;
|
||||
inherit core;
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
meta = metaCommon // {
|
||||
meta = meta // {
|
||||
mainProgram = "FlClash";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,20 +1,20 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update
|
||||
#!nix-shell -i bash -p curl gnused jq yq-go nix bash nix-update
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
ROOT="$(dirname "$(readlink -f "$0")")"
|
||||
PACKAGE_DIR=$(realpath "$(dirname "$0")")
|
||||
|
||||
latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/chen08209/FlClash/releases/latest | jq --raw-output .tag_name)
|
||||
latestTag=$(curl --fail --location --silent ${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} https://api.github.com/repos/chen08209/FlClash/releases/latest | jq --raw-output .tag_name)
|
||||
latestVersion=$(echo "$latestTag" | sed 's/^v//')
|
||||
|
||||
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; flclash.version or (lib.getVersion flclash)" | tr -d '"')
|
||||
currentVersion=$(nix eval --file . --raw flclash.version)
|
||||
|
||||
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||
echo "package is up-to-date: $currentVersion"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
nix-update --subpackage libclash flclash
|
||||
nix-update --subpackage core --use-github-releases flclash
|
||||
|
||||
curl https://raw.githubusercontent.com/chen08209/FlClash/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json
|
||||
curl --fail --location --silent https://raw.githubusercontent.com/chen08209/FlClash/${latestTag}/pubspec.lock | yq eval --output-format=json --prettyPrint >$PACKAGE_DIR/pubspec.lock.json
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
@@ -46,6 +47,26 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
checkFlags = [
|
||||
# Makes a network request
|
||||
"--skip=tests::echo::echo_dict"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
|
||||
# Snapshot tests fail because a warning is shown on stdout
|
||||
# warn: CPU lacks AVX support, strange crashes may occur. Reinstall Bun or use *-baseline build:
|
||||
# https://github.com/oven-sh/bun/releases/download/bun-v1.3.1/bun-darwin-x64-baseline.zip
|
||||
"--skip=tests::echo::echo_bitarray"
|
||||
"--skip=tests::echo::echo_bool"
|
||||
"--skip=tests::echo::echo_charlist"
|
||||
"--skip=tests::echo::echo_circular_reference"
|
||||
"--skip=tests::echo::echo_custom_type"
|
||||
"--skip=tests::echo::echo_float"
|
||||
"--skip=tests::echo::echo_function"
|
||||
"--skip=tests::echo::echo_importing_module_named_inspect"
|
||||
"--skip=tests::echo::echo_int"
|
||||
"--skip=tests::echo::echo_list"
|
||||
"--skip=tests::echo::echo_nil"
|
||||
"--skip=tests::echo::echo_singleton"
|
||||
"--skip=tests::echo::echo_string"
|
||||
"--skip=tests::echo::echo_tuple"
|
||||
"--skip=tests::echo::echo_with_message"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
gitMinimal,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "glitter";
|
||||
version = "1.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "milo123459";
|
||||
repo = "glitter";
|
||||
rev = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dImQLC7owPf2EB5COO5vjN3a6k7gJ88D2hMSUW2/wn4=";
|
||||
};
|
||||
|
||||
@@ -36,9 +36,9 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = {
|
||||
description = "Git wrapper that allows you to compress multiple commands into one";
|
||||
homepage = "https://github.com/milo123459/glitter";
|
||||
changelog = "https://github.com/Milo123459/glitter/releases/tag/v${version}";
|
||||
changelog = "https://github.com/Milo123459/glitter/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
mainProgram = "glitter";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hcloud";
|
||||
version = "1.55.0";
|
||||
version = "1.56.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hetznercloud";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4UPZ3SCKTjmSt6mm0zHwecVq3UtR+cSkQmNdbkq/dMY=";
|
||||
hash = "sha256-mK4CF3Is+gfu7euU5drU3jZitAe7501lvpy6N6NXLCI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-heCGRW8yT/aTrh4PKj62P8EPT7mXVDMo9Z8pIypOT6o=";
|
||||
vendorHash = "sha256-geFjIYvVhbKpwGsEuSm3NbYt8kkBsLtJqCmnY4zhJL8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "helix-db";
|
||||
version = "2.0.5";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "helix-db";
|
||||
owner = "HelixDB";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lNAaOpF6g2yunGP9bgsMVvVc7YMfZ44WfkumR+8Btlg=";
|
||||
hash = "sha256-ucDo8jvVBM0KmCTSEbduBYHJSHAJljJQg1+HEQvJ7pU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YCBTSm252eUJeOyMIEcZ+0AyHoYM1QceYSHhp+qwf6Q=";
|
||||
cargoHash = "sha256-LimHFXr7hacpBaULSbMz+q/j3R943HDz2fQir1FA2E0=";
|
||||
|
||||
patches = [
|
||||
#There are no feature yet
|
||||
|
||||
@@ -48,7 +48,7 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ipxe";
|
||||
version = "1.21.1-unstable-2025-10-29";
|
||||
version = "1.21.1-unstable-2025-11-05";
|
||||
|
||||
nativeBuildInputs = [
|
||||
mtools
|
||||
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipxe";
|
||||
repo = "ipxe";
|
||||
rev = "fde35ff003a610eca04db0e11fb81e8dfee8a681";
|
||||
hash = "sha256-wDdqP+EgZqAx+44oy/2x36ZuDJPbTSiiztAISbaVi3o=";
|
||||
rev = "b41bda4413bf286d7b7a449bc05e1531da1eec2e";
|
||||
hash = "sha256-uJzvmTzGg1gzquo09IyufwK77Kq6iQt+bhJecaTy6ts=";
|
||||
};
|
||||
|
||||
# Calling syslinux on a FAT image isn't going to work on Aarch64.
|
||||
|
||||
@@ -2,32 +2,44 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "jql";
|
||||
version = "8.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yamafaktory";
|
||||
repo = "jql";
|
||||
rev = "jql-v${version}";
|
||||
tag = "jql-v${finalAttrs.version}";
|
||||
hash = "sha256-1gkKOOR2mIUKrbVb1BlFxVuskL6y7s6mrI99xTfjjTI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7pSvHZqvPW9SXwU0AtQHIjgHQCSKPzrBhNxLY5ZAcMw=";
|
||||
|
||||
meta = with lib; {
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "JSON Query Language CLI tool built with Rust";
|
||||
homepage = "https://github.com/yamafaktory/jql";
|
||||
changelog = "https://github.com/yamafaktory/jql/releases/tag/${src.rev}";
|
||||
license = with licenses; [
|
||||
changelog = "https://github.com/yamafaktory/jql/releases/tag/${finalAttrs.src.tag}";
|
||||
license = with lib.licenses; [
|
||||
asl20
|
||||
mit
|
||||
];
|
||||
maintainers = with maintainers; [
|
||||
maintainers = with lib.maintainers; [
|
||||
akshgpt7
|
||||
];
|
||||
mainProgram = "jql";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "kcc";
|
||||
version = "9.1.0";
|
||||
version = "9.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ciromattia";
|
||||
repo = "kcc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FGRd2JVcz45KVjQCTEKIjKlkLJS/AsSsopeW9tXHWwk=";
|
||||
hash = "sha256-zzPgBAmICeDpCHvBek2DsM4aEYvC8VHPDY4Ek6nJW9w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lcrq";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "librecast";
|
||||
repo = "lcrq";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-l8/mgcckc90FjcbAjGGUnXAN/GyOTQjjGvsA++VSen4=";
|
||||
hash = "sha256-hNH5SdvKhNPUJWs7vpPECcBsRyNdHQF+Ot3LmyX2V3c=";
|
||||
};
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
From 7f208aaf21aa468013fc41e67c32f6a6c8c08249 Mon Sep 17 00:00:00 2001
|
||||
From: Jappie Klooster <jappieklooster@hotmail.com>
|
||||
Date: Fri, 2 Apr 2021 16:01:05 -0400
|
||||
Subject: [PATCH] Add cmake install directives
|
||||
|
||||
To make nix builds work, it expect a make install command to
|
||||
be available.
|
||||
Adding these directives seems to fix the build.
|
||||
|
||||
If it's no trouble to you, please add them.
|
||||
---
|
||||
CMakeLists.txt | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f9db618..425d391 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -4,10 +4,17 @@ project(libevdevPlus)
|
||||
set(SOURCE_FILES
|
||||
evdevPlus.cpp evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp Resource.cpp)
|
||||
|
||||
+include(GNUInstallDirs)
|
||||
+
|
||||
add_library(evdevPlus ${SOURCE_FILES})
|
||||
target_include_directories(evdevPlus PUBLIC .)
|
||||
|
||||
add_executable(evdevPlus_test test.cpp)
|
||||
target_link_libraries(evdevPlus_test evdevPlus)
|
||||
|
||||
-configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY)
|
||||
\ No newline at end of file
|
||||
+configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY)
|
||||
+
|
||||
+install(TARGETS evdevPlus
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+install(FILES evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp
|
||||
+ DESTINATION include/)
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libevdevplus";
|
||||
version = "unstable-2021-04-02";
|
||||
|
||||
# adds missing cmake install directives
|
||||
# https://github.com/YukiWorkshop/libevdevPlus/pull/10
|
||||
patches = [ ./0001-Add-cmake-install-directives.patch ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YukiWorkshop";
|
||||
repo = "libevdevPlus";
|
||||
rev = "b4d4b3143056424a3da9f0516ca02a47209ef757";
|
||||
sha256 = "09y65s16gch0w7fy1s9yjk9gz3bjzxix36h5wmwww6lkj2i1z3rj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Easy-to-use event device library in C++";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "libretro-shaders-slang";
|
||||
version = "0-unstable-2025-10-30";
|
||||
version = "0-unstable-2025-11-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "slang-shaders";
|
||||
rev = "bb15fc268529cad6132f288f90e87c07c37212e3";
|
||||
hash = "sha256-EVthZs6zrqJYWpTPae8ZNxY9J69YauVxr45MQ0OXQc4=";
|
||||
rev = "edfb56fe7b0951348b7253846dc7a5bd56a765a7";
|
||||
hash = "sha256-xmSAz6iZJe7SAgfc290b326URdYdogDNm62YTiypqPg=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
From 265e406e254c8d84016b12b344d8df71d1765dd1 Mon Sep 17 00:00:00 2001
|
||||
From: Jappie Klooster <jappieklooster@hotmail.com>
|
||||
Date: Fri, 2 Apr 2021 16:33:18 -0400
|
||||
Subject: [PATCH] Add cmake install directives
|
||||
|
||||
To make nix builds work, it expect a make install command to
|
||||
be available.
|
||||
Adding these directives seems to fix the build.
|
||||
|
||||
If it's no trouble to you, please consider adding them.
|
||||
---
|
||||
CMakeLists.txt | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cbfc9c1..948c432 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -7,6 +7,8 @@ set(SOURCE_FILES
|
||||
uInput.cpp uInputSetup.cpp uInputResource.cpp
|
||||
uInput.hpp CommonIncludes.hpp uInputSetup.hpp)
|
||||
|
||||
+include(GNUInstallDirs)
|
||||
+
|
||||
add_library(uInputPlus ${SOURCE_FILES})
|
||||
target_include_directories(uInputPlus PUBLIC .)
|
||||
|
||||
@@ -15,3 +17,9 @@ target_link_libraries(uInputPlus_test uInputPlus)
|
||||
|
||||
configure_file(uInputPlus.pc.in uInputPlus.pc @ONLY)
|
||||
|
||||
+
|
||||
+install(TARGETS uInputPlus
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+install(FILES uInput.hpp CommonIncludes.hpp uInputSetup.hpp
|
||||
+ DESTINATION include/)
|
||||
+
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libuinputplus";
|
||||
version = "2021-04-02";
|
||||
|
||||
# adds missing cmake install directives
|
||||
# https://github.com/YukiWorkshop/libuInputPlus/pull/7
|
||||
patches = [ ./0001-Add-cmake-install-directives.patch ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YukiWorkshop";
|
||||
repo = "libuInputPlus";
|
||||
rev = "f7f18eb339bba61a43f2cad481a9b1a453a66957";
|
||||
sha256 = "0sind2ghhy4h9kfkr5hsmhcq0di4ifwqyv4gac96rgj5mwvs33lp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Easy-to-use uinput library in C++";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
@@ -6,17 +6,32 @@
|
||||
autoconf-archive,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libxls";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libxls";
|
||||
repo = "libxls";
|
||||
rev = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KbITHQ9s2RUeo8zR53R9s4WUM6z8zzddz1k47So0Mlw=";
|
||||
};
|
||||
|
||||
# workaround required to build against gettext >= 0.25
|
||||
# https://savannah.gnu.org/support/index.php?111272
|
||||
preAutoreconf = ''
|
||||
autopoint --force
|
||||
'';
|
||||
|
||||
# workaround required to build against gettext >= 0.25
|
||||
# https://savannah.gnu.org/support/index.php?111273
|
||||
autoreconfFlags = [
|
||||
"--include=m4"
|
||||
"--install"
|
||||
"--force"
|
||||
"--verbose"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
autoconf-archive
|
||||
@@ -24,12 +39,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Extract Cell Data From Excel xls files";
|
||||
changelog = "https://github.com/libxls/libxls/releases/tag/v${finalAttrs.version}";
|
||||
homepage = "https://github.com/libxls/libxls";
|
||||
license = licenses.bsd2;
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = [ ];
|
||||
mainProgram = "xls2csv";
|
||||
platforms = platforms.unix;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "models-dev";
|
||||
version = "0-unstable-2025-11-04";
|
||||
version = "0-unstable-2025-11-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sst";
|
||||
repo = "models.dev";
|
||||
rev = "234ba091f2d37ea925e4e38fecd7b3ed661b52a9";
|
||||
hash = "sha256-7djp/VoAWK29tcwD9mDPCTZiGeJKB8puOnlbEMgOqKQ=";
|
||||
rev = "db75a6d97efdd7a3f73cc2c0ebc3f362ebce608c";
|
||||
hash = "sha256-pl6Ra7QPmM15ndl/skxE+XTqWP9oD2olcs+EQFW0U/0=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "mpls";
|
||||
version = "0.15.4";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhersson";
|
||||
repo = "mpls";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ChEZigLKzU/SILcJoyjKZI1qqrAi9qA6ugUeg5AL2Mw=";
|
||||
hash = "sha256-xNgbtVyjhimvhZ1ua8NoTS3bV7ZSbX5j9VnFSYXuGpI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-n3DG3sR7HOQPQJW1t1qC94EKkDBgXpdmjUWtLzAE7kY=";
|
||||
vendorHash = "sha256-QtNQnJtYLmSTTLwKKQ8P6O6wyctgwN8OcGZkMXa+Ark=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -238,5 +238,6 @@ stdenvUsed.mkDerivation (finalAttrs: {
|
||||
platforms = if x11Mode then lib.platforms.linux else lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
mainProgram = "nethack";
|
||||
broken = if qtMode then stdenv.hostPlatform.isDarwin else false;
|
||||
};
|
||||
})
|
||||
|
||||
+1650
-561
File diff suppressed because it is too large
Load Diff
@@ -27,7 +27,7 @@ buildNpmPackage rec {
|
||||
--replace-fail '/commit/' '/tree/'
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-hlCZqeMkqLgtRpN1+zKhcNK4ECSC4q8XPxzL6jVziqQ=";
|
||||
npmDepsHash = "sha256-nILKXXFOp+Ix6gYpCgcKpAPiLAV9sgMqZ+oTfWZhSIs=";
|
||||
|
||||
npmPackFlags = [ "--ignore-scripts" ];
|
||||
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
diff --git a/ext/KDDockWidgets/CMakeLists.txt b/ext/KDDockWidgets/CMakeLists.txt
|
||||
index 608a2491..d0edc399 100644
|
||||
--- a/ext/KDDockWidgets/CMakeLists.txt
|
||||
+++ b/ext/KDDockWidgets/CMakeLists.txt
|
||||
@@ -160,8 +160,16 @@
|
||||
include(KDQtInstallPaths) #to set QT_INSTALL_FOO variables
|
||||
|
||||
set(${PROJECT_NAME}_DEPS "widgets")
|
||||
+if(Qt6Core_VERSION VERSION_GREATER_EQUAL "6.10.0")
|
||||
+ set(QT_NO_PRIVATE_MODULE_WARNING ON)
|
||||
+ find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS WidgetsPrivate)
|
||||
+endif()
|
||||
if(${PROJECT_NAME}_QTQUICK)
|
||||
find_package(Qt${Qt_VERSION_MAJOR} NO_MODULE REQUIRED COMPONENTS Quick QuickControls2)
|
||||
+ if(Qt6Core_VERSION VERSION_GREATER_EQUAL "6.10.0")
|
||||
+ set(QT_NO_PRIVATE_MODULE_WARNING ON)
|
||||
+ find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS QuickPrivate)
|
||||
+ endif()
|
||||
add_definitions(-DKDDOCKWIDGETS_QTQUICK)
|
||||
set(${PROJECT_NAME}_DEPS "${${PROJECT_NAME}_DEPS} quick quickcontrols2")
|
||||
else()
|
||||
@@ -14,12 +14,13 @@
|
||||
portaudio,
|
||||
imath,
|
||||
qt6,
|
||||
fmt_10,
|
||||
}:
|
||||
|
||||
let
|
||||
# https://github.com/olive-editor/olive/issues/2284
|
||||
# we patch support for 2.3+, but 2.5 fails
|
||||
openimageio' = openimageio.overrideAttrs (old: rec {
|
||||
openimageio' = (openimageio.override { fmt = fmt_10; }).overrideAttrs (old: rec {
|
||||
version = "2.4.15.0";
|
||||
src = (
|
||||
old.src.override {
|
||||
@@ -35,7 +36,7 @@ in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "olive-editor";
|
||||
version = "unstable-2023-06-12";
|
||||
version = "0.1.2-unstable-2023-06-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
fetchSubmodules = true;
|
||||
@@ -56,6 +57,11 @@ stdenv.mkDerivation {
|
||||
url = "https://github.com/olive-editor/olive/commit/311eeb72944f93f873d1cd1784ee2bf423e1e7c2.patch";
|
||||
hash = "sha256-lswWn4DbXGH1qPvPla0jSgUJQXuqU7LQGHIPoXAE8ag=";
|
||||
})
|
||||
|
||||
# Fix build of `kddockwidgets` with qt6-6.10, adapted from:
|
||||
# https://github.com/KDAB/KDDockWidgets/pull/615
|
||||
# https://github.com/KDAB/KDDockWidgets/commit/f2b50fff29bd4b49acdfed3ed8fc42eb0a502032
|
||||
./olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch
|
||||
];
|
||||
|
||||
# https://github.com/olive-editor/olive/issues/2200
|
||||
|
||||
@@ -51,6 +51,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
mainProgram = "opensurge";
|
||||
description = "Fun 2D retro platformer inspired by Sonic games and a game creation system";
|
||||
@@ -59,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/alemart/opensurge/blob/v${finalAttrs.version}/CHANGES.md";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -32,8 +32,10 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'string(TIMESTAMP PROJECT_VERSION "%Y%m%d")' 'set(PROJECT_VERSION ${version})'
|
||||
substituteInPlace contrib/lz4/CMakeLists.txt \
|
||||
--replace-fail 'cmake_minimum_required(VERSION 3.4)' 'cmake_minimum_required(VERSION 3.13)'
|
||||
substituteInPlace contrib/nanosockets/CMakeLists.txt \
|
||||
--replace-fail 'cmake_minimum_required(VERSION 3.1)' 'cmake_minimum_required(VERSION 3.13)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,16 +18,16 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
build-system = [ python3Packages.poetry-core ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"typer"
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
setuptools # for pkg_resources
|
||||
tomlkit
|
||||
typer
|
||||
];
|
||||
|
||||
# typer for Click >= 8.2 removed "mix_stderr", upstream pins to 8.1.8
|
||||
# https://typer.tiangolo.com/release-notes/#0160
|
||||
disabledTestPaths = [ "tests/test_cli.py" ];
|
||||
|
||||
nativeCheckInputs = [ python3Packages.pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "planify";
|
||||
version = "4.15.1";
|
||||
version = "4.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alainm23";
|
||||
repo = "planify";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-b0I6UXdE0EqRP9FrqRyf1CscYSlYjFPcmIgkMjCLWMc=";
|
||||
hash = "sha256-i6yAObfSMZyHHK/1YUFppU9gcFJj7WL48Eqe6IQAh4M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "plasma-panel-colorizer";
|
||||
version = "5.0.1";
|
||||
version = "5.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luisbocanegra";
|
||||
repo = "plasma-panel-colorizer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-E6VX2naAS2xof5sdnuaSuKueIKecW0fi9SycgLVRQVU=";
|
||||
hash = "sha256-QyW3F0PwTSE6wUNW3pwI/Xj9/7Rxl0GXJ6W02oZBeKU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polarity";
|
||||
version = "latest-unstable-2025-10-30";
|
||||
version = "latest-unstable-2025-11-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "polarity-lang";
|
||||
repo = "polarity";
|
||||
rev = "309532f08f8bac21b52708ccce0cedad42f0ab39";
|
||||
hash = "sha256-s/sDx9SWrsbNuidfDNQyXeJflvwvwwMH4IEiSQ6Fh24=";
|
||||
rev = "52211970b601db2e449ea6bc0a2e785d39c489c0";
|
||||
hash = "sha256-jDhkBrLbk9B9xeEZ4A7jp6at/Hp4q2A/egoFgY2xK8I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DyqK5cxdsZWMr79clw8oRHTAAlzGzP8i4Vu/UXH/ptE=";
|
||||
cargoHash = "sha256-cH+cgYIUPQTHgGCZmP562VzCxz+i6LkymHtnHJXnd+A=";
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
|
||||
@@ -1,49 +1,60 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
stdenv,
|
||||
buildGo124Module,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
scip,
|
||||
libredirect,
|
||||
iana-etc,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGo124Module (finalAttrs: {
|
||||
pname = "scip";
|
||||
version = "0.5.1";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcegraph";
|
||||
repo = "scip";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UXa5lMFenynHRIvA4MOXkjMVd705LBWs372s3MFAc+8=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-l68xhOMgwt+ySChk7BCyklcuC6r51GgobAg3lRLvOCU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6vx3Dt0ZNR0rY5bEUF5X1hHj/gv21920bhfd+JJ9bYk=";
|
||||
vendorHash = "sha256-8HgeG/SXkM7ptOwKSi/PUH3VySxFqqoIpXI7bZtbO4A=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=main.Reproducible=true"
|
||||
];
|
||||
|
||||
# update documentation to fix broken test
|
||||
postPatch = ''
|
||||
substituteInPlace docs/CLI.md \
|
||||
--replace 0.3.0 0.3.1
|
||||
nativeCheckInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libredirect.hook ];
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
skippedTests = [
|
||||
"TestParseCompat" # could not locate sample indexes directory starting from parents of working directory
|
||||
"TestParseSymbol_ZeroAllocationsIfMemoryAvailable"
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/services=${iana-etc}/etc/services
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = scip;
|
||||
version = "v${version}";
|
||||
};
|
||||
};
|
||||
doInstallCheck = stdenv.hostPlatform.isLinux;
|
||||
|
||||
meta = with lib; {
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
meta = {
|
||||
description = "SCIP Code Intelligence Protocol CLI";
|
||||
mainProgram = "scip";
|
||||
homepage = "https://github.com/sourcegraph/scip";
|
||||
changelog = "https://github.com/sourcegraph/scip/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
changelog = "https://github.com/sourcegraph/scip/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
@@ -16,24 +15,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-vb9k+KjiGodVngza0R18LjfPTlsqFbzqXZqefm6KHj0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# remove warning about gcc < 10
|
||||
substituteInPlace sse2neon.h --replace-fail "#warning \"GCC versions" "// "
|
||||
'';
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
dontInstall = true;
|
||||
# use postBuild instead of installPhase, because the build
|
||||
# in itself doesn't produce any ($out) output
|
||||
postBuild = ''
|
||||
mkdir -p $out/lib
|
||||
install -m444 sse2neon.h $out/lib/
|
||||
install -Dm644 sse2neon.h $out/include/sse2neon.h
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems";
|
||||
homepage = "https://www.mono-project.com/docs/gui/libgdiplus/";
|
||||
description = "C/C++ header file that converts Intel SSE intrinsics to Arm/Aarch64 NEON intrinsics";
|
||||
homepage = "https://github.com/DLTcollab/sse2neon";
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.gador ];
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "stasis";
|
||||
version = "0.5.2";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "saltnpepper97";
|
||||
repo = "stasis";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-t8molNHV0FnJO9F2muME2JAfw6EtxDQZiQX3JFW8DTs=";
|
||||
hash = "sha256-GES7mBWEEyute/ljl7JiwzbgFSk4+JR5YUia4+Wzs3I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nACVS4BAjtI+aRO8Tg0FdOQSXiZMX/iVh22w0s6NLpw=";
|
||||
cargoHash = "sha256-+SGeuT0oAt5T15eZABGegiVhyV4GcHDp4LMMRpCl/U0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -17,10 +17,21 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
passthru.srcMetadataByPlatform = {
|
||||
# Note: This may look like an error but the content of the src.zip is in fact
|
||||
# equal on all linux systems as well as all darwin systems. Even though each
|
||||
# of these zip archives themselves contains a different hash.
|
||||
x86_64-linux.platform = "gtk-linux-x86_64";
|
||||
x86_64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
|
||||
aarch64-linux.platform = "gtk-linux-aarch64";
|
||||
aarch64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
|
||||
ppc64le-linux.platform = "gtk-linux-ppc64le";
|
||||
ppc64le-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
|
||||
riscv64-linux.platform = "gtk-linux-riscv64";
|
||||
riscv64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
|
||||
x86_64-darwin.platform = "cocoa-macosx-x86_64";
|
||||
x86_64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI=";
|
||||
aarch64-darwin.platform = "cocoa-macosx-aarch64";
|
||||
aarch64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI";
|
||||
};
|
||||
passthru.srcMetadata =
|
||||
finalAttrs.passthru.srcMetadataByPlatform.${stdenv.hostPlatform.system} or null;
|
||||
|
||||
@@ -16,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-voNR8hIYGbMXL87c5csYJvoSyH2ht+2Y8mnT6AKgVVU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace fs_wget.c \
|
||||
--replace-fail '#include <curl/multi.h>' '#include <curl/curl.h>'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ SDL ];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "tutanota-desktop";
|
||||
version = "310.251008.0";
|
||||
version = "314.251030.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
|
||||
hash = "sha256-HMwfSMEEP3+CWSiThiEGbCkLiKndmLyt4KIZ4fPHCxM=";
|
||||
hash = "sha256-xGErTMDLJOQIRxFavo8lOZUjTyUvVOD10Df4EPNF+eo=";
|
||||
};
|
||||
|
||||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
flutter_vodozemac = callPackage ./flutter_vodozemac { };
|
||||
flutter_volume_controller = callPackage ./flutter_volume_controller { };
|
||||
handy_window = callPackage ./handy-window { };
|
||||
hotkey_manager_linux = callPackage ./hotkey_manager_linux { };
|
||||
matrix = callPackage ./matrix { };
|
||||
media_kit_libs_linux = callPackage ./media_kit_libs_linux { };
|
||||
olm = callPackage ./olm { };
|
||||
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
{
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
{ version, src, ... }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "hotkey_manager_linux";
|
||||
inherit version src;
|
||||
inherit (src) passthru;
|
||||
|
||||
postPatch = ''
|
||||
pushd ${src.passthru.packageRoot}
|
||||
substituteInPlace linux/hotkey_manager_linux_plugin.cc \
|
||||
--replace-fail "const char* identifier;" "const char* identifier = nullptr;" \
|
||||
--replace-fail "const char* keystring;" "const char* keystring = nullptr;"
|
||||
popd
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp --recursive . "$out"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
@@ -124,7 +124,8 @@ stdenv.mkDerivation {
|
||||
"-DITK_USE_SYSTEM_SWIG=ON"
|
||||
"-DPY_SITE_PACKAGES_PATH=${placeholder "out"}/${python.sitePackages}"
|
||||
]
|
||||
++ lib.optionals withVtk [ "-DModule_ITKVtkGlue=ON" ];
|
||||
++ lib.optionals withVtk [ "-DModule_ITKVtkGlue=ON" ]
|
||||
++ lib.optionals (lib.versionOlder version "5.4") [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -2,17 +2,18 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
buildPythonPackage,
|
||||
python,
|
||||
pythonOlder,
|
||||
pytestCheckHook,
|
||||
assertpy,
|
||||
chardet,
|
||||
freezegun,
|
||||
mock,
|
||||
path,
|
||||
pyhamcrest,
|
||||
pytest-html,
|
||||
colorama,
|
||||
cucumber-expressions,
|
||||
cucumber-tag-expressions,
|
||||
parse,
|
||||
parse-type,
|
||||
@@ -22,41 +23,34 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "behave";
|
||||
version = "1.2.7.dev5";
|
||||
version = "1.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "behave";
|
||||
repo = "behave";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-G1o0a57MRczwjGLl/tEYC+yx3nxpk6+E58RvR9kVJpA=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-sHsnBeyl0UJ0f7WcTUc+FhUxATh84RPxVE3TqGYosrs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix tests: https://github.com/behave/behave/pull/1214
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/behave/behave/pull/1214/commits/98b63a2524eff50ce1dc7360a46462a6f673c5ea.patch?full_index=1";
|
||||
hash = "sha256-MwODEm6vhg/H8ksp5XBBP5Uhu2dhB5B1T6Owkxpy3v0=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
assertpy
|
||||
chardet
|
||||
freezegun
|
||||
mock
|
||||
path
|
||||
pyhamcrest
|
||||
pytest-html
|
||||
];
|
||||
|
||||
doCheck = pythonOlder "3.12";
|
||||
|
||||
pythonImportsCheck = [ "behave" ];
|
||||
|
||||
dependencies = [
|
||||
colorama
|
||||
cucumber-expressions
|
||||
cucumber-tag-expressions
|
||||
parse
|
||||
parse-type
|
||||
@@ -80,7 +74,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/behave/behave/blob/${src.rev}/CHANGES.rst";
|
||||
changelog = "https://github.com/behave/behave/blob/${src.tag}/CHANGES.rst";
|
||||
homepage = "https://github.com/behave/behave";
|
||||
description = "Behaviour-driven development, Python style";
|
||||
mainProgram = "behave";
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
poetry-core,
|
||||
pytestCheckHook,
|
||||
pyyaml,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cucumber-expressions";
|
||||
version = "18.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cucumber";
|
||||
repo = "cucumber-expressions";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Mbf7bG7NvKFdv6kYPkd6UlPDJGjnK2GPl0qnLUhQ3es=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
pythonImportsCheck = [ "cucumber_expressions" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pyyaml
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/cucumber/cucumber-expressions/blob/${src.tag}/CHANGELOG.md";
|
||||
description = "Human friendly alternative to Regular Expressions";
|
||||
homepage = "https://github.com/cucumber/cucumber-expressions/tree/main/python";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.dotlambda ];
|
||||
};
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.21.0";
|
||||
version = "2.22.0";
|
||||
tag = "v${version}";
|
||||
in
|
||||
buildPythonPackage {
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage {
|
||||
owner = "elevenlabs";
|
||||
repo = "elevenlabs-python";
|
||||
inherit tag;
|
||||
hash = "sha256-jDpTCflRPfm13ZFA5OUsl1bsFZ8ftSbf23BtgcpL5pQ=";
|
||||
hash = "sha256-tSPMHEvce4lRT2weyDl6EFONCT8dRGgLfGptNuTdAPc=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -18,12 +18,21 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTests = [
|
||||
# Calculates the amount of time the machine slept but doesn't account for heavy loads
|
||||
"test_retry"
|
||||
"test_funcSetTimeout"
|
||||
"test_funcSetTimeCalculate"
|
||||
"test_funcSetTimeCalculateWithOverride"
|
||||
"test_setFuncTimeoutetry"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "func_timeout" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Allows you to specify timeouts when calling any existing function. Also provides support for stoppable-threads";
|
||||
homepage = "https://github.com/kata198/func_timeout";
|
||||
license = licenses.lgpl3Only;
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -26,7 +26,8 @@ buildPythonPackage rec {
|
||||
# Nix uses Release CMake configuration instead of what is assumed by palace.
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace IMPORTED_LOCATION_NOCONFIG IMPORTED_LOCATION_RELEASE
|
||||
--replace-fail IMPORTED_LOCATION_NOCONFIG IMPORTED_LOCATION_RELEASE \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.6.0)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
sqlalchemy,
|
||||
websocket-client,
|
||||
websockets,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -52,8 +51,12 @@ buildPythonPackage rec {
|
||||
disabledTests = [
|
||||
# Requires internet access (to slack API)
|
||||
"test_start_raises_an_error_if_rtm_ws_url_is_not_returned"
|
||||
# Requires network access: [Errno 111] Connection refused
|
||||
"test_send_message_while_disconnection"
|
||||
"TestWebClient_HttpRetry"
|
||||
"test_issue_690_oauth_access"
|
||||
"test_issue_690_oauth_v2_access"
|
||||
"test_error_response"
|
||||
"test_issue_1441_mixing_user_and_bot_installations"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
hatch-vcs,
|
||||
hatchling,
|
||||
pytestCheckHook,
|
||||
pyyaml,
|
||||
hypothesis,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -15,11 +14,11 @@ buildPythonPackage rec {
|
||||
version = "1.5.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wQrBMhpiaxyosJ0/Ov6YVbgYORxZmSp2tl5KLZXqxBs=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Phynix";
|
||||
repo = "yamlloader";
|
||||
tag = version;
|
||||
hash = "sha256-SNb1iXao+TNW872qDtEldZj6S+yJxRlsnw6ye92RFSk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -34,16 +33,25 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# TypeError: cannot pickle '_thread.RLock' object
|
||||
# https://github.com/Phynix/yamlloader/issues/64
|
||||
"tests/test_ordereddict.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"yaml"
|
||||
"yamlloader"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Case-insensitive list for Python";
|
||||
homepage = "https://github.com/Phynix/yamlloader";
|
||||
changelog = "https://github.com/Phynix/yamlloader/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
freezeboy
|
||||
sarahec
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,16 +16,18 @@
|
||||
libbsd,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fwts";
|
||||
version = "24.09.00";
|
||||
version = "25.09.00";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://fwts.ubuntu.com/release/fwts-V${version}.tar.gz";
|
||||
hash = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc=";
|
||||
url = "https://fwts.ubuntu.com/release/fwts-V${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-OJI2O9MptckmGj4rTrh9haIGaXJOO3er59yIorbgSVw=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/fwts-${finalAttrs.version}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
@@ -64,4 +66,4 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ tadfisher ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
kernelModuleMakeFlags,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fwts-efi-runtime";
|
||||
version = "${fwts.version}-${kernel.version}";
|
||||
|
||||
inherit (fwts) src;
|
||||
|
||||
sourceRoot = "${src.name}/efi_runtime";
|
||||
sourceRoot = "${fwts.sourceRoot}/efi_runtime";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace \
|
||||
@@ -34,4 +34,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
@@ -8,24 +8,21 @@
|
||||
qtgraphicaleffects,
|
||||
wrapQtAppsHook,
|
||||
udevCheckHook,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "projecteur";
|
||||
version = "0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jahnf";
|
||||
repo = "Projecteur";
|
||||
rev = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = false;
|
||||
hash = "sha256-F7o93rBjrDTmArTIz8RB/uGBOYE6ny/U7ppk+jEhM5A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed '1i#include <array>' -i src/device.h # gcc12
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtgraphicaleffects
|
||||
@@ -38,14 +35,16 @@ mkDerivation rec {
|
||||
udevCheckHook
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_PREFIX:PATH=${placeholder "out"}"
|
||||
"-DPACKAGE_TARGETS=OFF"
|
||||
"-DCMAKE_INSTALL_UDEVRULESDIR=${placeholder "out"}/lib/udev/rules.d"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
meta = {
|
||||
description = "Linux/X11 application for the Logitech Spotlight device (and similar devices)";
|
||||
homepage = "https://github.com/jahnf/Projecteur";
|
||||
@@ -56,4 +55,4 @@ mkDerivation rec {
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,13 +9,14 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "shufflecake";
|
||||
version = "0.5.2";
|
||||
version = "0.5.5";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "shufflecake";
|
||||
repo = "shufflecake-c";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-EF9VKaqcNJt3hd/CUT+QeW17tc5ByStDanGGwi4uL4s=";
|
||||
hash = "sha256-xVuI7tRARPFuETCCKYt507WpvZVZLaj9dhBkhJ03zc8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
@@ -23,12 +24,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libgcrypt
|
||||
lvm2
|
||||
];
|
||||
makeFlags = kernelModuleMakeFlags ++ [
|
||||
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
|
||||
# GCC 14 makes this an error by default, remove when fixed upstream
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
makeFlags =
|
||||
kernelModuleMakeFlags
|
||||
++ [
|
||||
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
]
|
||||
# Use wrapped gcc compiler since the unwrapped one fails to find the
|
||||
# headers.
|
||||
++ lib.optionals stdenv.cc.isGNU [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -40,13 +45,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
install -Dm555 shufflecake $bin/shufflecake
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Plausible deniability (hidden storage) layer for Linux";
|
||||
homepage = "https://shufflecake.net";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ oluceps ];
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ oluceps ];
|
||||
outputsToInstall = [ "bin" ];
|
||||
platforms = platforms.linux;
|
||||
platforms = lib.platforms.linux;
|
||||
broken = kernel.kernelOlder "6.1" || kernel.meta.name == "linux-lqx-6.12.1";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -798,6 +798,7 @@ mapAliases {
|
||||
libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
|
||||
libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
|
||||
libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16
|
||||
libevdevplus = throw "'libevdevplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02
|
||||
libfprint-focaltech-2808-a658 = throw "'libfprint-focaltech-2808-a658' has been removed as it was broken and upstream was taken down"; # Added 2025-11-04
|
||||
libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20
|
||||
libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17
|
||||
@@ -838,6 +839,7 @@ mapAliases {
|
||||
libtorrent = throw "'libtorrent' has been renamed to 'libtorrent-rakshasa' for clearer distinction from 'libtorrent-rasterbar'"; # Added 2025-09-10
|
||||
libtransmission = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
|
||||
libtransmission_3 = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
|
||||
libuinputplus = throw "'libuinputplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02
|
||||
libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
|
||||
libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2025-10-27
|
||||
lightdm_gtk_greeter = throw "'lightdm_gtk_greeter' has been renamed to/replaced by 'lightdm-gtk-greeter'"; # Converted to throw 2025-10-27
|
||||
|
||||
@@ -3232,6 +3232,8 @@ self: super: with self; {
|
||||
|
||||
cu2qu = callPackage ../development/python-modules/cu2qu { };
|
||||
|
||||
cucumber-expressions = callPackage ../development/python-modules/cucumber-expressions { };
|
||||
|
||||
cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { };
|
||||
|
||||
cupy = callPackage ../development/python-modules/cupy {
|
||||
|
||||
Reference in New Issue
Block a user