Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -179,6 +179,8 @@
|
||||
of the [4.3 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0),
|
||||
make the required changes to your database, if needed, then upgrade by setting `services.netbox.package = pkgs.netbox_4_3;` in your configuration.
|
||||
|
||||
- `pkgs.nextcloud30` has been removed since it's out of support upstream.
|
||||
|
||||
- `privatebin` has been updated to `2.0.0`. This release changes configuration defaults including switching the template and removing legacy features. See the [v2.0.0 changelog entry](https://github.com/PrivateBin/PrivateBin/releases/tag/2.0.0) for details on how to upgrade.
|
||||
|
||||
- `rocmPackages.triton` has been removed in favor of `python3Packages.triton`.
|
||||
@@ -252,6 +254,8 @@
|
||||
|
||||
- `fetchgit`: Add `rootDir` argument to limit the resulting source to one subdirectory of the whole Git repository. Corresponding `--root-dir` option added to `nix-prefetch-git`.
|
||||
|
||||
- `nix-prefetch-git`: Added a `--no-add-path` argument to disable adding the path to the store; this is useful when working with a [read-only store](https://nix.dev/manual/nix/2.28/command-ref/new-cli/nix3-help-stores#store-experimental-local-overlay-store-read-only).
|
||||
|
||||
- `sftpman` has been updated to version 2, a rewrite in Rust which is mostly backward compatible but does include some changes to the CLI.
|
||||
For more information, [check the project's README](https://github.com/spantaleev/sftpman-rs#is-sftpman-v2-compatible-with-sftpman-v1).
|
||||
|
||||
|
||||
@@ -178,6 +178,8 @@
|
||||
|
||||
- `programs.goldwarden` has been removed, due to the software not working with newer versions of the Bitwarden and Vaultwarden servers, as well as it being abandoned upstream.
|
||||
|
||||
- The `cardboard` package and `programs.cardboard` module were removed due to the package having been broken since at least November 2024.
|
||||
|
||||
- The default `kops` version is now 1.33.0 and versions 1.30 and older have been dropped. See [Upgrading Kubernetes](https://kops.sigs.k8s.io/tutorial/upgrading-kubernetes/) for instructions on how to update kOps.
|
||||
|
||||
- `programs.skim.fuzzyCompletions` has been removed in favor of adding the completions to the package itself.
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
# arguments
|
||||
name,
|
||||
version,
|
||||
imageFileBasename,
|
||||
baseName,
|
||||
compression,
|
||||
fileSystems,
|
||||
finalPartitions,
|
||||
@@ -205,7 +205,7 @@ stdenvNoCC.mkDerivation (
|
||||
echo "Building image with systemd-repart..."
|
||||
unshare --map-root-user fakeroot systemd-repart \
|
||||
''${systemdRepartFlags[@]} \
|
||||
${imageFileBasename}.raw \
|
||||
${baseName}.raw \
|
||||
| tee repart-output.json
|
||||
|
||||
runHook postBuild
|
||||
@@ -220,14 +220,14 @@ stdenvNoCC.mkDerivation (
|
||||
# separate derivation to allow users to save disk space. Disk images are
|
||||
# already very space intensive so we want to allow users to mitigate this.
|
||||
+ lib.optionalString compression.enable ''
|
||||
for f in ${imageFileBasename}*; do
|
||||
for f in ${baseName}*; do
|
||||
echo "Compressing $f with ${compression.algorithm}..."
|
||||
# Keep the original file when compressing and only delete it afterwards
|
||||
${compressionCommand} $f && rm $f
|
||||
done
|
||||
''
|
||||
+ ''
|
||||
mv -v repart-output.json ${imageFileBasename}* $out
|
||||
mv -v repart-output.json ${baseName}* $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -194,8 +194,8 @@ in
|
||||
| assert_uki_repart_match.py "${config.system.build.intermediateImage}/repart-output.json"
|
||||
|
||||
# copy the uncompressed intermediate image, so that systemd-repart picks it up
|
||||
cp -v ${config.system.build.intermediateImage}/${config.image.repart.imageFileBasename}.raw .
|
||||
chmod +w ${config.image.repart.imageFileBasename}.raw
|
||||
cp -v ${config.system.build.intermediateImage}/${config.image.baseName}.raw .
|
||||
chmod +w ${config.image.baseName}.raw
|
||||
'';
|
||||
|
||||
# replace "TBD" with the original roothash values
|
||||
|
||||
@@ -408,7 +408,7 @@ in
|
||||
mkfsEnv = mkfsOptionsToEnv cfg.mkfsOptions;
|
||||
val = pkgs.callPackage ./repart-image.nix {
|
||||
systemd = cfg.package;
|
||||
imageFileBasename = config.image.baseName;
|
||||
inherit (config.image) baseName;
|
||||
inherit (cfg)
|
||||
name
|
||||
version
|
||||
|
||||
@@ -337,7 +337,6 @@
|
||||
./programs/vivid.nix
|
||||
./programs/vscode.nix
|
||||
./programs/wavemon.nix
|
||||
./programs/wayland/cardboard.nix
|
||||
./programs/wayland/dwl.nix
|
||||
./programs/wayland/gtklock.nix
|
||||
./programs/wayland/hyprland.nix
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.programs.cardboard;
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ ];
|
||||
|
||||
options.programs.cardboard = {
|
||||
enable = lib.mkEnableOption "cardboard";
|
||||
|
||||
package = lib.mkPackageOption pkgs "cardboard" { };
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable (
|
||||
lib.mkMerge [
|
||||
{
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
# To make a cardboard session available for certain DMs like SDDM
|
||||
services.displayManager.sessionPackages = [ cfg.package ];
|
||||
}
|
||||
(import ./wayland-session.nix { inherit lib pkgs; })
|
||||
]
|
||||
);
|
||||
}
|
||||
@@ -58,6 +58,10 @@ in
|
||||
"networking"
|
||||
"wicd"
|
||||
] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [
|
||||
"programs"
|
||||
"cardboard"
|
||||
] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [
|
||||
"programs"
|
||||
"gnome-documents"
|
||||
|
||||
@@ -40,7 +40,7 @@ in
|
||||
security.pki.certificateFiles = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.path;
|
||||
default = [ ];
|
||||
example = lib.literalExpression ''[ "''${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ]'';
|
||||
example = lib.literalExpression ''[ "''${pkgs.dn42-cacert}/etc/ssl/certs/dn42-ca.crt" ]'';
|
||||
description = ''
|
||||
A list of files containing trusted root certificates in PEM
|
||||
format. These are concatenated to form
|
||||
|
||||
@@ -21,7 +21,6 @@ in
|
||||
description = "Contents of {file}`sssd.conf`.";
|
||||
default = ''
|
||||
[sssd]
|
||||
config_file_version = 2
|
||||
services = nss, pam
|
||||
domains = shadowutils
|
||||
|
||||
|
||||
@@ -437,7 +437,6 @@ in
|
||||
type = lib.types.package;
|
||||
description = "Which package to use for the Nextcloud instance.";
|
||||
relatedPackages = [
|
||||
"nextcloud30"
|
||||
"nextcloud31"
|
||||
];
|
||||
};
|
||||
@@ -549,7 +548,7 @@ in
|
||||
Options for nextcloud's PHP pool. See the documentation on `php-fpm.conf` for details on
|
||||
configuration directives. The above are recommended for a server with 4GiB of RAM.
|
||||
|
||||
It's advisable to read the [section about PHPFPM tuning in the upstream manual](https://docs.nextcloud.com/server/30/admin_manual/installation/server_tuning.html#tune-php-fpm)
|
||||
It's advisable to read the [section about PHPFPM tuning in the upstream manual](https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#tune-php-fpm)
|
||||
and consider customizing the values.
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -139,7 +139,6 @@ let
|
||||
in
|
||||
listToAttrs (
|
||||
concatMap genTests [
|
||||
30
|
||||
31
|
||||
]
|
||||
)
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
binaryName = "firefox-beta";
|
||||
version = "144.0b4";
|
||||
version = "144.0b6";
|
||||
applicationName = "Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "f49e852eae3c453e4de46cde42f3d23d977a71414e8193b49ceff7816d8aff4d11e915860b6c732a64922bb2b897ff39b9fe9919458eb943ffd03efbc1c75650";
|
||||
sha512 = "b0e8398513db7de1f16412bedba519b3d307022c0eadc1c114f3ad247ac368c027bd968f98a38c41076c1e6e06c96ec3821230d470f4f804e51ff09ede84a618";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
binaryName = "firefox-devedition";
|
||||
version = "144.0b4";
|
||||
version = "144.0b6";
|
||||
applicationName = "Firefox Developer Edition";
|
||||
requireSigning = false;
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "144a10bc0c2121e22990def70e1b5bcc033a8b8cd7ad433a1b1d5db33599d05142d1f5c1e486f919e7b839849aaf83c6c4287df89f337151b82f220f9bd7fe52";
|
||||
sha512 = "08a42497eef413f097c4c8191ef2d0e4e7a6f39a63744d51352aaa4016ed8877da4eace81bfc85e97f8e4f17c7ea9225fe11c94e70d6e4c9f4ec69cd43aeecc4";
|
||||
};
|
||||
|
||||
# buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
|
||||
|
||||
-28
@@ -1,28 +0,0 @@
|
||||
compatibility with newer spdlog/fmt versions
|
||||
|
||||
diff --git a/plugins/module_identification/src/api/module_identification.cpp b/plugins/module_identification/src/api/module_identification.cpp
|
||||
index 808875e8a68..3cf3cf1fb8b 100644
|
||||
--- a/plugins/module_identification/src/api/module_identification.cpp
|
||||
+++ b/plugins/module_identification/src/api/module_identification.cpp
|
||||
@@ -406,7 +406,7 @@ namespace hal
|
||||
|
||||
const u32 num_threads = std::min(config.m_max_thread_count, std::thread::hardware_concurrency() - 1);
|
||||
|
||||
- log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, config.m_multithreading_priority);
|
||||
+ log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, fmt::underlying(config.m_multithreading_priority));
|
||||
|
||||
auto stats = Statistics();
|
||||
|
||||
diff --git a/plugins/z3_utils/src/simplification.cpp b/plugins/z3_utils/src/simplification.cpp
|
||||
index d64cab665f2..561fa7f1a23 100644
|
||||
--- a/plugins/z3_utils/src/simplification.cpp
|
||||
+++ b/plugins/z3_utils/src/simplification.cpp
|
||||
@@ -617,7 +617,7 @@ namespace hal
|
||||
return false;
|
||||
|
||||
default: {
|
||||
- log_error("z3_utils", "commutative check not implemeted for type {}!", t);
|
||||
+ log_error("z3_utils", "commutative check not implemeted for type {}!", fmt::underlying(t));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
-13
@@ -1,13 +0,0 @@
|
||||
diff --git a/plugins/resynthesis/src/resynthesis.cpp b/plugins/resynthesis/src/resynthesis.cpp
|
||||
index 7a7e404114f..f2889667af8 100644
|
||||
--- a/plugins/resynthesis/src/resynthesis.cpp
|
||||
+++ b/plugins/resynthesis/src/resynthesis.cpp
|
||||
@@ -1058,7 +1058,7 @@ namespace hal
|
||||
// delete the created directory and the contained files
|
||||
std::filesystem::remove_all(base_path);
|
||||
|
||||
- return OK(subgraph.size());
|
||||
+ return OK(static_cast<unsigned int>(subgraph.size()));
|
||||
}
|
||||
|
||||
Result<u32> resynthesize_subgraph_of_type(Netlist* nl, const std::vector<const GateType*>& gate_types, GateLibrary* target_gl)
|
||||
@@ -59,6 +59,7 @@ Options:
|
||||
--fetch-submodules Fetch submodules.
|
||||
--fetch-tags Fetch all tags (useful for git describe).
|
||||
--builder Clone as fetchgit does, but url, rev, and out option are mandatory.
|
||||
--no-add-path Do not actually add the contents of the git repo to the store.
|
||||
--root-dir dir Directory in the repository that will be copied to the output instead of the full repository.
|
||||
--quiet Only print the final json summary.
|
||||
"
|
||||
@@ -91,6 +92,7 @@ for arg; do
|
||||
--fetch-submodules) fetchSubmodules=true;;
|
||||
--fetch-tags) fetchTags=true;;
|
||||
--builder) builder=true;;
|
||||
--no-add-path) noAddPath=true;;
|
||||
--root-dir) argfun=set_rootDir;;
|
||||
-h|--help) usage; exit;;
|
||||
*)
|
||||
@@ -519,7 +521,14 @@ else
|
||||
hash=$(nix-hash --type $hashType --base32 "$tmpOut")
|
||||
|
||||
# Add the downloaded file to the Nix store.
|
||||
finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpOut")
|
||||
|
||||
if test -z "$noAddPath"; then
|
||||
finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpOut") \
|
||||
|| { printf "maybe try again with \`nix-prefetch-git --no-add-path <...>' ?\n" >&2; exit 1; }
|
||||
else
|
||||
printf "the path for \`%s' has NOT been added to the store\n" "$url" >&2
|
||||
finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$hash" "$storePathName")
|
||||
fi
|
||||
|
||||
if test -n "$expHash" -a "$expHash" != "$hash"; then
|
||||
echo "hash mismatch for URL \`$url'. Got \`$hash'; expected \`$expHash'." >&2
|
||||
|
||||
@@ -1,4 +1,14 @@
|
||||
{ testers, fetchgit, ... }:
|
||||
{
|
||||
runCommand,
|
||||
testers,
|
||||
fetchgit,
|
||||
nix-prefetch-git,
|
||||
jq,
|
||||
cacert,
|
||||
nix,
|
||||
closureInfo,
|
||||
...
|
||||
}:
|
||||
{
|
||||
simple = testers.invalidateFetcherByDrvHash fetchgit {
|
||||
name = "simple-nix-source";
|
||||
@@ -105,4 +115,83 @@
|
||||
rootDir = "misc/systemd";
|
||||
sha256 = "sha256-UhxHk4SrXYq7ZDMtXLig5SigpbITrVgkpFTmryuvpcM=";
|
||||
};
|
||||
|
||||
# Make sure that if an expected hash is given and the corresponding store path exists already, no fetch is done
|
||||
cached-prefetch-avoids-fetch =
|
||||
let
|
||||
name = "cached-prefetch-avoids-fetch";
|
||||
url = "https://github.com/NixOS/nix";
|
||||
rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
|
||||
sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY=";
|
||||
fetched = fetchgit {
|
||||
inherit
|
||||
name
|
||||
url
|
||||
rev
|
||||
sha256
|
||||
;
|
||||
};
|
||||
in
|
||||
runCommand "cached-prefetch-avoids-fetch"
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
nix-prefetch-git
|
||||
nix
|
||||
];
|
||||
}
|
||||
''
|
||||
export NIX_REMOTE=local?root=$(mktemp -d)
|
||||
nix-store --load-db < ${closureInfo { rootPaths = fetched; }}/registration
|
||||
nix-prefetch-git --name "${name}" "${url}" "${rev}" "${sha256}" > $out
|
||||
'';
|
||||
|
||||
prefetch-git-no-add-path =
|
||||
testers.invalidateFetcherByDrvHash
|
||||
(
|
||||
{
|
||||
name,
|
||||
url,
|
||||
rev,
|
||||
hash,
|
||||
...
|
||||
}:
|
||||
runCommand name
|
||||
{
|
||||
buildInputs = [
|
||||
nix-prefetch-git
|
||||
nix
|
||||
cacert
|
||||
jq
|
||||
];
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = null;
|
||||
outputHash = hash;
|
||||
inherit url rev;
|
||||
}
|
||||
''
|
||||
store_root="$(mktemp -d)"
|
||||
prefetch() { NIX_REMOTE="local?root=$store_root" nix-prefetch-git $@ "$url" --rev "$rev" | jq -r .path; }
|
||||
path="$(prefetch --no-add-path)"
|
||||
if test -e "$store_root/$path"; then
|
||||
echo "$path exists in $NIX_REMOTE when it shouldn't" >&2
|
||||
exit 1
|
||||
fi
|
||||
path_added="$(prefetch)"
|
||||
if ! test -e "$store_root/$path"; then
|
||||
echo "$path_added doesn't exist in NIX_REMOTE when it should" >&2
|
||||
exit 1
|
||||
fi
|
||||
if test "$path" != "$path_added"; then
|
||||
echo "Paths are different with and without --no-add-path: $path != $path_added" >&2
|
||||
exit 1
|
||||
fi
|
||||
cp -r "$store_root/$path_added" "$out"
|
||||
''
|
||||
)
|
||||
{
|
||||
name = "nix-prefetch-git-no-add-path";
|
||||
url = "https://github.com/NixOS/nix";
|
||||
rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
|
||||
hash = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,21 +5,25 @@
|
||||
scdoc,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
installShellFiles,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "app2unit";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vladimir-csp";
|
||||
repo = "app2unit";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-M2sitlrQNSLthSaDH+R8gUcZ8i+o1ktf2SB/vvjyJEI=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
nativeBuildInputs = [ scdoc ];
|
||||
nativeBuildInputs = [
|
||||
scdoc
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
scdoc < app2unit.1.scd > app2unit.1
|
||||
@@ -27,6 +31,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
installPhase = ''
|
||||
install -Dt $out/bin app2unit
|
||||
installManPage app2unit.1
|
||||
|
||||
for link in \
|
||||
app2unit-open \
|
||||
@@ -54,4 +59,4 @@ stdenvNoCC.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [ fazzi ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "arrpc";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenAsar";
|
||||
repo = "arrpc";
|
||||
tag = version;
|
||||
hash = "sha256-3xkqWcLhmSIH6Al2SvM9qBpdcLzEqUmUCgwYBPAgVpo=";
|
||||
hash = "sha256-WSwnCE3hs3Rj42XDbPtxuYL8tAlfzuWPkIypKzCu8EQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-lw6pngFC2Pnk+I8818TOTwN4r+8IsjvdMYIyTsTi49g=";
|
||||
npmDepsHash = "sha256-A98oNT1rGctSlJG9yLaa6i0VsGMIo1r2NoNk00SVupk=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@@ -21,13 +21,13 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "attic";
|
||||
version = "0-unstable-2025-09-12";
|
||||
version = "0-unstable-2025-09-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zhaofengli";
|
||||
repo = "attic";
|
||||
rev = "7c5d79ad62cda340cb8c80c99b921b7b7ffacf69";
|
||||
hash = "sha256-q7q0pWT+wu5AUU1Qlbwq8Mqb+AzHKhaMCVUq/HNZfo8=";
|
||||
rev = "12cbeca141f46e1ade76728bce8adc447f2166c6";
|
||||
hash = "sha256-0nZlCCDC5PfndsQJXXtcyrtrfW49I3KadGMDlutzaGU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage {
|
||||
buildInputs = lib.optional needNixInclude nix ++ [ boost ];
|
||||
|
||||
cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates;
|
||||
cargoHash = "sha256-NdzwYnD0yMEI2RZwwXl/evYx9zdBVMOUee+V7uq1cf0=";
|
||||
cargoHash = "sha256-h041o0s+bciXnvSuk4j+/uCY/sRRQWDVf+WEb9GEYeY=";
|
||||
|
||||
env = {
|
||||
ATTIC_DISTRIBUTOR = "nixpkgs";
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
jdk17,
|
||||
pango,
|
||||
cairo,
|
||||
pkg-config,
|
||||
buildFHSEnv,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
@@ -38,14 +39,14 @@ in
|
||||
let
|
||||
bolt = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bolt-launcher";
|
||||
version = "0.19.1";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdamCake";
|
||||
repo = "bolt";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-1BvjKlpUD4gJJOlrc2wsl9Pv2x1TBcejYsGiliMrwao=";
|
||||
hash = "sha256-Gh1xaYAysZshEGzljnEYJuK8Mv4cwSWH1W4rEu2F/0s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -54,6 +55,7 @@ let
|
||||
luajit
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -67,7 +69,6 @@ let
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-D BOLT_LUAJIT_INCLUDE_DIR=${luajit}/include"
|
||||
"-G Ninja"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isAarch64) [
|
||||
|
||||
@@ -1,146 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchurl,
|
||||
fetchgit,
|
||||
ffmpeg,
|
||||
libGL,
|
||||
libX11,
|
||||
libcap,
|
||||
libdrm,
|
||||
libinput,
|
||||
libpng,
|
||||
libxcb,
|
||||
libxkbcommon,
|
||||
libgbm,
|
||||
meson,
|
||||
ninja,
|
||||
pandoc,
|
||||
pixman,
|
||||
pkg-config,
|
||||
unzip,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
xcbutilerrors,
|
||||
xcbutilimage,
|
||||
xcbutilwm,
|
||||
}:
|
||||
|
||||
let
|
||||
allSources = {
|
||||
# cereal.wrap
|
||||
cereal-wrap = fetchurl {
|
||||
name = "cereal-1.3.0.tar.gz";
|
||||
url = "https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz";
|
||||
hash = "sha256-Mp6j4xMLAmwDpKzFDhaOfa/05uZhvGp9/sDXe1cIUdU=";
|
||||
};
|
||||
cereal-wrapdb = fetchurl {
|
||||
name = "cereal-1.3.0-1-wrap.zip";
|
||||
url = "https://wrapdb.mesonbuild.com/v1/projects/cereal/1.3.0/1/get_zip";
|
||||
hash = "sha256-QYck5UT7fPLqtLDb1iOSX4Hnnns48Jj23Ae/LCfLSKY=";
|
||||
};
|
||||
|
||||
# expected.wrap
|
||||
expected-wrap = fetchgit {
|
||||
name = "expected";
|
||||
url = "https://gitlab.com/cardboardwm/expected";
|
||||
rev = "0ee13cb2b058809aa9708c45ca18d494e72a759e";
|
||||
hash = "sha256-gYr4/pjuLlr3k6Jcrg2/SzJLtbgyA+ZN2oMHkHXANDo=";
|
||||
};
|
||||
|
||||
# wlroots.wrap
|
||||
wlroots-wrap = fetchgit {
|
||||
name = "wlroots";
|
||||
url = "https://github.com/swaywm/wlroots";
|
||||
rev = "0.12.0";
|
||||
hash = "sha256-1rE3D+kQprjcjobc95/mQkUa5y1noY0MdoYJ/SpFQwY=";
|
||||
};
|
||||
|
||||
# the source itself
|
||||
cardboard = fetchFromGitLab {
|
||||
owner = "cardboardwm";
|
||||
repo = "cardboard";
|
||||
rev = "b54758d85164fb19468f5ca52588ebea576cd027";
|
||||
hash = "sha256-Kn5NyQSDyX7/nn2bKZPnsuepkoppi5XIkdu7IDy5r4w=";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "cardboard";
|
||||
version = "unstable-2021-05-10";
|
||||
|
||||
src = allSources.cardboard;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"lib"
|
||||
"man"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pandoc
|
||||
pkg-config
|
||||
unzip
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg
|
||||
libGL
|
||||
libX11
|
||||
libcap
|
||||
libdrm
|
||||
libinput
|
||||
libpng
|
||||
libxcb
|
||||
libxkbcommon
|
||||
libgbm
|
||||
pixman
|
||||
wayland
|
||||
wayland-protocols
|
||||
xcbutilerrors
|
||||
xcbutilimage
|
||||
xcbutilwm
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
pushd subprojects
|
||||
tar xvf ${allSources.cereal-wrap}
|
||||
unzip ${allSources.cereal-wrapdb}
|
||||
cp -r ${allSources.expected-wrap} ${allSources.expected-wrap.name}
|
||||
cp -r ${allSources.wlroots-wrap} ${allSources.wlroots-wrap.name}
|
||||
popd
|
||||
|
||||
# gcc12
|
||||
sed '1i#include <functional>' -i cardboard/ViewAnimation.h
|
||||
'';
|
||||
|
||||
# "Inherited" from Nixpkgs expression for wlroots
|
||||
mesonFlags = [
|
||||
(lib.mesonBool "man" true)
|
||||
(lib.mesonOption "wlroots:logind-provider" "systemd")
|
||||
(lib.mesonEnable "wlroots:libseat" false)
|
||||
];
|
||||
|
||||
# gcc12
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=array-bounds" ];
|
||||
|
||||
passthru = {
|
||||
providedSessions = [ "cardboard" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
broken = true; # Upstream is archived, fails to build on gcc-13.
|
||||
homepage = "https://gitlab.com/cardboardwm/cardboard";
|
||||
description = "Scrollable, tiling Wayland compositor inspired on PaperWM";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "cardboard";
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
inherit (wayland.meta) platforms;
|
||||
};
|
||||
}
|
||||
@@ -18,18 +18,18 @@
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cinny-desktop";
|
||||
# We have to be using the same version as cinny-web or this isn't going to work.
|
||||
version = "4.10.0";
|
||||
version = "4.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cinnyapp";
|
||||
repo = "cinny-desktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YEu1qTI2ExfS+WKFxNGkubr+HOCCuWGpZFk3hS3srCU=";
|
||||
hash = "sha256-SUbEanFIvjj2wyy/nuq+91F5on7wuLWcpVt1U8XWjRI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src-tauri";
|
||||
|
||||
cargoHash = "sha256-NksWHI2TJR0YMGRIDHBxrQPGHiir2Kn4bxnSvO7EzoA=";
|
||||
cargoHash = "sha256-NL5vsuSNKduRW2TaXWFA0pjszVa8EYU5cRaTZHCooLU=";
|
||||
|
||||
postPatch =
|
||||
let
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "cinny-unwrapped";
|
||||
version = "4.10.0";
|
||||
version = "4.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cinnyapp";
|
||||
repo = "cinny";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-KpN6ul+kzGarBKnXXSP3gf9KlRII869xnfT95mzacRc=";
|
||||
hash = "sha256-Hn49a+nGtF5kJ1ZM+rOXWH+dFG1nMSI/rIDF+9qlQk4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-N5xHu4AmgRdd3gM+YTu+fbtAw1YDp4SMXdXUbbJnIZc=";
|
||||
npmDepsHash = "sha256-896W5XbAGUcUa8gxeR72hg9fwTaUOR5a5hex8vS33gU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
||||
@@ -40,6 +40,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# The civetweb unit tests rely on downloading their fork of libcheck.
|
||||
"-DCIVETWEB_BUILD_TESTING=OFF"
|
||||
|
||||
# The default stack size in civetweb is 102400 (see the CMakeLists [1]).
|
||||
# This can lead to stack overflows even in basic usage;
|
||||
# Setting this value to 0 lets the OS choose the stack size instead, which results in a more suitable value.
|
||||
#
|
||||
# [1] https://github.com/civetweb/civetweb/blob/cafd5f8fae3b859b7f8c29feb03ea075c7221497/CMakeLists.txt#L56
|
||||
"-DCIVETWEB_THREAD_STACK_SIZE=0"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
nodejs_20,
|
||||
nodejs_22,
|
||||
installShellFiles,
|
||||
makeWrapper,
|
||||
stdenv,
|
||||
@@ -11,27 +11,33 @@
|
||||
buildNpmPackage rec {
|
||||
pname = "clever-tools";
|
||||
|
||||
version = "3.14.1";
|
||||
version = "4.1.0";
|
||||
|
||||
nodejs = nodejs_20;
|
||||
nodejs = nodejs_22;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CleverCloud";
|
||||
repo = "clever-tools";
|
||||
rev = version;
|
||||
hash = "sha256-3nCfo54p7O4Oik3fTf842IahEQnu26oPS5aOgHdhJKg=";
|
||||
hash = "sha256-ntKxMlRBE0WoaO2Fmpymhm7y7kCwe197sotNzpK92C4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-NWi+LJWLT2z3980d3rxBkNYzmMS6JwuP49ltGtKRd5c=";
|
||||
npmDepsHash = "sha256-GsJlrz41q9GvFpYZcauuGXgMCG6mqSuI5gy+hxlJfUQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
node scripts/bundle-cjs.js ${version} false
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/lib/clever-tools
|
||||
cp build/clever.cjs $out/lib/clever-tools/clever.cjs
|
||||
cp build/${version}/clever.cjs $out/lib/clever-tools/clever.cjs
|
||||
|
||||
makeWrapper ${nodejs}/bin/node $out/bin/clever \
|
||||
--add-flags "$out/lib/clever-tools/clever.cjs" \
|
||||
|
||||
@@ -32,7 +32,7 @@ let
|
||||
llvmStdenv = llvmPackages_19.stdenv;
|
||||
in
|
||||
llvmStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clickhouse" + lib.optionalString lts "-lts";
|
||||
pname = "clickhouse";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
version = "25.8.2.29-lts";
|
||||
hash = "sha256-S+1fZuYlZUMkiBlMtufMT5aAi9uwbFMjYW7Dmkt/Now=";
|
||||
version = "25.8.7.3-lts";
|
||||
hash = "sha256-wH/UxMgnsK6OIGxEv9CYA67f8PWC0u6IAiW2iY/KThk=";
|
||||
lts = true;
|
||||
nixUpdateExtraArgs = [
|
||||
"--version-regex"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
version = "25.8.2.29-lts";
|
||||
hash = "sha256-S+1fZuYlZUMkiBlMtufMT5aAi9uwbFMjYW7Dmkt/Now=";
|
||||
version = "25.9.2.1-stable";
|
||||
hash = "sha256-BygRxiDhhs91/UPWY7f3jAGyTtyAj98RdDXLwjs8Abo=";
|
||||
lts = false;
|
||||
nixUpdateExtraArgs = [
|
||||
"--version-regex"
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "dn42-cacert";
|
||||
|
||||
# check it on its homepage
|
||||
version = "0-unstable-2016-01-16";
|
||||
|
||||
src = ./root-ca.crt;
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
install -Dm644 $src $out/etc/ssl/certs/dn42-ca.crt
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "DN42 Root CA certificate";
|
||||
homepage = "https://wiki.dn42.dev/services/Certificate-Authority.md";
|
||||
license = lib.licenses.cc0;
|
||||
maintainers = with lib.maintainers; [ Cryolitia ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
Certificate:
|
||||
Data:
|
||||
Version: 3 (0x2)
|
||||
Serial Number: 137808117760 (0x2016010000)
|
||||
Signature Algorithm: sha256WithRSAEncryption
|
||||
Issuer: C=XD, O=dn42, OU=dn42 Certificate Authority, CN=dn42 Root Authority CA
|
||||
Validity
|
||||
Not Before: Jan 16 00:12:04 2016 GMT
|
||||
Not After : Dec 31 23:59:59 2030 GMT
|
||||
Subject: C=XD, O=dn42, OU=dn42 Certificate Authority, CN=dn42 Root Authority CA
|
||||
Subject Public Key Info:
|
||||
Public Key Algorithm: rsaEncryption
|
||||
Public-Key: (2048 bit)
|
||||
Modulus:
|
||||
00:c1:19:10:de:01:86:11:f1:82:0c:b0:d4:e5:ff:
|
||||
9a:c8:e3:aa:f4:00:08:82:c0:cf:7f:05:7a:21:97:
|
||||
c1:b5:8b:a3:d1:54:ee:fa:04:0f:77:d5:5c:98:4b:
|
||||
d9:88:18:c1:17:10:92:e5:24:fa:ef:61:eb:5d:7b:
|
||||
11:e5:be:ba:89:f2:60:c9:3b:82:05:3a:74:54:60:
|
||||
23:66:1a:d8:cd:28:7b:f1:ea:55:25:9a:8c:04:a0:
|
||||
ff:9d:48:54:4c:9d:bc:2d:a0:df:71:ae:64:47:0d:
|
||||
e7:75:05:f4:c5:02:2a:d2:0c:be:a3:63:54:62:2b:
|
||||
ad:29:eb:6a:08:a4:5e:a8:eb:f1:52:14:4e:d1:5d:
|
||||
41:2f:d3:19:ba:e4:82:36:7a:d1:a3:f2:84:f6:07:
|
||||
b2:f6:0c:30:db:db:76:ee:e9:14:05:c7:8f:75:b7:
|
||||
3f:d5:d5:35:56:d0:92:44:df:26:1e:00:fa:ae:cb:
|
||||
7a:c9:50:67:5d:69:f8:f9:fd:25:a7:1d:db:40:b1:
|
||||
42:bc:45:57:e1:c9:1c:42:ba:69:80:1e:ea:25:99:
|
||||
12:9f:6f:23:a3:d2:2e:4a:cd:15:e4:7c:49:f9:d1:
|
||||
c0:f0:19:0c:15:50:ce:a6:51:bb:aa:16:b2:82:ec:
|
||||
f4:61:44:8c:1c:dd:65:60:04:77:b0:4d:99:67:17:
|
||||
fb:09
|
||||
Exponent: 65537 (0x10001)
|
||||
X509v3 extensions:
|
||||
X509v3 Key Usage: critical
|
||||
Certificate Sign, CRL Sign
|
||||
X509v3 Basic Constraints: critical
|
||||
CA:TRUE
|
||||
X509v3 Subject Key Identifier:
|
||||
54:76:88:B2:C0:B5:30:D0:FC:4F:C9:6D:3B:F9:8C:55:11:AC:15:15
|
||||
X509v3 Authority Key Identifier:
|
||||
keyid:54:76:88:B2:C0:B5:30:D0:FC:4F:C9:6D:3B:F9:8C:55:11:AC:15:15
|
||||
|
||||
X509v3 Name Constraints:
|
||||
Permitted:
|
||||
DNS:.dn42
|
||||
IP:172.20.0.0/255.252.0.0
|
||||
IP:FD42:0:0:0:0:0:0:0/FFFF:0:0:0:0:0:0:0
|
||||
|
||||
Signature Algorithm: sha256WithRSAEncryption
|
||||
5c:a4:3b:41:a0:81:69:e2:71:99:4d:75:4b:5a:20:0d:2a:d9:
|
||||
ec:ea:bc:8d:4f:b0:6c:f3:2e:41:1a:a0:75:f3:de:7e:3a:e0:
|
||||
a7:b9:db:cd:f5:16:e4:6a:cb:e7:cc:2a:8f:ee:7f:14:0a:a5:
|
||||
b5:f9:66:48:81:e5:68:1e:0c:a6:a3:3c:a7:2b:e3:95:cf:e3:
|
||||
63:15:0d:16:09:63:d9:66:31:3b:42:2e:7c:1a:e5:28:8e:5e:
|
||||
3d:9e:28:99:48:e9:47:86:11:e2:04:29:60:2b:96:95:99:ae:
|
||||
3f:ab:ff:3f:45:ab:7e:07:45:4e:4d:0b:18:40:3d:3b:02:9c:
|
||||
4e:a9:0f:a5:c2:3f:4a:30:77:ae:66:5c:b3:8d:b2:41:6b:e2:
|
||||
98:01:7d:e0:6b:52:70:4d:3d:b8:a9:48:f5:02:d2:d9:40:66:
|
||||
b6:5e:44:25:11:55:ac:31:02:d7:67:72:6a:6a:bc:74:34:5f:
|
||||
75:dc:9a:4f:83:28:40:e0:2a:dc:3f:41:43:5a:47:07:2b:b7:
|
||||
a7:3f:d0:15:a2:42:d7:30:22:f2:f6:e4:b4:f6:3b:38:ca:6b:
|
||||
4c:e7:3c:a4:70:cb:de:af:0a:14:ff:23:25:ca:04:cd:9e:49:
|
||||
c3:4b:e4:0a:b5:0b:84:b5:ef:b4:5b:63:07:47:63:cd:5c:50:
|
||||
0b:42:0a:a9
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIID8DCCAtigAwIBAgIFIBYBAAAwDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMC
|
||||
WEQxDTALBgNVBAoMBGRuNDIxIzAhBgNVBAsMGmRuNDIgQ2VydGlmaWNhdGUgQXV0
|
||||
aG9yaXR5MR8wHQYDVQQDDBZkbjQyIFJvb3QgQXV0aG9yaXR5IENBMCAXDTE2MDEx
|
||||
NjAwMTIwNFoYDzIwMzAxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJYRDENMAsGA1UE
|
||||
CgwEZG40MjEjMCEGA1UECwwaZG40MiBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAd
|
||||
BgNVBAMMFmRuNDIgUm9vdCBBdXRob3JpdHkgQ0EwggEiMA0GCSqGSIb3DQEBAQUA
|
||||
A4IBDwAwggEKAoIBAQDBGRDeAYYR8YIMsNTl/5rI46r0AAiCwM9/BXohl8G1i6PR
|
||||
VO76BA931VyYS9mIGMEXEJLlJPrvYetdexHlvrqJ8mDJO4IFOnRUYCNmGtjNKHvx
|
||||
6lUlmowEoP+dSFRMnbwtoN9xrmRHDed1BfTFAirSDL6jY1RiK60p62oIpF6o6/FS
|
||||
FE7RXUEv0xm65II2etGj8oT2B7L2DDDb23bu6RQFx491tz/V1TVW0JJE3yYeAPqu
|
||||
y3rJUGddafj5/SWnHdtAsUK8RVfhyRxCummAHuolmRKfbyOj0i5KzRXkfEn50cDw
|
||||
GQwVUM6mUbuqFrKC7PRhRIwc3WVgBHewTZlnF/sJAgMBAAGjgaowgacwDgYDVR0P
|
||||
AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFR2iLLAtTDQ/E/J
|
||||
bTv5jFURrBUVMB8GA1UdIwQYMBaAFFR2iLLAtTDQ/E/JbTv5jFURrBUVMEQGA1Ud
|
||||
HgQ9MDugOTAHggUuZG40MjAKhwisFAAA//wAADAihyD9QgAAAAAAAAAAAAAAAAAA
|
||||
//8AAAAAAAAAAAAAAAAAADANBgkqhkiG9w0BAQsFAAOCAQEAXKQ7QaCBaeJxmU11
|
||||
S1ogDSrZ7Oq8jU+wbPMuQRqgdfPefjrgp7nbzfUW5GrL58wqj+5/FAqltflmSIHl
|
||||
aB4MpqM8pyvjlc/jYxUNFglj2WYxO0IufBrlKI5ePZ4omUjpR4YR4gQpYCuWlZmu
|
||||
P6v/P0WrfgdFTk0LGEA9OwKcTqkPpcI/SjB3rmZcs42yQWvimAF94GtScE09uKlI
|
||||
9QLS2UBmtl5EJRFVrDEC12dyamq8dDRfddyaT4MoQOAq3D9BQ1pHByu3pz/QFaJC
|
||||
1zAi8vbktPY7OMprTOc8pHDL3q8KFP8jJcoEzZ5Jw0vkCrULhLXvtFtjB0djzVxQ
|
||||
C0IKqQ==
|
||||
-----END CERTIFICATE-----
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ente-web-${enteApp}";
|
||||
version = "1.2.4";
|
||||
version = "1.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ente-io";
|
||||
@@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sparseCheckout = [ "web" ];
|
||||
tag = "photos-v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-KCRwQmYmf2DXe3WQS8Rc8h397F0xEth4x36Yz4Ke4Y0=";
|
||||
hash = "sha256-OIpqGFp10ncgM8OBJF+Eer3ESnvcuvWihl5cu5SuOvs=";
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/web";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/web/yarn.lock";
|
||||
hash = "sha256-vm1pQrS4yWvSeTo++964kM+OK0JED8et/dHqLG6lJH0=";
|
||||
hash = "sha256-g6g4VCn6pQWIqhaUctMISHvbQv+o+B+MFSWKT+S7YVU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+12
-29
@@ -4,7 +4,6 @@
|
||||
boost,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
graphviz,
|
||||
igraph,
|
||||
llvmPackages,
|
||||
@@ -12,44 +11,25 @@
|
||||
nlohmann_json,
|
||||
pkg-config,
|
||||
python3Packages,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
quazip,
|
||||
libsForQt5,
|
||||
rapidjson,
|
||||
spdlog,
|
||||
verilator,
|
||||
wrapQtAppsHook,
|
||||
z3,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.4.1";
|
||||
version = "4.5.0";
|
||||
pname = "hal-hardware-analyzer";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emsec";
|
||||
repo = "hal";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8kmYeqsmqR7tY044rZb3KuEAVGv37IObX6k1qjXWG0A=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4HLM/7JCDxWRWusGL4lUa8KXCn9pe3Vkr+lOxHOraNU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "de-vendor-nlohmann-json.patch";
|
||||
# https://github.com/emsec/hal/pull/596
|
||||
url = "https://github.com/emsec/hal/commit/f8337d554d80cfa2588512696696fd4c878dd7a3.patch";
|
||||
hash = "sha256-QjgvcduwbFccC807JFOevlTfO3KiL9T3HSqYmh3sXAQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-vendored-igraph-regression.patch";
|
||||
# https://github.com/emsec/hal/pull/596
|
||||
url = "https://github.com/emsec/hal/commit/fe1fe74719ab4fef873a22e2b28cce0c57d570e0.patch";
|
||||
hash = "sha256-bjbW4pr04pP0TCuSdzPcV8h6LbLWMvdGSf61RL9Ju6E=";
|
||||
})
|
||||
./4.4.1-newer-spdlog-fmt-compat.patch
|
||||
./resynthesis-fix-narrowing-conversion.patch
|
||||
];
|
||||
|
||||
# make sure bundled dependencies don't get in the way - install also otherwise
|
||||
# copies them in full to the output, bloating the package
|
||||
postPatch = ''
|
||||
@@ -64,11 +44,11 @@ stdenv.mkDerivation rec {
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
boost
|
||||
rapidjson
|
||||
igraph
|
||||
@@ -77,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
graphviz
|
||||
verilator
|
||||
z3
|
||||
quazip
|
||||
libsForQt5.quazip
|
||||
]
|
||||
++ (with python3Packages; [
|
||||
python
|
||||
@@ -116,7 +96,10 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/emsec/hal/blob/${src.tag}/CHANGELOG.md";
|
||||
description = "Comprehensive reverse engineering and manipulation framework for gate-level netlists";
|
||||
mainProgram = "hal";
|
||||
homepage = "https://github.com/emsec/hal";
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jsoncons";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielaparker";
|
||||
repo = "jsoncons";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5uI3AWNfsmgmUU9qnkdLeI1eXwuA2WRqeYG4eUoGdp4=";
|
||||
hash = "sha256-aWJTJiEBpWVvNl3l8MB30NakqXVni+VoalV66Sg2g9M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -45,26 +45,27 @@
|
||||
makeBinaryWrapper,
|
||||
autoSignDarwinBinariesHook,
|
||||
cairo,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.42.2";
|
||||
version = "0.43.0";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YDfKYzj5LRx1XaKUpBKo97CMW4jPhVQq0aXx/Qfcdzo=";
|
||||
hash = "sha256-wPLXuZWhaA51J7jGHffh/xnXzWDKCXV2G3Uvrg7G8Kg=";
|
||||
};
|
||||
|
||||
goModules =
|
||||
(buildGo124Module {
|
||||
pname = "kitty-go-modules";
|
||||
inherit src version;
|
||||
vendorHash = "sha256-q5LMyogAqgUFfln7LVkhuXzYSMuYmOif5sj15KkOjB4=";
|
||||
vendorHash = "sha256-bjtzvEQmpsrwD0BArw9N6/HqMB3T5xeqxpx89FV7p2A=";
|
||||
}).goModules;
|
||||
|
||||
buildInputs = [
|
||||
@@ -142,6 +143,12 @@ buildPythonApplication rec {
|
||||
# OSError: master_fd is in error condition
|
||||
./disable-test_ssh_bootstrap_with_different_launchers.patch
|
||||
|
||||
# Fix test failure with fish >= 4.1
|
||||
# See: https://github.com/kovidgoyal/kitty/commit/2f991691f9dca291c52bd619c800d3c2f3eb0d66
|
||||
(fetchpatch {
|
||||
url = "https://github.com/kovidgoyal/kitty/commit/2f991691f9dca291c52bd619c800d3c2f3eb0d66.patch";
|
||||
hash = "sha256-LIQz3e2qgiwpsMd5EbEcvd7ePEEPJvIH4NmNpxydQiU=";
|
||||
})
|
||||
];
|
||||
|
||||
hardeningDisable = [
|
||||
|
||||
@@ -15,16 +15,16 @@ in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mediamtx";
|
||||
# check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluenviron";
|
||||
repo = "mediamtx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-omeaOAhH4adNpA0VXxcZkre3tGZUwHxBrIT85X3D+n0=";
|
||||
hash = "sha256-7RpuDn3pZl/noI0SlP7iL9dMqiPiBPQXOuq2U6FYPnM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YSH8cu7+LIsJ3/o2FYBYlnc6adORJdzhCqQVH0252Ec=";
|
||||
vendorHash = "sha256-ZyHOn+n6RYeSd3stkozwJ1prCY7J9oTIxhJsxm/ORn0=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${hlsJs} internal/servers/hls/hls.min.js
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "3.162.0",
|
||||
"version": "3.163.0",
|
||||
"assets": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.162.0/mirrord_linux_x86_64",
|
||||
"hash": "sha256-CTlnYQ1qiykfhcSys0v2F9m+avHVG2dw9VqhF/Vm8Ao="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.163.0/mirrord_linux_x86_64",
|
||||
"hash": "sha256-xDdeWcPNDiqCM/wcEsuxrnklZPOeSA0nm/6yiShO8jk="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.162.0/mirrord_linux_aarch64",
|
||||
"hash": "sha256-MpDdSB4jytSStz+xNJsv91ng1y4IYDoxioTWb/fq2KE="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.163.0/mirrord_linux_aarch64",
|
||||
"hash": "sha256-qFO1g/Tqk8sFyO10g5r4dYmuczHPb90s/p8aqc7c5+Y="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.162.0/mirrord_mac_universal",
|
||||
"hash": "sha256-DtcvrrwiGEgHfCBRhwvfvL16NfaVPOZ04XSUzr8TOaE="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.163.0/mirrord_mac_universal",
|
||||
"hash": "sha256-zB35GeHBbb6Bsj1uX4K67AxEcDIvIxe8PU/m6lGCc2E="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.162.0/mirrord_mac_universal",
|
||||
"hash": "sha256-DtcvrrwiGEgHfCBRhwvfvL16NfaVPOZ04XSUzr8TOaE="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.163.0/mirrord_mac_universal",
|
||||
"hash": "sha256-zB35GeHBbb6Bsj1uX4K67AxEcDIvIxe8PU/m6lGCc2E="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,6 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# avoid name-clash on case-insensitive filesystems
|
||||
cmakeBuildDir = "build-dir";
|
||||
|
||||
cmakeFlags = [
|
||||
# fix compatibility with CMake (https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html)
|
||||
(lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "4.0")
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvc";
|
||||
version = "1.17.2";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickg";
|
||||
repo = "nvc";
|
||||
tag = "r${version}";
|
||||
hash = "sha256-YNbRgqJSf22YV/4e2Sr9CwKFOQcBVhS6ScDNon3yJUM=";
|
||||
hash = "sha256-PpSoqDCjvROkfXSuOlGxqa9ChdBItu/PQztdsXvVC60=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
let
|
||||
bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32";
|
||||
version = "0.103.0";
|
||||
version = "0.103.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "nwjs-ffmpeg-prebuilt";
|
||||
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
|
||||
src =
|
||||
let
|
||||
hashes = {
|
||||
"x64" = "sha256-A5jzp9f5C5Zj4r/GMrQEv9gYyZOiKjytH07mIoB79V4=";
|
||||
"ia32" = "sha256-A5jzp9f5C5Zj4r/GMrQEv9gYyZOiKjytH07mIoB79V4=";
|
||||
"x64" = "sha256-/PN83C3i2wzxl76YuMXfPK5jsS+D04qMTWTgXoplv+E=";
|
||||
"ia32" = "sha256-/PN83C3i2wzxl76YuMXfPK5jsS+D04qMTWTgXoplv+E=";
|
||||
};
|
||||
in
|
||||
fetchurl {
|
||||
|
||||
@@ -22,12 +22,12 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opencode";
|
||||
version = "0.12.1";
|
||||
version = "0.13.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sst";
|
||||
repo = "opencode";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZpxHLZIc9bBzPJyvDHMjuaTEzZsHwafoBihKxe8Pr3U=";
|
||||
hash = "sha256-GiByJg4NpllA4N4QGSyWsBNqKqKIdxicIjQpc7mHgEs=";
|
||||
};
|
||||
|
||||
tui = buildGoModule {
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
prefix=@dev@
|
||||
includedir=${prefix}/include
|
||||
libdir=@lib@/lib
|
||||
|
||||
Name: openonload
|
||||
Description: OpenOnLoad high performance network stack from Solarflare
|
||||
URL: http://www.openonload.org/
|
||||
Version: @version@
|
||||
Cflags: -isystem${includedir}
|
||||
Libs: -L${libdir} -Wl,-rpath,${libdir} @dash_l@
|
||||
@@ -0,0 +1,158 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
coreutils,
|
||||
libpcap,
|
||||
which,
|
||||
libcap,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
perl,
|
||||
libmnl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openonload";
|
||||
version = "9.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Xilinx-CNS";
|
||||
repo = "onload";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wyvTtOjD6fwuT2OGGhr10F0Q7hXE97mGREhq7Ns14hw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
which
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libcap
|
||||
libpcap
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
export PATH="$PWD/scripts:$PATH"
|
||||
patchShebangs --build \
|
||||
scripts/ \
|
||||
src/driver/
|
||||
substituteInPlace \
|
||||
scripts/mmaketool \
|
||||
scripts/onload \
|
||||
scripts/onload_build \
|
||||
scripts/onload_install \
|
||||
scripts/shell-fns/fns \
|
||||
scripts/shell-fns/mmake-fns \
|
||||
--replace-fail "/bin/pwd" "${coreutils}/bin/pwd"
|
||||
substituteInPlace \
|
||||
scripts/mmaketool \
|
||||
scripts/onload_install \
|
||||
scripts/sfcaffinity_config \
|
||||
--replace-fail "/bin/ls" "${coreutils}/bin/ls"
|
||||
|
||||
# Disable compiler checks that are disabled for Ubuntu: https://github.com/Xilinx-CNS/onload/blob/713eff9c3a105c51fb062527e01e1663c4e61e28/scripts/mmakebuildtree#L337-L344
|
||||
substituteInPlace scripts/mmakebuildtree \
|
||||
--replace-fail 'W_NO_UNUSED_RESULT=
|
||||
' ""
|
||||
export W_NO_UNUSED_RESULT=1 W_NO_IGNORED_ATTRIBUTES=1
|
||||
|
||||
# Patch unit tests to be run during check phase
|
||||
substituteInPlace src/tests/onload/{oof,cplane_unit,cplane_sysunit,onload_remote_monitor/internal_tests}/mmake.mk \
|
||||
--replace-fail '/usr/bin/timeout' '${coreutils}/bin/timeout'
|
||||
|
||||
# Honor NIX_BUILD_CORES in onload_build script
|
||||
substituteInPlace scripts/onload_build --replace-fail 'nproc' 'echo "$NIX_BUILD_CORES"'
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
# This only builds the 64 bit libraries, not the kernel module.
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
./scripts/onload_build --user64
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [
|
||||
perl
|
||||
];
|
||||
checkInputs = [
|
||||
libmnl
|
||||
];
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
# Build all tests in parallel, the script does it in sequence
|
||||
make -C "$(mmaketool --toppath)/build/$(mmaketool --userbuild)" -j$NIX_BUILD_CORES
|
||||
scripts/run_unit_tests.sh
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"lib"
|
||||
"dev"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
i_prefix=$out scripts/onload_install --nobuild --userfiles --headers \
|
||||
--bindir=/bin \
|
||||
--sbindir=/bin \
|
||||
--usrsbindir=/bin \
|
||||
--libexecdir=/libexec \
|
||||
--includedir=/include \
|
||||
--lib64dir=/lib
|
||||
|
||||
mkdir -p $dev/lib
|
||||
mv -v $out/include $dev
|
||||
mv -v $out/lib/*.a $dev/lib
|
||||
mkdir -p $lib
|
||||
mv -v $out/lib $lib
|
||||
|
||||
substituteInPlace $out/bin/onload --replace-fail "/usr/libexec" "$out/libexec"
|
||||
# This tool looks for libonload.so in environment, point default to the actual library
|
||||
wrapProgram $out/bin/onload \
|
||||
--set-default ONLOAD_PRELOAD $out/lib/libonload.so
|
||||
|
||||
# These scripts assume other binaries from this package are in PATH
|
||||
wrapProgram $out/bin/onload_tcpdump \
|
||||
--prefix PATH : $out/bin
|
||||
wrapProgram $out/bin/orm_webserver \
|
||||
--prefix PATH : $out/bin
|
||||
|
||||
cp -v $(find build/gnu_x86_64/tools -type f -executable -print | grep -v '/debug/' | grep -v '.so$') $out/bin
|
||||
# Capture the test apps for validating performance/host set-up
|
||||
cp -v $(find build/gnu_x86_64/tests/ef_vi -type f -executable -print) $out/bin
|
||||
|
||||
mkdir -p $dev/lib/pkgconfig/
|
||||
export dash_l="-lonload_ext"
|
||||
substituteAll ${./openonload.pc.in} $dev/lib/pkgconfig/openonload.pc
|
||||
export dash_l="-l:libonload_ext.a"
|
||||
substituteAll ${./openonload.pc.in} $dev/lib/pkgconfig/openonload-static.pc
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
# The test apps have a build directory in RPATH, which patchelf can't
|
||||
# remove by default because the required library libefcp.so is there.
|
||||
# By removing the library, patchelf is unblocked from removing the build
|
||||
# directory from RPATH. This doesn't break the binary because the library
|
||||
# is also available from other RPATH entries.
|
||||
rm -v build/gnu_x86_64/lib/cplane/*.so*
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "OpenOnLoad high performance network stack from Solarflare";
|
||||
homepage = "https://www.openonload.org";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with maintainers; [ YorikSar ];
|
||||
# ARM64 build fails, see https://github.com/Xilinx-CNS/onload/issues/253
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@@ -1,154 +1,103 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
cacert,
|
||||
dpkg,
|
||||
makeWrapper,
|
||||
mono,
|
||||
gtk-sharp-3_0,
|
||||
fetchurl,
|
||||
gdk-pixbuf,
|
||||
glib,
|
||||
glibc,
|
||||
gtk3,
|
||||
icu,
|
||||
lib,
|
||||
libcap,
|
||||
librsvg,
|
||||
libusb1,
|
||||
zlib,
|
||||
gtk3-x11,
|
||||
callPackage,
|
||||
makeWrapper,
|
||||
openssl,
|
||||
patchelf,
|
||||
stdenv,
|
||||
systemdMinimal,
|
||||
onetbb,
|
||||
writeTextDir,
|
||||
scopes ? [
|
||||
"picocv"
|
||||
"ps2000"
|
||||
"ps2000a"
|
||||
"ps3000"
|
||||
"ps3000a"
|
||||
"ps4000"
|
||||
"ps4000a"
|
||||
"ps5000"
|
||||
"ps5000a"
|
||||
"ps6000"
|
||||
"ps6000a"
|
||||
],
|
||||
}:
|
||||
|
||||
let
|
||||
shared_meta = lib: {
|
||||
homepage = "https://www.picotech.com/downloads/linux";
|
||||
maintainers = with lib.maintainers; [ wirew0rm ];
|
||||
teams = [ lib.teams.lumiguide ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = lib.licenses.unfree;
|
||||
};
|
||||
|
||||
libpicoipp = callPackage (
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
dpkg,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "libpicoipp";
|
||||
inherit (sources.libpicoipp) version;
|
||||
src = fetchurl { inherit (sources.libpicoipp) url sha256; };
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
autoPatchelfHook
|
||||
];
|
||||
buildInputs = [ (lib.getLib stdenv.cc.cc) ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/lib
|
||||
cp -d opt/picoscope/lib/* $out/lib
|
||||
install -Dt $out/usr/share/doc/libpicoipp usr/share/doc/libpicoipp/copyright
|
||||
runHook postInstall
|
||||
'';
|
||||
meta = shared_meta lib // {
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
description = "Library for picotech oscilloscope software";
|
||||
};
|
||||
}
|
||||
) { };
|
||||
|
||||
# If we don't have a platform available, put a dummy version here, so at
|
||||
# least evaluation succeeds.
|
||||
sources =
|
||||
(lib.importJSON ./sources.json).${stdenv.system} or (throw "unsupported system ${stdenv.system}");
|
||||
|
||||
scopePkg =
|
||||
name:
|
||||
{
|
||||
url,
|
||||
version,
|
||||
sha256,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "lib${name}";
|
||||
inherit version;
|
||||
src = fetchurl { inherit url sha256; };
|
||||
# picoscope does a signature check, so we can't patchelf these
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/lib
|
||||
cp -d opt/picoscope/lib/* $out/lib
|
||||
runHook postInstall
|
||||
'';
|
||||
meta =
|
||||
with lib;
|
||||
shared_meta lib
|
||||
// {
|
||||
description = "Library for picotech oscilloscope ${name} series";
|
||||
};
|
||||
};
|
||||
libraryPath = lib.makeLibraryPath libraries;
|
||||
libraries = [
|
||||
gdk-pixbuf
|
||||
glibc
|
||||
gtk3
|
||||
icu
|
||||
libcap
|
||||
librsvg
|
||||
libusb1
|
||||
openssl
|
||||
stdenv.cc.cc.lib
|
||||
systemdMinimal
|
||||
onetbb
|
||||
];
|
||||
|
||||
scopePkgs = lib.mapAttrs scopePkg sources;
|
||||
gdkLoadersCache = "${gdk-pixbuf.out}/${gdk-pixbuf.moduleDir}.cache";
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "picoscope";
|
||||
inherit (sources.picoscope) version;
|
||||
|
||||
src = fetchurl { inherit (sources.picoscope) url sha256; };
|
||||
srcs = lib.mapAttrsToList (_: src: fetchurl { inherit (src) url sha256; }) sources;
|
||||
|
||||
unpackPhase = ''
|
||||
for src in $srcs; do
|
||||
dpkg-deb -x "$src" .
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
makeWrapper
|
||||
];
|
||||
buildInputs = [
|
||||
gtk-sharp-3_0
|
||||
mono
|
||||
glib
|
||||
libusb1
|
||||
zlib
|
||||
];
|
||||
|
||||
scopeLibs = lib.attrVals (map (x: "lib${x}") scopes) scopePkgs;
|
||||
MONO_PATH =
|
||||
"${gtk-sharp-3_0}/lib/mono/gtk-sharp-3.0:"
|
||||
+ (lib.makeLibraryPath (
|
||||
[
|
||||
glib
|
||||
gtk3-x11
|
||||
gtk-sharp-3_0
|
||||
libusb1
|
||||
zlib
|
||||
libpicoipp
|
||||
]
|
||||
++ scopeLibs
|
||||
));
|
||||
buildInputs = libraries;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/
|
||||
cp -dr usr/share $out/share
|
||||
cp -dr opt/picoscope/* $out/
|
||||
makeWrapper "$(command -v mono)" $out/bin/picoscope \
|
||||
--add-flags $out/lib/PicoScope.GTK.exe \
|
||||
--prefix MONO_PATH : "$MONO_PATH" \
|
||||
--prefix LD_LIBRARY_PATH : "$MONO_PATH" \
|
||||
--set LANG C
|
||||
chmod +x $out/lib/PicoScope.GTK
|
||||
|
||||
# Patch all ELF files to prefer Pico libs then our curated runtime
|
||||
# Set dynamic loader to Nix's glibc ld.so
|
||||
for f in $out/lib/{PicoScope.GTK,CrashReporter} $(find $out/lib -type f -name 'lib*.so*'); do
|
||||
${patchelf}/bin/patchelf \
|
||||
--set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 \
|
||||
--set-rpath "$out/lib:${libraryPath}" \
|
||||
"$f" || true
|
||||
done
|
||||
|
||||
# LD_LIBRARY_PATH: not strictly needed for the main exe (rpath already covers it), but required
|
||||
# for dlopened plugins that ignore rpath or use absolute sonames.
|
||||
# GDK_PIXBUF_MODULE_FILE: points gdk-pixbuf to Nix’s loader cache so image loaders (gif/svg/png)
|
||||
# come from our matched version, not the host. This fixes the “g_module_*” symbol errors.
|
||||
# GIO_MODULE_DIR: restricts GIO to GLib’s core modules only (no dconf/gvfs host bleed-through).
|
||||
# SSL_CERT_DIR/SSL_CERT_FILE: Gives OpenSSL a known CA bundle so any HTTPS inside the app works
|
||||
# without querying host paths.
|
||||
makeWrapper $out/lib/PicoScope.GTK $out/bin/picoscope \
|
||||
--set LD_LIBRARY_PATH "$out/lib:${libraryPath}" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "${gdkLoadersCache}" \
|
||||
--set GIO_MODULE_DIR "${glib.out}/lib/gio/modules" \
|
||||
--set SSL_CERT_DIR "${cacert}/etc/ssl/certs" \
|
||||
--set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Stripping causes the following error:
|
||||
# Failure processing application bundle; possible file corruption.
|
||||
# Arithmetic overflow while reading bundle.
|
||||
# A fatal error occurred while processing application bundle
|
||||
dontStrip = true;
|
||||
|
||||
# usage:
|
||||
# services.udev.packages = [ pkgs.picoscope.rules ];
|
||||
# users.groups.pico = {};
|
||||
@@ -157,22 +106,23 @@ stdenv.mkDerivation rec {
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ce9", MODE="664",GROUP="pico"
|
||||
'';
|
||||
|
||||
meta =
|
||||
with lib;
|
||||
shared_meta lib
|
||||
// {
|
||||
description = "Oscilloscope application that works with all PicoScope models";
|
||||
longDescription = ''
|
||||
PicoScope for Linux is a powerful oscilloscope application that works
|
||||
with all PicoScope models. The most important features from PicoScope
|
||||
for Windows are included—scope, spectrum analyzer, advanced triggers,
|
||||
automated measurements, interactive zoom, persistence modes and signal
|
||||
generator control. More features are being added all the time.
|
||||
meta = {
|
||||
homepage = "https://www.picotech.com/downloads/linux";
|
||||
maintainers = with lib.maintainers; [ wirew0rm ] ++ lib.teams.lumiguide.members;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = lib.licenses.unfree;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
description = "Oscilloscope application that works with all PicoScope models";
|
||||
longDescription = ''
|
||||
PicoScope for Linux is a powerful oscilloscope application that works
|
||||
with all PicoScope models. The most important features from PicoScope
|
||||
for Windows are included—scope, spectrum analyzer, advanced triggers,
|
||||
automated measurements, interactive zoom, persistence modes and signal
|
||||
generator control. More features are being added all the time.
|
||||
|
||||
Waveform captures can be saved for off-line analysis, and shared with
|
||||
PicoScope for Linux, PicoScope for macOS and PicoScope for Windows
|
||||
users, or exported in text, CSV and MathWorks MATLAB 4 formats.
|
||||
'';
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
};
|
||||
Waveform captures can be saved for off-line analysis, and shared with
|
||||
PicoScope for Linux, PicoScope for macOS and PicoScope for Windows
|
||||
users, or exported in text, CSV and MathWorks MATLAB 4 formats.
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,69 +1,104 @@
|
||||
{
|
||||
"x86_64-linux": {
|
||||
"libpicocv": {
|
||||
"sha256": "c0c5bec33c2c7fdd0f26b035ed942175f87012e33d6764c3abf1da31b5626037",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.34-beta2r172_amd64.deb",
|
||||
"version": "1.1.34-beta2r172"
|
||||
"sha256": "cff2f4b4460ce58d97a8e4dfde55386cd1836b463b551c17928757493089e475",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.43-1r443_amd64.deb",
|
||||
"version": "1.1.43-1r443"
|
||||
},
|
||||
"libpicohrdl": {
|
||||
"sha256": "920c529b8f49cfff3d1050f45753fa8bfca3f2d8e87c9712447c8f4fc766d60a",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicohrdl/libpicohrdl_2.0.150-1r6187_amd64.deb",
|
||||
"version": "2.0.150-1r6187"
|
||||
},
|
||||
"libpicoipp": {
|
||||
"sha256": "4a84f0af7f4e8cba91fad620eac0cd23c36b2fdda4637904be564286b10ffe1d",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.4.0-4r161_amd64.deb",
|
||||
"version": "1.4.0-4r161"
|
||||
},
|
||||
"libpl1000": {
|
||||
"sha256": "5f81971fb54dc12ddb3654c95b085cc6d750e932b759cdfaae47d8ad1a1bcaaf",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpl1000/libpl1000_2.0.150-1r6187_amd64.deb",
|
||||
"version": "2.0.150-1r6187"
|
||||
},
|
||||
"libplcm3": {
|
||||
"sha256": "82a962c4a1a3049b4c258cf419e8468326f7931bdd3d5288af697271ed39a261",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libplcm3/libplcm3_2.0.150-1r6187_amd64.deb",
|
||||
"version": "2.0.150-1r6187"
|
||||
},
|
||||
"libps2000": {
|
||||
"sha256": "473b065e79a7414c1e2b8c8468c8d2654333ac28f3a8c33b535626b33c60d2ca",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.127-3r5552_amd64.deb",
|
||||
"version": "3.0.127-3r5552"
|
||||
"sha256": "e51a2870450b9921c9b4a2a26d579b9d44047cf015ef0c51d8a19c9f26309983",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.150-3r6187_amd64.deb",
|
||||
"version": "3.0.150-3r6187"
|
||||
},
|
||||
"libps2000a": {
|
||||
"sha256": "8eba0052f9c7ef327710f2fba5aa11bec0c20225b39d77bb7b69cf80055c039c",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.127-5r5552_amd64.deb",
|
||||
"version": "2.1.127-5r5552"
|
||||
"sha256": "19be0c046dbd2725e236f3508af45141a6723ec51b0fcf9a2d7bcd818d53a0b1",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.2.154-5r6530_amd64.deb",
|
||||
"version": "2.2.154-5r6530"
|
||||
},
|
||||
"libps3000": {
|
||||
"sha256": "4e786036b8de0dd0f922aed947f30a53d31bed46b2df5132e8c9480c8a5d93e9",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.127-3r5552_amd64.deb",
|
||||
"version": "4.0.127-3r5552"
|
||||
"sha256": "41bbabe8abc39245612996cbc10053dfe06275b819ab57f9fbf48ef798c18a1a",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.149-3r6187_amd64.deb",
|
||||
"version": "4.0.149-3r6187"
|
||||
},
|
||||
"libps3000a": {
|
||||
"sha256": "d2bb1e5bb151b0953ed30ca5421bb93d05dab898c33cdc89927e943ea991867a",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.127-6r5552_amd64.deb",
|
||||
"version": "2.1.127-6r5552"
|
||||
"sha256": "7a01aedb064c366405e9b5d9af5b1adfc27b6b782bda1d0bd3b3bee3e595a41a",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.2.157-6r7555_amd64.deb",
|
||||
"version": "2.2.157-6r7555"
|
||||
},
|
||||
"libps4000": {
|
||||
"sha256": "4c127e67949835b5ab5c5c8caa55f73c69df354d761aa53d6df99c8f8ac39009",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.127-2r5552_amd64.deb",
|
||||
"version": "2.1.127-2r5552"
|
||||
"sha256": "0d1dff842e806e8f193ee319f88203b8fbb0391d53188e77fa9601bbbf8d2ef6",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.151-2r6187_amd64.deb",
|
||||
"version": "2.1.151-2r6187"
|
||||
},
|
||||
"libps4000a": {
|
||||
"sha256": "26df82bc946e5bb30d599c4c365247bdbaa01e830d4d00630b46a6abcc1eef04",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.127-2r5552_amd64.deb",
|
||||
"version": "2.1.127-2r5552"
|
||||
"sha256": "1d2ab448ed2b92f305410dbea452268071cb096edb88855e60dd627be7faed45",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.2.206-2r7757_amd64.deb",
|
||||
"version": "2.2.206-2r7757"
|
||||
},
|
||||
"libps5000": {
|
||||
"sha256": "106ef17862e98c3621f95c377f271c843664f481f84ef918d9eadd013561cd1b",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.127-3r5552_amd64.deb",
|
||||
"version": "2.1.127-3r5552"
|
||||
"sha256": "e3dbd0534d1acf5c81b5170d276dcb8d0b612c3fd55f5cc212581d51734079cd",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.151-3r6187_amd64.deb",
|
||||
"version": "2.1.151-3r6187"
|
||||
},
|
||||
"libps5000a": {
|
||||
"sha256": "fe9def134ef9df6654485911f14ece7b2ee3d79113aeee7826dd6e36bb5de3b4",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.127-5r5552_amd64.deb",
|
||||
"version": "2.1.127-5r5552"
|
||||
"sha256": "f17ab24eb77df24d4957b848f64815a47227d5eb246c31a111d7eadb43d04cf4",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.2.11-5r5086_amd64.deb",
|
||||
"version": "2.2.11-5r5086"
|
||||
},
|
||||
"libps6000": {
|
||||
"sha256": "9b08c5b7fb2d34b0e2e98f2e0452a59105f612cd445a9e45d3cac14d931d18f2",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.127-6r5552_amd64.deb",
|
||||
"version": "2.1.127-6r5552"
|
||||
"sha256": "01716b5d24f670ca709ca6e0947f3ca1cebb225d3b1037eee692ef049dc1946c",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.151-6r6187_amd64.deb",
|
||||
"version": "2.1.151-6r6187"
|
||||
},
|
||||
"libps6000a": {
|
||||
"sha256": "2a23ccad72b9be83b87d449b6bb8ded23fd29c85ec9f78a45b6d45b38ccf335b",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.127-0r5552_amd64.deb",
|
||||
"version": "1.0.127-0r5552"
|
||||
"sha256": "4ecf9543d388c6b972e78d3b2caa09f9a314e9cb6fd54b24c1e227fcaa3f8f12",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_2.0.156-0r167_amd64.deb",
|
||||
"version": "2.0.156-0r167"
|
||||
},
|
||||
"libpsospa": {
|
||||
"sha256": "adaf1f555b8b6f0950731cd642488bd8707a09291e0f1fb7a79ed22867203eb4",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpsospa/libpsospa_1.0.149-0r5787_amd64.deb",
|
||||
"version": "1.0.149-0r5787"
|
||||
},
|
||||
"libusbdrdaq": {
|
||||
"sha256": "0906429cd32b34aaaaa41ae9f60f6b47ecbdc0b53e49275a3349141f2e79d806",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libu/libusbdrdaq/libusbdrdaq_2.0.150-1r6187_amd64.deb",
|
||||
"version": "2.0.150-1r6187"
|
||||
},
|
||||
"libusbpt104": {
|
||||
"sha256": "a73a175dcced17e59ade58edb760c8e11551300841e5c30c16cbd7c1bfe6c540",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libu/libusbpt104/libusbpt104_2.0.150-1r6187_amd64.deb",
|
||||
"version": "2.0.150-1r6187"
|
||||
},
|
||||
"libusbtc08": {
|
||||
"sha256": "551f3f290d7ee672a4e0533ffebeab746ba552c3a4d0c857edaf7c2494a96659",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libu/libusbtc08/libusbtc08_2.0.150-1r6187_amd64.deb",
|
||||
"version": "2.0.150-1r6187"
|
||||
},
|
||||
"picoscope": {
|
||||
"sha256": "d95f269171da7273b596dae95452789e889f12ef0f15c3baea26dd1b3a8117fc",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.1.17-1r17318_amd64.deb",
|
||||
"version": "7.1.17-1r17318"
|
||||
"sha256": "ab4a0db634b93bd5dcf7cb7fca52591c03130d57451d3ddb3942a0e663c4ffd7",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.2.6.7136_amd64.deb",
|
||||
"version": "7.2.6.7136"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "planify";
|
||||
version = "4.14.0";
|
||||
version = "4.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alainm23";
|
||||
repo = "planify";
|
||||
rev = version;
|
||||
hash = "sha256-QvCESTpHyT6Lu4z7b9DhjFu27PhQwgAo9FY7TMsKy18=";
|
||||
hash = "sha256-4N+2DWOriuxQJX5hfDmGy066ypSn1HkkildBIJjOXhc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -94,10 +94,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
-e '/^proc wait_for_ofs_sync/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \
|
||||
tests/support/util.tcl
|
||||
|
||||
CLIENTS="$NIX_BUILD_CORES"
|
||||
if (( $CLIENTS > 4)); then
|
||||
CLIENTS=4
|
||||
fi
|
||||
|
||||
./runtest \
|
||||
--no-latency \
|
||||
--timeout 2000 \
|
||||
--clients $NIX_BUILD_CORES \
|
||||
--clients "$CLIENTS" \
|
||||
--tags -leaks \
|
||||
--skipunit integration/aof-multi-part \
|
||||
--skipunit integration/failover \
|
||||
|
||||
@@ -7,26 +7,27 @@
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3Packages.python.override {
|
||||
self = python3Packages.python;
|
||||
packageOverrides = self: super: {
|
||||
tomlkit = super.tomlkit.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.12.5";
|
||||
src = fetchPypi {
|
||||
pname = "tomlkit";
|
||||
inherit version;
|
||||
hash = "sha256-7vNPujmDTU1rc8m6fz5NHEF6Tlb4mn6W4JDdDSS4+zw=";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/python-poetry/tomlkit/commit/05d9be1c2b2a95a4eb3a53d999f1483dd7abae5a.patch";
|
||||
hash = "sha256-9pLGxcGHs+XoKrqlh7Q0dyc07XrK7J6u2T7Kvfd0ICc=";
|
||||
excludes = [ ".github/workflows/tests.yml" ];
|
||||
})
|
||||
];
|
||||
});
|
||||
};
|
||||
packageOverrides = self: super: {
|
||||
tomlkit = super.tomlkit.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.12.5";
|
||||
src = fetchPypi {
|
||||
pname = "tomlkit";
|
||||
inherit version;
|
||||
hash = "sha256-7vNPujmDTU1rc8m6fz5NHEF6Tlb4mn6W4JDdDSS4+zw=";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/python-poetry/tomlkit/commit/05d9be1c2b2a95a4eb3a53d999f1483dd7abae5a.patch";
|
||||
hash = "sha256-9pLGxcGHs+XoKrqlh7Q0dyc07XrK7J6u2T7Kvfd0ICc=";
|
||||
excludes = [ ".github/workflows/tests.yml" ];
|
||||
})
|
||||
];
|
||||
});
|
||||
};
|
||||
python = python3Packages.python.override (oa: {
|
||||
self = python3Packages.python;
|
||||
packageOverrides = lib.composeExtensions (oa.packageOverrides or (_: _: { })) packageOverrides;
|
||||
});
|
||||
pythonPackages = python.pkgs;
|
||||
in
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
|
||||
@@ -26,14 +26,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "s7";
|
||||
version = "11.5-unstable-2025-09-18";
|
||||
version = "11.5-unstable-2025-09-27";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "cm-gitlab.stanford.edu";
|
||||
owner = "bil";
|
||||
repo = "s7";
|
||||
rev = "b1a393a89850ba54423a2360247703b2f51a8dc0";
|
||||
hash = "sha256-+nNryibKZhNQPdExDOAjsJngMdsVauBUzDSB1JcWVlo=";
|
||||
rev = "5e05a6ac2c21e19629018edd6e4c434db7ccefa7";
|
||||
hash = "sha256-rMqWQeqBbHAytybX8w9yBAnlzjUJOSKtnpCVF6Nblrg=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "sesh";
|
||||
version = "2.17.1";
|
||||
version = "2.18.1";
|
||||
|
||||
nativeBuildInputs = [
|
||||
go-mockery
|
||||
@@ -16,7 +16,7 @@ buildGoModule rec {
|
||||
owner = "joshmedeski";
|
||||
repo = "sesh";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-olt61AR/Tq8lLh65V0/+GDrWjCi9hrkNbHR9LOX7kY0=";
|
||||
hash = "sha256-f63C2QFU5G/xoy6mLUSzgQv7VOJ4lv06OnGoyZy54rg=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
buildFHSEnv,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
alsa-lib,
|
||||
@@ -15,6 +16,7 @@
|
||||
glib,
|
||||
gtk3,
|
||||
libgbm,
|
||||
libGL,
|
||||
nss,
|
||||
nspr,
|
||||
libdrm,
|
||||
@@ -26,100 +28,93 @@
|
||||
icu,
|
||||
openssl,
|
||||
zlib,
|
||||
bintools,
|
||||
}:
|
||||
let
|
||||
pname = "sidequest";
|
||||
version = "0.10.33";
|
||||
|
||||
desktopItem = makeDesktopItem rec {
|
||||
name = "SideQuest";
|
||||
exec = "SideQuest";
|
||||
desktopName = name;
|
||||
genericName = "VR App Store";
|
||||
categories = [
|
||||
"Settings"
|
||||
"PackageManager"
|
||||
];
|
||||
};
|
||||
version = "0.10.42";
|
||||
|
||||
sidequest = stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/SideQuestVR/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
|
||||
sha256 = "8ac3d97400a8e3ce86902b5bea7b8d042a092acd888d20e5139490a38507f995";
|
||||
hash = "sha256-YZp7OAjUOXepVv5dPhh9Q2HicUKjSOGfhrWyMKy2gME=";
|
||||
};
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "sidequest";
|
||||
exec = "sidequest";
|
||||
icon = "sidequest";
|
||||
desktopName = "SideQuest";
|
||||
genericName = "VR App Store";
|
||||
categories = [
|
||||
"Settings"
|
||||
"PackageManager"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/lib/SideQuest" "$out/bin"
|
||||
tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1
|
||||
runHook preInstall
|
||||
|
||||
ln -s "$out/lib/SideQuest/sidequest" "$out/bin"
|
||||
mkdir -p "$out/libexec" "$out/bin"
|
||||
cp --recursive . "$out/libexec/sidequest"
|
||||
ln -s "$out/libexec/sidequest/sidequest" "$out/bin/sidequest"
|
||||
for size in 16 24 32 48 64 128 256 512 1024; do
|
||||
install -D --mode=0644 resources/app.asar.unpacked/build/icons/''${size}x''${size}.png $out/share/icons/hicolor/''${size}x''${size}/apps/sidequest.png
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup =
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
libgbm
|
||||
nss
|
||||
nspr
|
||||
libdrm
|
||||
xorg.libX11
|
||||
xorg.libxcb
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXrandr
|
||||
xorg.libxshmfence
|
||||
libxkbcommon
|
||||
xorg.libxkbfile
|
||||
pango
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
systemd
|
||||
];
|
||||
in
|
||||
''
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${libPath}:$out/lib/SideQuest" \
|
||||
"$out/lib/SideQuest/sidequest"
|
||||
'';
|
||||
postFixup = ''
|
||||
patchelf \
|
||||
--set-interpreter "${bintools.dynamicLinker}" \
|
||||
--set-rpath "${
|
||||
lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
libgbm
|
||||
libGL
|
||||
nss
|
||||
nspr
|
||||
libdrm
|
||||
xorg.libX11
|
||||
xorg.libxcb
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXrandr
|
||||
xorg.libxshmfence
|
||||
libxkbcommon
|
||||
xorg.libxkbfile
|
||||
pango
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
systemd
|
||||
]
|
||||
}:$out/libexec/sidequest" \
|
||||
--add-needed libGL.so.1 \
|
||||
"$out/libexec/sidequest/sidequest"
|
||||
'';
|
||||
};
|
||||
in
|
||||
buildFHSEnv {
|
||||
pname = "SideQuest";
|
||||
inherit version;
|
||||
|
||||
passthru = {
|
||||
inherit pname version;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300";
|
||||
homepage = "https://github.com/SideQuestVR/SideQuest";
|
||||
downloadPage = "https://github.com/SideQuestVR/SideQuest/releases";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
joepie91
|
||||
rvolosatovs
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "SideQuest";
|
||||
};
|
||||
};
|
||||
inherit pname version;
|
||||
|
||||
targetPkgs = pkgs: [
|
||||
sidequest
|
||||
@@ -132,9 +127,22 @@ buildFHSEnv {
|
||||
];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p "$out/share/applications"
|
||||
ln -s ${desktopItem}/share/applications/* "$out/share/applications"
|
||||
ln -s ${sidequest}/share "$out/share"
|
||||
'';
|
||||
|
||||
runScript = "sidequest";
|
||||
|
||||
meta = {
|
||||
description = "Open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300";
|
||||
homepage = "https://github.com/SideQuestVR/SideQuest";
|
||||
downloadPage = "https://github.com/SideQuestVR/SideQuest/releases";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
joepie91
|
||||
rvolosatovs
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "SideQuest";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule (final: {
|
||||
pname = "sops";
|
||||
version = "3.10.2";
|
||||
version = "3.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsops";
|
||||
repo = final.pname;
|
||||
tag = "v${final.version}";
|
||||
hash = "sha256-IdQnxVBMAQpSAYB2S3D3lSULelFMBpjiBGOxeTgC10I=";
|
||||
hash = "sha256-AAnrZvNkBgliHdk1lAoFrJdISNWteFdBUorRycKsptU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7aHUIERVSxv3YGAMteGbqkAZQXXDVziV0rhUhjwch3U=";
|
||||
vendorHash = "sha256-9bB3MbE03KEaxUp0VvCnNVKUY4zSUoam8h2cDlAz7RY=";
|
||||
|
||||
subPackages = [ "cmd/sops" ];
|
||||
|
||||
|
||||
Generated
+47
-43
@@ -1,61 +1,65 @@
|
||||
# generated by zon2nix (https://github.com/nix-community/zon2nix)
|
||||
|
||||
{
|
||||
linkFarm,
|
||||
fetchzip,
|
||||
fetchgit,
|
||||
}:
|
||||
|
||||
linkFarm "zig-packages" [
|
||||
{
|
||||
name = "1220b9ce6dc0e1fbcd9e7b406ab164344f81774351495f860a90729187c3c058ef4f";
|
||||
path = fetchgit {
|
||||
url = "https://github.com/kristoff-it/zig-lsp-kit";
|
||||
rev = "b4bf61d7fbf9cf7cfdb6f01b211947d2de3e42fd";
|
||||
hash = "sha256-6mlnPTLBXZQwWXstV+h1PAKtMq8RGcJM2dRJ8NqqqtU=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "1220102cb2c669d82184fb1dc5380193d37d68b54e8d75b76b2d155b9af7d7e2e76d";
|
||||
path = fetchzip {
|
||||
url = "https://github.com/ziglibs/diffz/archive/ef45c00d655e5e40faf35afbbde81a1fa5ed7ffb.tar.gz";
|
||||
hash = "sha256-5/3W0Xt9RjsvCb8Q4cdaM8dkJP7CdFro14JJLCuqASo=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147";
|
||||
path = fetchgit {
|
||||
url = "https://github.com/ziglibs/known-folders.git";
|
||||
rev = "0ad514dcfb7525e32ae349b9acc0a53976f3a9fa";
|
||||
hash = "sha256-X+XkFj56MkYxxN9LUisjnkfCxUfnbkzBWHy9pwg5M+g=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "122014e78d7c69d93595993b3231f3141368e22634b332b0b91a2fb73a8570f147a5";
|
||||
path = fetchgit {
|
||||
url = "https://github.com/kristoff-it/scripty";
|
||||
rev = "df8c11380f9e9bec34809f2242fb116d27cf39d6";
|
||||
hash = "sha256-qVm8pIfT1mHL1zanqYdFm/6AVH8poXKqLtz4+2j+F/A=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "1220f2d8402bb7bbc4786b9c0aad73910929ea209cbd3b063842371d68abfed33c1e";
|
||||
path = fetchgit {
|
||||
url = "https://github.com/kristoff-it/zig-afl-kit";
|
||||
rev = "f003bfe714f2964c90939fdc940d5993190a66ec";
|
||||
hash = "sha256-tJ6Ln1SY4WjFZXUWQmgggsUfkd59QgmIpgdInMuv4PI=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "1220010a1edd8631b2644476517024992f8e57f453bdb68668720bb590d168faf7c8";
|
||||
name = "AFLplusplus-4.21.0-aA1y4UtxAABpnSIF7ARSYDMRyqNcI-2Rwa5UeSsuw70v";
|
||||
path = fetchgit {
|
||||
url = "https://github.com/allyourcodebase/AFLplusplus";
|
||||
rev = "032984eabf5a35af386a3d0e542df7686da339c1";
|
||||
hash = "sha256-KB3QnKAQQ+5CKvJVrhMveMGpF3NTrlwpIyLHVIB96hs=";
|
||||
rev = "a52f1376e2d49720c39e4abf4aa4944afbf82191";
|
||||
hash = "sha256-AlkULC20/RTGMTPk2xWcdXCQlWn3sY3VrD0NRRoTZqY=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "12200966011c3dd6979d6aa88fe23061fdc6da1f584a6fb1f7682053a0b01e409dbc";
|
||||
name = "N-V-__8AAKE4uAAJZgEcPdaXnWqoj-IwYf3G2h9YSm-x92gg";
|
||||
path = fetchzip {
|
||||
url = "https://github.com/AFLplusplus/AFLplusplus/archive/v4.21c.tar.gz";
|
||||
hash = "sha256-DKwPRxSO+JEJYWLldnfrAYqzwqukNzrbo4R5FzJqzzg=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "afl_kit-0.1.0-NdJ3cvscAACLEvjZTB017IAks_Uq5ux1qpA-klDe384Y";
|
||||
path = fetchgit {
|
||||
url = "https://github.com/kristoff-it/zig-afl-kit";
|
||||
rev = "8ef04d1db48650345dca68da1e1b8f2615125c40";
|
||||
hash = "sha256-J0xbmsokjlhOav9KLlH2y4qiSgBit4nS+x6Q10L2OSA=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "known_folders-0.0.0-Fy-PJtTTAADUOhGKM0sxzG4eMkNQxRvx9e5dfHVyaeA3";
|
||||
path = fetchgit {
|
||||
url = "https://github.com/ziglibs/known-folders";
|
||||
rev = "ab5cf5feb936fa3b72c95d3ad0c0c67791937ba1";
|
||||
hash = "sha256-Pdn/nUclhHBB1COTzNNR5ysE13h6uLOFJjuFrasv/2I=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "lsp_kit-0.1.0-bi_PLzAyCgClDh8_M0U9Q50ysdsQBuRuBTZfwg6rZPd6";
|
||||
path = fetchgit {
|
||||
url = "https://github.com/zigtools/lsp-kit";
|
||||
rev = "fe98e895ca3bd1b39965ab30f0f252f7b7e83ee6";
|
||||
hash = "sha256-1HW8kWhfpbBihzE6PiXXxGN03qIW20KCsBoyfSSWgNU=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "scripty-0.1.0-LKK5O7v4AADWWXuFcTJky_5sY12tmw3kRi3k2wkpfxAX";
|
||||
path = fetchgit {
|
||||
url = "https://github.com/kristoff-it/scripty";
|
||||
rev = "50dbab8945440089384f26ec165d870c29555247";
|
||||
hash = "sha256-r3L4iLpJUH93S0tH6d6w3pHcLzAaKZPSFBAgpnTMdeI=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "tracy-0.0.0-4Xw-1pwwAABTfMgoDP1unCbZDZhJEfict7XCBGF6IdIn";
|
||||
path = fetchgit {
|
||||
url = "https://github.com/kristoff-it/tracy";
|
||||
rev = "67d2d89e351048c76fc6d161e0ac09d8a831dc60";
|
||||
hash = "sha256-BKo1bhua/u+f5Z//ailur5aSHZWp3GiC0iwmVLrGZkE=";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
@@ -3,33 +3,36 @@
|
||||
callPackage,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
zig_0_13,
|
||||
zig_0_15,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
zig = zig_0_15;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "superhtml";
|
||||
version = "0.5.3";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kristoff-it";
|
||||
repo = "superhtml";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rO7HS07nSqwOq6345q/SOL2imoD0cKV16QJcVVr6mHw=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-EWxnozmYTvkX7mn+pVel083Cte1uzvHaes1c7iXPMUg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
zig_0_13.hook
|
||||
zig.hook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "HTML Language Server and Templating Language Library";
|
||||
homepage = "https://github.com/kristoff-it/superhtml";
|
||||
license = licenses.mit;
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "superhtml";
|
||||
maintainers = with maintainers; [ petertriho ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with lib.maintainers; [ petertriho ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
lz4,
|
||||
libxkbcommon,
|
||||
installShellFiles,
|
||||
makeWrapper,
|
||||
procps,
|
||||
scdoc,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
@@ -13,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "swww";
|
||||
version = "0.10.3";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LGFae";
|
||||
repo = "swww";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GXqXZn29r7ktL01KBzlPZ+9b1fdnAPF8qhsQxhiqAsQ=";
|
||||
hash = "sha256-X2ptpXRo6ps5RxDe5RS7qfTaHWqBbBNw/aSdC2tzUG8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jCjeHeHML8gHtvFcnHbiGL5fZ3LhABhXrcUTQriUDc0=";
|
||||
cargoHash = "sha256-5KZWsdo37NbFFkK8XFc0XI9iwBkpV8KsOaOc0y287Io=";
|
||||
|
||||
buildInputs = [
|
||||
lz4
|
||||
@@ -36,6 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
scdoc
|
||||
];
|
||||
|
||||
@@ -52,6 +55,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--zsh completions/_swww
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
for program in $out/bin/*; do
|
||||
wrapProgram $program \
|
||||
--prefix PATH : "${lib.makeBinPath [ procps ]}"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Efficient animated wallpaper daemon for wayland, controlled at runtime";
|
||||
homepage = "https://github.com/LGFae/swww";
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libpcap,
|
||||
which,
|
||||
libcap,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
openonload,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tcpdirect";
|
||||
version = "9.0.2.45";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Xilinx-CNS";
|
||||
repo = "tcpdirect";
|
||||
rev = "tcpdirect-${version}";
|
||||
hash = "sha256-7VQwep078hXdXE4pqGUe2CLqnPdDuWupcyuC+NCM5Ms=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
which
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libcap
|
||||
libpcap
|
||||
openonload
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
makeFlags = [
|
||||
"CITOOLS_LIB=${lib.getDev openonload}/lib/libcitools1.a"
|
||||
"CIUL_LIB=${lib.getDev openonload}/lib/libciul1.a"
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"lib"
|
||||
"dev"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $lib/lib $dev/lib $dev/include
|
||||
|
||||
cp -dv \
|
||||
build/bin/zf_internal/shared/* \
|
||||
build/bin/zf_apps/shared/* \
|
||||
build/bin/zf_stackdump \
|
||||
build/bin/trade_sim/shared/* \
|
||||
$out/bin
|
||||
|
||||
cp -dv build/lib/libonload_zf.so* $lib/lib
|
||||
cp -dv build/lib/libonload_zf_static.a $dev/lib
|
||||
cp -rdv src/include/zf $dev/include
|
||||
|
||||
mkdir -p $dev/lib/pkgconfig
|
||||
export dash_l="-lonload_zf"
|
||||
substituteAll ${./tcpdirect.pc.in} $dev/lib/pkgconfig/tcpdirect.pc
|
||||
export dash_l="-l:libonload_zf_static.a"
|
||||
substituteAll ${./tcpdirect.pc.in} $dev/lib/pkgconfig/tcpdirect-static.pc
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# zf_init from libonload_zf dynamically loads libefcp.so from openonload
|
||||
patchelf --add-rpath ${openonload.lib}/lib $lib/lib/libonload_zf.so
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ultra low latency kernel bypass TCP and UDP implementation for AMD Solarflare network adapters";
|
||||
homepage = "https://www.openonload.org";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with maintainers; [ YorikSar ];
|
||||
# ARM64 build fails, see https://github.com/Xilinx-CNS/onload/issues/253
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
prefix=@dev@
|
||||
includedir=${prefix}/include
|
||||
libdir=@lib@/lib
|
||||
|
||||
Name: tcpdirect
|
||||
Description: Low latency, zero-copy TCP and UDP stack for SolarFlare NICs
|
||||
URL: http://www.xilinx.com
|
||||
Version: @version@
|
||||
Cflags: -isystem${includedir}
|
||||
Libs: -L${libdir} -Wl,-rpath,${libdir} @dash_l@
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
perl,
|
||||
flex,
|
||||
bison,
|
||||
@@ -32,6 +33,14 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-S+cDnKOTPjLw+sNmWL3+Ay6+UM8poMadkyPSGd3hgnc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "clang-V3hash-overload-fix.patch";
|
||||
url = "https://github.com/verilator/verilator/commit/2aa260a03b67d3fe86bc64b8a59183f8dc21e117.patch";
|
||||
hash = "sha256-waUsctWiAMG3lCpQi+VUUZ7qMw/kJGu/wNXPHZGuAoU=";
|
||||
})
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
buildInputs = [
|
||||
perl
|
||||
|
||||
@@ -37,6 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
# the mv commands are workaround for https://github.com/pnpm/pnpm/issues/8307
|
||||
mv packages packages.dontpruneme
|
||||
CI=true pnpm prune --prod
|
||||
find packages.dontpruneme/**/node_modules -xtype l -delete
|
||||
mv packages.dontpruneme packages
|
||||
|
||||
find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} +
|
||||
|
||||
# https://github.com/pnpm/pnpm/issues/3645
|
||||
|
||||
@@ -303,6 +303,19 @@ let
|
||||
})
|
||||
];
|
||||
}
|
||||
{
|
||||
cases = [
|
||||
(isEq "9.0")
|
||||
(isEq "3.16")
|
||||
];
|
||||
out = [
|
||||
# Support for Coq 9.0.1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/AbsInt/CompCert/commit/a962ef9da0fb4ef2a4314ccedd111eb248e42cf2.patch";
|
||||
hash = "sha256-ipYqcfcgz3cKyI1NGSgfOgiVdV1WUwlv6DVB1S1hJvw=";
|
||||
})
|
||||
];
|
||||
}
|
||||
]
|
||||
[ ];
|
||||
});
|
||||
|
||||
@@ -728,7 +728,6 @@ unsupported-platforms:
|
||||
iwlib: [ platforms.darwin ]
|
||||
Jazzkell: [ platforms.darwin ] # depends on Euterpea
|
||||
jsaddle-webkit2gtk: [ platforms.darwin ]
|
||||
kmonad: [ platforms.darwin ]
|
||||
Kulitta: [ platforms.darwin ] # depends on Euterpea
|
||||
LambdaHack: [ platforms.darwin ]
|
||||
libmodbus: [ platforms.darwin ]
|
||||
|
||||
@@ -400808,7 +400808,6 @@ self: {
|
||||
testToolDepends = [ hspec-discover ];
|
||||
description = "Advanced keyboard remapping utility";
|
||||
license = lib.licenses.mit;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
mainProgram = "kmonad";
|
||||
maintainers = [ lib.maintainers.slotThe ];
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
ocaml,
|
||||
version ? if lib.versionAtLeast ocaml.version "5.1" then "2.7.0" else "0.9",
|
||||
buildDunePackage,
|
||||
cstruct,
|
||||
dune-configurator,
|
||||
@@ -9,15 +11,28 @@
|
||||
mdx,
|
||||
}:
|
||||
|
||||
let
|
||||
param =
|
||||
{
|
||||
"0.9" = {
|
||||
minimalOCamlVersion = "4.12";
|
||||
hash = "sha256-eXWIxfL9UsKKf4sanBjKfr6Od4fPDctVnkU+wjIXW0M=";
|
||||
};
|
||||
"2.7.0" = {
|
||||
minimalOCamlVersion = "5.1.0";
|
||||
hash = "sha256-mePi6/TXtxgtLYLyHRAdnRcgeldCVgUaPY+MZXSzC6U=";
|
||||
};
|
||||
}
|
||||
.${version};
|
||||
in
|
||||
buildDunePackage rec {
|
||||
pname = "uring";
|
||||
version = "0.9";
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
inherit version;
|
||||
inherit (param) minimalOCamlVersion;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-multicore/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
|
||||
hash = "sha256-eXWIxfL9UsKKf4sanBjKfr6Od4fPDctVnkU+wjIXW0M=";
|
||||
inherit (param) hash;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "6.8.6";
|
||||
version = "6.13.1";
|
||||
|
||||
# The PHAR file is only required to get the `composer.lock` file
|
||||
psalm-phar = fetchurl {
|
||||
url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
|
||||
hash = "sha256-nPvA/pxBMJe4Ux4NmFOdrEmKqRqmwz8gFlCgsB0GbPI=";
|
||||
hash = "sha256-bOxm5LYiQDCY0hU998Wnnp2+x44sidfCf/OqlQ+1gvA=";
|
||||
};
|
||||
in
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
@@ -24,14 +24,14 @@ php.buildComposerProject2 (finalAttrs: {
|
||||
owner = "vimeo";
|
||||
repo = "psalm";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-CewFeIUG+/5QCRpoPSOv1gqwBL9voBf4zgIzdnhk2t8=";
|
||||
hash = "sha256-QsANvg/QXJucjxwM6IF20mZu4DPw/RcBJV6+5tJkZB0=";
|
||||
};
|
||||
|
||||
composerLock = runCommand "composer.lock" { } ''
|
||||
${lib.getExe php} -r '$phar = new Phar("${psalm-phar}"); $phar->extractTo(".", "composer.lock");'
|
||||
cp composer.lock $out
|
||||
'';
|
||||
vendorHash = "sha256-QObqXzazypumDnFtfNiFSZdpZ7PbsBZZBUsS3fseZok=";
|
||||
vendorHash = "sha256-18FAMuOO6rWAQEIJOLGxj/Avr5ZQRuI4ao2RL2nJlYc=";
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
@@ -29,6 +29,6 @@ buildPecl {
|
||||
description = "Simple & straight-to-the-point PHP profiling extension with its built-in web UI";
|
||||
homepage = "https://github.com/NoiseByNorthwest/php-spx";
|
||||
license = lib.licenses.php301;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ piotrkwiecinski ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -21,8 +21,6 @@ buildPythonPackage rec {
|
||||
hash = "sha256-5TRJfI4irg2/ZxpfgzShXE08HWU2aWLR8zGbrZKpwbc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "colorlog" ];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -38,6 +36,7 @@ buildPythonPackage rec {
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/planbnet/livisi/releases/tag/${src.tag}";
|
||||
description = "Connection library for the abandoned Livisi Smart Home system";
|
||||
homepage = "https://github.com/planbnet/livisi";
|
||||
license = lib.licenses.asl20;
|
||||
|
||||
@@ -68,7 +68,7 @@ buildPythonPackage {
|
||||
meta = {
|
||||
description = "Python module for building Noto fonts";
|
||||
homepage = "https://github.com/notofonts/notobuilder";
|
||||
license = lib.licenses.unfree;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ jopejoe1 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pybids";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bids-standard";
|
||||
repo = "pybids";
|
||||
tag = version;
|
||||
hash = "sha256-x1OlqfuRZvfWwOt+WTR8lAtOPWcrsymQyXPfiEj4lk4=";
|
||||
hash = "sha256-e1uD9rNs50GP8myNY+5VbcdRKlLykSTd9ESKrhSW+r8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -45,7 +45,6 @@ in
|
||||
maintainers = with maintainers; [
|
||||
ambroisie
|
||||
techknowlogick
|
||||
adamcstephens
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
}:
|
||||
mkKdeDerivation rec {
|
||||
pname = "plasma-wayland-protocols";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-${version}.tar.xz";
|
||||
hash = "sha256-JWdHJnGtXZifiLUbrvndWTU6Xnw/LtfmuYl1XLkAQjM=";
|
||||
hash = "sha256-RWef56Y8QU8sgXk6YlKPrmzO5YS2llcZ1/n8bdSLqEY=";
|
||||
};
|
||||
|
||||
meta.license = with lib.licenses; [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
replaceVars,
|
||||
autoreconfHook,
|
||||
makeWrapper,
|
||||
glibc,
|
||||
@@ -72,8 +73,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-JN4GVx5rBfNBLaMpLcKgyd+CyNDafz85BXUcfg5kDXQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(replaceVars ./fix-ldb-modules-path.patch {
|
||||
inherit ldb;
|
||||
out = null; # will be replaced in postPatch https://github.com/NixOS/nixpkgs/pull/446589#discussion_r2384899857
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./sbus_generate.sh.in
|
||||
|
||||
substituteInPlace src/confdb/confdb.c \
|
||||
--replace-fail "@out@" "${placeholder "out"}"
|
||||
'';
|
||||
|
||||
# Something is looking for <libxml/foo.h> instead of <libxml2/libxml/foo.h>
|
||||
@@ -101,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--with-xml-catalog-path=''${SGML_CATALOG_FILES%%:*}
|
||||
--with-ldb-lib-dir=$out/modules/ldb
|
||||
--with-nscd=${glibc.bin}/sbin/nscd
|
||||
--with-sssd-user=root
|
||||
)
|
||||
''
|
||||
+ lib.optionalString withSudo ''
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c
|
||||
index 8c19142..7865684 100644
|
||||
--- a/src/confdb/confdb.c
|
||||
+++ b/src/confdb/confdb.c
|
||||
@@ -775,6 +775,8 @@ int confdb_init(TALLOC_CTX *mem_ctx,
|
||||
int ret = EOK;
|
||||
mode_t old_umask;
|
||||
|
||||
+ setenv("LDB_MODULES_PATH", "@out@/modules/ldb:@ldb@/modules/ldb", 1);
|
||||
+
|
||||
if (cdb_ctx == NULL) {
|
||||
DEBUG(SSSDBG_FATAL_FAILURE, "Bad argument\n");
|
||||
return EFAULT;
|
||||
@@ -5,7 +5,6 @@
|
||||
nixosTests,
|
||||
cacert,
|
||||
caBundle ? "${cacert}/etc/ssl/certs/ca-bundle.crt",
|
||||
nextcloud30Packages,
|
||||
nextcloud31Packages,
|
||||
}:
|
||||
|
||||
@@ -58,12 +57,6 @@ let
|
||||
};
|
||||
in
|
||||
{
|
||||
nextcloud30 = generic {
|
||||
version = "30.0.16";
|
||||
hash = "sha256-YjbUrna8REq7U0lLN4AxWheqxUrxtC4+/gzGvRnf8zA=";
|
||||
packages = nextcloud30Packages;
|
||||
};
|
||||
|
||||
nextcloud31 = generic {
|
||||
version = "31.0.9";
|
||||
hash = "sha256-qrhBTMY1gco6jfRy9F60ErK4Q6lms4cCdUIbrQ1nD2g=";
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -12,8 +12,7 @@
|
||||
}:
|
||||
let
|
||||
latestVersionForNc = {
|
||||
"31" = latestVersionForNc."30";
|
||||
"30" = {
|
||||
"31" = {
|
||||
version = "7.6.1";
|
||||
appHash = "sha256-uRZBTwhdNr3OUw021WvTnEBcLd49EQbVr9bvU97zblc=";
|
||||
srcHash = "sha256-eKvdv3ng4YwPmFu7eapYvD8A2cliryAhPf6NDBJjX6c=";
|
||||
|
||||
@@ -21,11 +21,6 @@ let
|
||||
appHash = "sha256-G7SDE72tszifozfT3vNxHW6WmMqQKhrSayQVANQaMbs=";
|
||||
modelHash = "sha256-dB4ot/65xisR700kUXg3+Y+SkrpQO4mWrFfp+En0QEE=";
|
||||
};
|
||||
"30" = {
|
||||
version = "8.2.1";
|
||||
appHash = "sha256-xSJbfL5HI1bo5KYvk/ssEjSUsWF1hFQkl5MOm/kXYDE=";
|
||||
modelHash = "sha256-O1gh3d0MGQOHUbrIyX3f+R7lGJ7+i8tTmrnfKlczrsk=";
|
||||
};
|
||||
};
|
||||
currentVersionInfo =
|
||||
latestVersionForNc.${ncVersion}
|
||||
|
||||
@@ -583,6 +583,7 @@ mapAliases {
|
||||
catch = throw "catch has been removed. Please upgrade to catch2 or catch2_3"; # Added 2025-08-21
|
||||
catcli = throw "catcli has been superseded by gocatcli"; # Added 2025-04-19
|
||||
canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17
|
||||
cardboard = throw "cardboard has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
|
||||
cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09
|
||||
cargo-espflash = espflash; # Added 2024-02-09
|
||||
cargo-kcov = throw "'cargo-kcov' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
|
||||
@@ -1781,6 +1782,18 @@ mapAliases {
|
||||
nettools = net-tools; # Added 2025-06-11
|
||||
newt-go = fosrl-newt; # Added 2025-06-24
|
||||
notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25
|
||||
nextcloud30 = throw ''
|
||||
Nextcloud v30 has been removed from `nixpkgs` as the support for is dropped
|
||||
by upstream in 2025-09. Please upgrade to at least Nextcloud v31 by declaring
|
||||
|
||||
services.nextcloud.package = pkgs.nextcloud31;
|
||||
|
||||
in your NixOS config.
|
||||
|
||||
WARNING: if you were on Nextcloud 29 you have to upgrade to Nextcloud 30
|
||||
first on 25.05 because Nextcloud doesn't support upgrades across multiple major versions!
|
||||
''; # Added 2025-09-25
|
||||
nextcloud30Packages = throw "Nextcloud 30 is EOL!"; # Added 2025-09-25
|
||||
nextcloud29 = throw ''
|
||||
Nextcloud v29 has been removed from `nixpkgs` as the support for is dropped
|
||||
by upstream in 2025-04. Please upgrade to at least Nextcloud v30 by declaring
|
||||
|
||||
@@ -3047,10 +3047,6 @@ with pkgs;
|
||||
|
||||
haste-client = callPackage ../tools/misc/haste-client { };
|
||||
|
||||
hal-hardware-analyzer =
|
||||
libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer
|
||||
{ };
|
||||
|
||||
halide = callPackage ../development/compilers/halide {
|
||||
llvmPackages = llvmPackages_19;
|
||||
};
|
||||
@@ -3595,11 +3591,9 @@ with pkgs;
|
||||
libnma-gtk4 = libnma.override { withGtk4 = true; };
|
||||
|
||||
inherit (callPackages ../servers/nextcloud { })
|
||||
nextcloud30
|
||||
nextcloud31
|
||||
;
|
||||
|
||||
nextcloud30Packages = callPackage ../servers/nextcloud/packages { ncVersion = "30"; };
|
||||
nextcloud31Packages = callPackage ../servers/nextcloud/packages { ncVersion = "31"; };
|
||||
|
||||
nextcloud-notify_push = callPackage ../servers/nextcloud/notify_push.nix { };
|
||||
@@ -4587,7 +4581,7 @@ with pkgs;
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
|
||||
};
|
||||
|
||||
inherit (coqPackages_8_20) compcert;
|
||||
inherit (coqPackages_9_0) compcert;
|
||||
|
||||
computecpp = wrapCCWith rec {
|
||||
cc = computecpp-unwrapped;
|
||||
|
||||
Reference in New Issue
Block a user