mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge master into staging-next
This commit is contained in:
commit
2161c15349
32 changed files with 244 additions and 181 deletions
|
|
@ -398,6 +398,24 @@
|
|||
"sec-pkg-overrideDerivation": [
|
||||
"index.html#sec-pkg-overrideDerivation"
|
||||
],
|
||||
"sec-platform-breakdown": [
|
||||
"index.html#sec-platform-breakdown"
|
||||
],
|
||||
"sec-platform-tier1": [
|
||||
"index.html#sec-platform-tier1"
|
||||
],
|
||||
"sec-platform-tier2": [
|
||||
"index.html#sec-platform-tier2"
|
||||
],
|
||||
"sec-platform-tier3": [
|
||||
"index.html#sec-platform-tier3"
|
||||
],
|
||||
"sec-platform-tier4-7": [
|
||||
"index.html#sec-platform-tier4-7"
|
||||
],
|
||||
"sec-platform-tiers": [
|
||||
"index.html#sec-platform-tiers"
|
||||
],
|
||||
"sec-lib-makeOverridable": [
|
||||
"index.html#sec-lib-makeOverridable"
|
||||
],
|
||||
|
|
|
|||
|
|
@ -1,18 +1,49 @@
|
|||
# Platform Support {#chap-platform-support}
|
||||
|
||||
Packages receive varying degrees of support, both in terms of maintainer attention and available computation resources for continuous integration (CI).
|
||||
Packages receive varying degrees of support, both in terms of maintainer attention and available computation resources for continuous integration (CI). We have 7 defined tiers denoting how well supported each platform is.
|
||||
|
||||
Below is the list of the best supported platforms:
|
||||
## Tiers {#sec-platform-tiers}
|
||||
|
||||
- `x86_64-linux`: Highest level of support.
|
||||
- `aarch64-linux`: Well supported, with most packages building successfully in CI.
|
||||
- `aarch64-darwin`: Receives better support than `x86_64-darwin`.
|
||||
- `x86_64-darwin`: Receives some support.
|
||||
### Tier 1 {#sec-platform-tier1}
|
||||
|
||||
There are many other platforms with varying levels of support.
|
||||
The provisional platform list in [Appendix A] of [RFC046], while not up to date, can be used as guidance.
|
||||
[Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) platforms receive the highest level of support where problems can block updates, platform-specific patches are freely applied, and most packages are expected to work.
|
||||
|
||||
A more formal definition of the platform support tiers is provided in [RFC046], but has not been fully implemented yet.
|
||||
### Tier 2 {#sec-platform-tier2}
|
||||
|
||||
[RFC046]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md
|
||||
[Appendix A]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#appendix-a-non-normative-description-of-platforms-in-november-2019
|
||||
[Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) platforms are expected to remain functional with updates, receive platform-specific patches as needed, and have many packages built by Hydra with full ofBorg support.
|
||||
|
||||
### Tier 3 {#sec-platform-tier3}
|
||||
|
||||
[Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) platforms may receive non-intrusive platform-specific fixes, have native bootstrap tools available with cross-build toolchains in binary cache, but updates might break builds on these platforms.
|
||||
|
||||
### Tier 4-7 {#sec-platform-tier4-7}
|
||||
|
||||
Platform Tiers [4 through 7](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-4) indicate varying levels of minimal support going from receiving only limited fixes to platforms with no support, but a path to support.
|
||||
|
||||
## Breakdown {#sec-platform-breakdown}
|
||||
|
||||
| Triple | Support Tier | Channel Blockers | Hydra Support | Ofborg Support | Bootstrap Tarballs | Cross Compiling Support |
|
||||
| ------------------------------------- | ------------ | ---------------- | ------------- | -------------- | ------------------ | ----------------------- |
|
||||
| `x86_64-unknown-linux-gnu` | [Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) | Many | ✔️ | ✔️ | ✔️ | ✔️ |
|
||||
| `aarch64-unknown-linux-gnu` | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️ | ✔️ | ✔️ | ✔️ |
|
||||
| `x86_64-unknown-linux-musl` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ✔️ | ✔️ |
|
||||
| `aarch64-unknown-linux-musl` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ✔️ | ✔️ |
|
||||
| `x86_64-unknown-unknown-freebsd` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ |
|
||||
| `arm64-apple-darwin` | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️ | ✔️ | ✔️ | ❌\* |
|
||||
| `x86_64-apple-darwin` | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️ | ✔️ | ✔️ | ❌\* |
|
||||
| `i686-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ✔️ | ✔️ |
|
||||
| `riscv32-unknown-linux-gnu` | [Tier 4](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-4) | None | ❌ | ❌ | ❌ | ✔️ |
|
||||
| `riscv64-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ |
|
||||
| `loongarch64-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ |
|
||||
| `armv6l-unknown-linux-gnueabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ |
|
||||
| `armv6l-unknown-linux-musleabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ |
|
||||
| `armv7l-unknown-linux-gnueabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ |
|
||||
| `armv5tel-unknown-linux-gnueabi` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ |
|
||||
| `mips64el-unknown-linux-gnuabi64` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ |
|
||||
| `mips64el-unknown-linux-gnuabin32` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ |
|
||||
| `mipsel-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ |
|
||||
| `powerpc64-unknown-linux-gnuabielfv2` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ |
|
||||
| `powerpc64le-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ |
|
||||
| `s390x-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ |
|
||||
|
||||
\* - Cross compiling is only supported on Darwin hosts.
|
||||
|
|
|
|||
|
|
@ -5563,7 +5563,7 @@
|
|||
};
|
||||
da157 = {
|
||||
email = "da157@voidq.com";
|
||||
matrix = "@awwpotato:envs.net";
|
||||
matrix = "@da157:catgirl.cloud";
|
||||
github = "0xda157";
|
||||
githubId = 153149335;
|
||||
name = "0xda157";
|
||||
|
|
|
|||
|
|
@ -637,6 +637,7 @@ in
|
|||
'';
|
||||
};
|
||||
appendConfig = ''
|
||||
# frigate
|
||||
rtmp {
|
||||
server {
|
||||
listen 1935;
|
||||
|
|
@ -653,6 +654,7 @@ in
|
|||
}
|
||||
'';
|
||||
appendHttpConfig = ''
|
||||
# frigate
|
||||
map $sent_http_content_type $should_not_cache {
|
||||
'application/json' 0;
|
||||
default 1;
|
||||
|
|
|
|||
|
|
@ -16,9 +16,8 @@
|
|||
};
|
||||
extraPythonPackages = p: [
|
||||
p.lxml
|
||||
p.lxml-stubs
|
||||
p.types-lxml
|
||||
];
|
||||
skipTypeCheck = true;
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
if not any(cipher_pattern.fullmatch(line) for line in results):
|
||||
raise Exception ("swap device encryption does not use the cipher specified in the configuration")
|
||||
|
||||
key_size_pattern = re.compile(r"\s*keysize:\s+512\s+bits\s*")
|
||||
key_size_pattern = re.compile(r"\s*keysize:\s+512\s+\[?bits\]?\s*")
|
||||
if not any(key_size_pattern.fullmatch(line) for line in results):
|
||||
raise Exception ("swap device encryption does not use the key size specified in the configuration")
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
qtbase,
|
||||
qttools,
|
||||
qtsvg,
|
||||
qwt6_1,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "caneda";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Caneda";
|
||||
repo = "Caneda";
|
||||
rev = version;
|
||||
sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qttools
|
||||
qtsvg
|
||||
qwt6_1
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Open source EDA software focused on easy of use and portability";
|
||||
mainProgram = "caneda";
|
||||
homepage = "http://caneda.org";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -43,6 +43,11 @@ stdenv.mkDerivation {
|
|||
cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h
|
||||
sed '1i#include <limits>' -i src/dec/eagls/pak_archive_decoder.cc # gcc12
|
||||
sed '1i#include <vector>' -i src/flow/cli_facade.h # gcc14
|
||||
|
||||
# cmake-4 support
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
'cmake_minimum_required(VERSION 2.8.8)' \
|
||||
'cmake_minimum_required(VERSION 3.10)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
49
pkgs/by-name/ca/caneda/package.nix
Normal file
49
pkgs/by-name/ca/caneda/package.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "caneda";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Caneda";
|
||||
repo = "Caneda";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/c/caneda/0.4.0-2/debian/patches/fix_cmake_minimum_version.patch";
|
||||
hash = "sha256-MRkCA0GWcI6yEo4Ej+F67k0iNG1JHeLNhH0Rbz1QWoA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
libsForQt5.qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qttools
|
||||
libsForQt5.qtsvg
|
||||
libsForQt5.qwt6_1
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Open source EDA software focused on easy of use and portability";
|
||||
changelog = "https://github.com/Caneda/Caneda/releases/tag/${finalAttrs.version}";
|
||||
mainProgram = "caneda";
|
||||
homepage = "http://caneda.org";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ magicquark ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -37,6 +37,11 @@ rustPlatform.buildRustPackage rec {
|
|||
url = "https://github.com/cjdelisle/cjdns/commit/436d9a9784bae85734992c2561c778fbd2f5ac32.patch";
|
||||
hash = "sha256-THcYNGVbMx/xf3/5UIxEhz3OlODE0qiYgDBOlHunhj8=";
|
||||
})
|
||||
# Fix build failure with Rust 1.89.0 (https://github.com/cjdelisle/cjdns/pull/1271)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/cjdelisle/cjdns/commit/68b786aca5bfa427e5f58c029e4d9cc74969ef87.patch";
|
||||
hash = "sha256-FmrooDzrIWUIAnzwZTVDXI+Cl8pMngPqxsJjUHVhry8=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoHash = "sha256-f96y6ZW0HxC+73ts5re8GIo2aigQgK3gXyF7fMrcJ0o=";
|
||||
|
|
@ -81,8 +86,9 @@ rustPlatform.buildRustPackage rec {
|
|||
passthru.tests.basic = nixosTests.cjdns;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/cjdelisle/cjdns";
|
||||
description = "Encrypted networking for regular people";
|
||||
homepage = "https://github.com/cjdelisle/cjdns";
|
||||
changelog = "https://github.com/cjdelisle/cjdns/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,57 +6,57 @@
|
|||
cmake,
|
||||
libGL,
|
||||
libGLU,
|
||||
libsForQt5,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "connectome-workbench";
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Washington-University";
|
||||
repo = "workbench";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-M5iverVDhBI/ijbgwfa6gHrthY4wrUi+/2A/443jBqg=";
|
||||
hash = "sha256-f1T0i4x7rr3u/3ZvJ4cEAb377e7YcaGMKa2uUslVqR0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
patches = [
|
||||
# remove after next release:
|
||||
(fetchpatch {
|
||||
name = "fix-missing-includes-in-CZIlib";
|
||||
url = "https://github.com/Washington-University/workbench/commit/7ba3345d161d567a4b628ceb02ab4471fc96cb20.diff";
|
||||
hash = "sha256-DMrJOr/2Wr4o4Z3AuhWfMZTX8f/kOYWwZQzBUwIrTd8=";
|
||||
relative = "src";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "ADD_SUBDIRECTORY ( Tests )" "" \
|
||||
--replace-fail "ENABLE_TESTING()" ""
|
||||
'';
|
||||
# tests are minimal and test_driver fails to link (also -DBUILD_TESTING=... is ignored):
|
||||
# ld: ../Brain/libBrain.a(BrainOpenGLVolumeObliqueSliceDrawing.cxx.o): undefined reference to symbol 'glGetFloatv'
|
||||
# ld: /nix/store/a5vcvrkh1c2ng5kr584g3zw3991vnhks-libGL-1.7.0/lib/libGL.so.1: error adding symbols: DSO missing from command line
|
||||
substituteInPlace kloewe/{cpuinfo,dot}/CMakeLists.txt --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
|
||||
''
|
||||
+
|
||||
# tests are minimal and test_driver fails to link (also -DBUILD_TESTING=... is ignored):
|
||||
# ld: ../Brain/libBrain.a(BrainOpenGLVolumeObliqueSliceDrawing.cxx.o): undefined reference to symbol 'glGetFloatv'
|
||||
# ld: /nix/store/a5vcvrkh1c2ng5kr584g3zw3991vnhks-libGL-1.7.0/lib/libGL.so.1: error adding symbols: DSO missing from command line
|
||||
''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "ADD_SUBDIRECTORY ( Tests )" "" \
|
||||
--replace-fail "ENABLE_TESTING()" ""
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-fpermissive";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libGL
|
||||
libGLU
|
||||
]
|
||||
++ (with libsForQt5; [
|
||||
++ (with qt6; [
|
||||
qtbase
|
||||
qt5compat
|
||||
]);
|
||||
# note: we should be able to unvendor a few libs (ftgl, quazip, qwt) but they aren't detected properly
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWORKBENCH_USE_QT6=TRUE"
|
||||
"-DWORKBENCH_USE_QT5=FALSE"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Visualization and discovery tool used to map neuroimaging data";
|
||||
homepage = "https://www.humanconnectome.org/software/connectome-workbench";
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "magic-vlsi";
|
||||
version = "8.3.570";
|
||||
version = "8.3.573";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RTimothyEdwards";
|
||||
repo = "magic";
|
||||
tag = "${version}";
|
||||
sha256 = "sha256-ytITe6NtCqD1HTKry8O2famVkhB1+txIIa8UQlXa9qM=";
|
||||
sha256 = "sha256-P5qfMsn3DGHjeF7zsZWeG9j38C6j5UEwUqGyjaEVO1E=";
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -12,20 +12,28 @@
|
|||
libtiff,
|
||||
openjpeg,
|
||||
gifsicle,
|
||||
gettext,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "mtPaint";
|
||||
version = "3.50.01";
|
||||
version = "3.50.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wjaguar";
|
||||
repo = "mtPaint";
|
||||
rev = "a4675ff5cd9fcd57d291444cb9f332b48f11243f";
|
||||
sha256 = "04wqxz8i655gz5rnz90cksy8v6m2jhcn1j8rzhqpp5xhawlmq24y";
|
||||
rev = "7cae5d663ed835a365d89a535536c39e18862a83";
|
||||
hash = "sha256-W/MQZ1WqoVMzyEd60rbvA8yieesDc/xfKqbYGZumi2U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
strictDeps = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
freetype
|
||||
giflib
|
||||
|
|
@ -58,7 +66,7 @@ stdenv.mkDerivation {
|
|||
homepage = "https://mtpaint.sourceforge.net/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
mainProgram = "mtpaint";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Based on https://github.com/nuttyartist/notes/pull/758 which doesn't apply cleanly
|
||||
./qt610-fix.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DUPDATE_CHECKER=OFF" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
16
pkgs/by-name/no/notes/qt610-fix.patch
Normal file
16
pkgs/by-name/no/notes/qt610-fix.patch
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4380d39..1051cc5 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -74,6 +74,11 @@ if(USE_QT_VERSION STREQUAL "")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
+ # https://doc.qt.io/qt-6/whatsnew610.html#build-system-changes
|
||||
+ if(QT_VERSION VERSION_GREATER_EQUAL 6.10)
|
||||
+ list(APPEND QT_COMPONENTS CorePrivate GuiPrivate WidgetsPrivate)
|
||||
+ endif()
|
||||
+
|
||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ${QT_COMPONENTS})
|
||||
else()
|
||||
if(NOT USE_QT_VERSION STREQUAL "5" AND NOT USE_QT_VERSION STREQUAL "6")
|
||||
|
|
@ -5,16 +5,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pkarr";
|
||||
version = "4.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pubky";
|
||||
repo = "pkarr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9sTF5h2+vWcz5ohAoo95vldTJGQyz/ICkVpIgaxilwA=";
|
||||
hash = "sha256-564JL7EG/RB2k2JdxAENpP5UZtKtaGlrZfeYOgsLBEY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-26OlV/Xnl1+VFOaCWUjb8LxuJWrCsfY7QTlPZ7VMBCs=";
|
||||
cargoHash = "sha256-HG4cmKQleiWdYBrOgv1Aj/erWjZX5PMwIZpQSQc+sFU=";
|
||||
|
||||
meta = {
|
||||
description = "Public Key Addressable Resource Records (sovereign TLDs) ";
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
xrootd,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "root";
|
||||
version = "6.36.04";
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
|
||||
url = "https://root.cern.ch/download/root_v${finalAttrs.version}.source.tar.gz";
|
||||
hash = "sha256-zGNn2PVjxtSco0wJ0LU8sPQaUo22+GrxEf12dEzaRZY=";
|
||||
};
|
||||
|
||||
|
|
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
|
|||
nlohmann_json # link interface of target "ROOT::ROOTEve"
|
||||
];
|
||||
buildInputs = [
|
||||
clang
|
||||
finalAttrs.clang
|
||||
davix
|
||||
fftw
|
||||
ftgl
|
||||
|
|
@ -163,8 +163,8 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCLAD_SOURCE_DIR=${clad_src}"
|
||||
"-DClang_DIR=${clang}/lib/cmake/clang"
|
||||
"-DCLAD_SOURCE_DIR=${finalAttrs.clad_src}"
|
||||
"-DClang_DIR=${finalAttrs.clang}/lib/cmake/clang"
|
||||
"-Dbuiltin_clang=OFF"
|
||||
"-Dbuiltin_llvm=OFF"
|
||||
"-Dfail-on-missing=ON"
|
||||
|
|
@ -260,4 +260,4 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
license = licenses.lgpl21;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
llvmPackages,
|
||||
openssl,
|
||||
emacs,
|
||||
pkg-config,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rtags";
|
||||
version = "2.38";
|
||||
version = "2.41-unstable-2025-09-23";
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
|
@ -22,15 +22,15 @@ stdenv.mkDerivation rec {
|
|||
llvmPackages.llvm
|
||||
llvmPackages.libclang
|
||||
openssl
|
||||
emacs
|
||||
(emacs.override { withNativeCompilation = false; })
|
||||
]
|
||||
++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andersbakken";
|
||||
repo = "rtags";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c=";
|
||||
rev = "836e4f30ea51ef2074d3231d2118f43e8e32042f";
|
||||
hash = "sha256-dPCXGDDK3sC0oYCTX3Ph3MYxAZqOSaRG7c4+LB/n+Rs=";
|
||||
fetchSubmodules = true;
|
||||
# unicode file names lead to different checksums on HFS+ vs. other
|
||||
# filesystems because of unicode normalisation
|
||||
|
|
@ -39,25 +39,19 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
};
|
||||
|
||||
# This should be fixed with the next version bump
|
||||
# https://github.com/Andersbakken/rtags/issues/1411
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "define-obsolete-function-alias.patch";
|
||||
url = "https://github.com/Andersbakken/rtags/commit/63f18acb21e664fd92fbc19465f0b5df085b5e93.patch";
|
||||
sha256 = "sha256-dmEPtnk8Pylmf5479ovHKItRZ+tJuOWuYOQbWB/si/Y=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) -fexceptions" \
|
||||
LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "C/C++ client-server indexer based on clang";
|
||||
homepage = "https://github.com/andersbakken/rtags";
|
||||
license = lib.licenses.gpl3;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
let
|
||||
pname = "simplex-chat-desktop";
|
||||
version = "6.4.6";
|
||||
version = "6.4.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
|
||||
hash = "sha256-Z36jWYiWP5PdiDHazXnZw9PbFC7sB2DV9c29YEjNDEc=";
|
||||
hash = "sha256-zCkbQS99FNZS9Q6MgQuINcgWn+/JdfrLraEKWAGqguY=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "texstudio";
|
||||
version = "4.8.9";
|
||||
version = "4.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "texstudio-org";
|
||||
repo = "texstudio";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-nI7aNZ7/IAjgjmHRO78uwkah8l+3m+w1ZQ096177eAU=";
|
||||
hash = "sha256-LHG+QFtUYf6gqF8WGUlAYd5LWNt2YlyXmQH2nwPV5MQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
(lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
|
||||
(lib.cmakeBool "CPM_USE_LOCAL_PACKAGES" true)
|
||||
(lib.cmakeFeature "VERSION_NUMERIC" finalAttrs.version)
|
||||
(lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -75,6 +75,11 @@ stdenv.mkDerivation rec {
|
|||
${optionalString withPerl "./configure perl --module=perl --perl=${perl}/bin/perl"}
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
# 'EVP_PKEY_asn1_find_str' is deprecated since OpenSSL 3.6
|
||||
"-Wno-error=deprecated-declarations"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
unit-perl = nixosTests.unit-perl;
|
||||
unit-php = nixosTests.unit-php;
|
||||
|
|
|
|||
|
|
@ -35,5 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
# last successful hydra build on darwin was in 2024
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
pythonOlder,
|
||||
installShellFiles,
|
||||
|
|
@ -34,15 +34,16 @@ buildPythonPackage rec {
|
|||
pname = "ansible-core";
|
||||
# IMPORTANT: When bumping the minor version (2.XX.0 - the XX), please update pinned package in pkgs/top-level/all-packages.nix
|
||||
# There are pinned packages called ansible_2_XX, create a new one with the previous minor version and then update the version here
|
||||
version = "2.19.3";
|
||||
version = "2.19.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "ansible_core";
|
||||
inherit version;
|
||||
hash = "sha256-JDppZpoAe+B5Q2C8RHf3DgEozgCR3Dr0xcuBxqRm9XM=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ansible";
|
||||
repo = "ansible";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TjafUlPKuxpXrfREK65D88SoGThGBzpbfCHr0ZkviI0=";
|
||||
};
|
||||
|
||||
# ansible_connection is already wrapped, so don't pass it through
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
lib,
|
||||
pythonOlder,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
|
|
@ -25,17 +24,15 @@
|
|||
|
||||
let
|
||||
pname = "ansible";
|
||||
version = "12.1.0";
|
||||
version = "12.2.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-It6hk41DP6UVswAc+tZcswjvl8mA8VIBdNBU3TjzLIM=";
|
||||
hash = "sha256-BWPf0z69KMr2zNx6bSKn/a+9nJxC/vyuUXlhalOjUhE=";
|
||||
};
|
||||
|
||||
# we make ansible-core depend on ansible, not the other way around,
|
||||
|
|
|
|||
|
|
@ -35,6 +35,8 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace external/spglib-1.9.9/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.4)" "cmake_minimum_required(VERSION 3.10)"
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "numpy>=2.0.0" "numpy"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lxml,
|
||||
pytest-mypy-plugins,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lxml-stubs";
|
||||
version = "0.5.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxml";
|
||||
repo = "lxml-stubs";
|
||||
tag = version;
|
||||
hash = "sha256-OwaPnCr0vylhdAvMMUfGV6DjZEh7Q71pgMOt66urg5I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [ lxml ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-mypy-plugins
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Output difference, https://github.com/lxml/lxml-stubs/issues/101
|
||||
"etree_element_iterchildren"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Type stubs for the lxml package";
|
||||
homepage = "https://github.com/lxml/lxml-stubs";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,6 +9,7 @@
|
|||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
tritonclient,
|
||||
typeguard,
|
||||
versioneer,
|
||||
}:
|
||||
|
|
@ -18,8 +19,6 @@ buildPythonPackage rec {
|
|||
version = "3.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Project-MONAI";
|
||||
repo = "monai-deploy-app-sdk";
|
||||
|
|
@ -43,6 +42,7 @@ buildPythonPackage rec {
|
|||
numpy
|
||||
networkx
|
||||
colorama
|
||||
tritonclient
|
||||
typeguard
|
||||
];
|
||||
|
||||
|
|
@ -64,12 +64,13 @@ buildPythonPackage rec {
|
|||
# like highdicom and pydicom
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Framework and tools to design, develop and verify AI applications in healthcare imaging";
|
||||
mainProgram = "monai-deploy";
|
||||
homepage = "https://monai.io/deploy.html";
|
||||
changelog = "https://github.com/Project-MONAI/monai-deploy-app-sdk/blob/main/docs/source/release_notes/${src.tag}.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ bcdarwin ];
|
||||
broken = true; # requires holoscan and holoscan-cli, not in Nixpkgs
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
postPatch = ''
|
||||
patchShebangs target_firmware/firmware-crc.pl
|
||||
substituteInPlace target_firmware/CMakeLists.txt \
|
||||
--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" \
|
||||
"CMAKE_MINIMUM_REQUIRED(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6050,7 +6050,8 @@ with pkgs;
|
|||
ansible_2_18 = python3Packages.toPythonApplication (
|
||||
python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.18.8";
|
||||
src = oldAttrs.src.override {
|
||||
src = fetchPypi {
|
||||
pname = "ansible_core";
|
||||
inherit version;
|
||||
hash = "sha256-sHZiFalqR845kz0n4emWyivrVM8bOQfHQtNckTsfeM0=";
|
||||
};
|
||||
|
|
@ -6059,7 +6060,8 @@ with pkgs;
|
|||
ansible_2_17 = python3Packages.toPythonApplication (
|
||||
python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.17.8";
|
||||
src = oldAttrs.src.override {
|
||||
src = fetchPypi {
|
||||
pname = "ansible_core";
|
||||
inherit version;
|
||||
hash = "sha256-Ob6KeYaix9NgabDZciC8L2eDxl/qfG1+Di0A0ayK+Hc=";
|
||||
};
|
||||
|
|
@ -6068,7 +6070,8 @@ with pkgs;
|
|||
ansible_2_16 = python3Packages.toPythonApplication (
|
||||
python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.16.14";
|
||||
src = oldAttrs.src.override {
|
||||
src = fetchPypi {
|
||||
pname = "ansible_core";
|
||||
inherit version;
|
||||
hash = "sha256-gCef/9mGhrrfqjLh7HhdmKbfGy/B5Al97AWXZA10ZBU=";
|
||||
};
|
||||
|
|
@ -13780,8 +13783,6 @@ with pkgs;
|
|||
|
||||
eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { };
|
||||
|
||||
caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { };
|
||||
|
||||
degate = libsForQt5.callPackage ../applications/science/electronics/degate { };
|
||||
|
||||
geda = callPackage ../applications/science/electronics/geda {
|
||||
|
|
|
|||
|
|
@ -243,6 +243,7 @@ mapAliases {
|
|||
lmcloud = throw "'lmcloud' has been renamed to/replaced by 'pylamarzocco'"; # Converted to throw 2025-10-29
|
||||
logilab_common = throw "'logilab_common' has been renamed to/replaced by 'logilab-common'"; # Converted to throw 2025-10-29
|
||||
loo-py = throw "'loo-py' has been renamed to/replaced by 'loopy'"; # Converted to throw 2025-10-29
|
||||
lxml-stubs = throw "'lxml-stubs' has been removed as it was broken and unmaintained upstream. Consider using 'types-lxml' instead."; # Converted to throw 2025-11-07
|
||||
mac_alias = throw "'mac_alias' has been renamed to/replaced by 'mac-alias'"; # Converted to throw 2025-10-29
|
||||
macropy = throw "macropy has been removed as it was broken since 2020"; # added 2025-10-04
|
||||
Mako = throw "'Mako' has been renamed to/replaced by 'mako'"; # Converted to throw 2025-10-29
|
||||
|
|
|
|||
|
|
@ -8976,8 +8976,6 @@ self: super: with self; {
|
|||
|
||||
lxml-html-clean = callPackage ../development/python-modules/lxml-html-clean { };
|
||||
|
||||
lxml-stubs = callPackage ../development/python-modules/lxml-stubs { };
|
||||
|
||||
lyricwikia = callPackage ../development/python-modules/lyricwikia { };
|
||||
|
||||
lz4 = callPackage ../development/python-modules/lz4 { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue