Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
90e2c2cda5
|
|
@ -488,7 +488,7 @@ writeTextFile {
|
|||
echo "hi"
|
||||
'';
|
||||
executable = true;
|
||||
destination = "bin/my-script"
|
||||
destination = "bin/my-script";
|
||||
}
|
||||
```
|
||||
|
||||
|
|
@ -576,7 +576,7 @@ writeTextFile {
|
|||
echo "hi"
|
||||
'';
|
||||
executable = true;
|
||||
destination = "bin/my-script"
|
||||
destination = "bin/my-script";
|
||||
}
|
||||
```
|
||||
|
||||
|
|
|
|||
|
|
@ -8642,6 +8642,12 @@
|
|||
github = "j0xaf";
|
||||
githubId = 932697;
|
||||
};
|
||||
j1nxie = {
|
||||
email = "rylie@rylie.moe";
|
||||
name = "Nguyen Pham Quoc An";
|
||||
github = "j1nxie";
|
||||
githubId = 52886388;
|
||||
};
|
||||
j4m3s = {
|
||||
name = "James Landrein";
|
||||
email = "github@j4m3s.eu";
|
||||
|
|
@ -18782,6 +18788,16 @@
|
|||
githubId = 39732259;
|
||||
name = "Justus K";
|
||||
};
|
||||
stv0g = {
|
||||
name = "Steffen Vogel";
|
||||
email = "post@steffenvogel.de";
|
||||
matrix = "@stv0ge:matrix.org";
|
||||
github = "stv0g";
|
||||
githubId = 285829;
|
||||
keys = [{
|
||||
fingerprint = "09BE 3BAE 8D55 D4CD 8579 285A 9675 EAC3 4897 E6E2";
|
||||
}];
|
||||
};
|
||||
SubhrajyotiSen = {
|
||||
email = "subhrajyoti12@gmail.com";
|
||||
github = "SubhrajyotiSen";
|
||||
|
|
|
|||
|
|
@ -333,6 +333,9 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
|||
- The `erlang_node_short_name`, `erlang_node_name`, `port` and `options` configuration parameters are gone, and have been replaced with an `environment` parameter.
|
||||
Use the appropriate [environment variables](https://hexdocs.pm/livebook/readme.html#environment-variables) inside `environment` to configure the service instead.
|
||||
|
||||
- The `crystal` package has been updated to 1.11.x, which has some breaking changes.
|
||||
Refer to crystal's changelog for more information. ([v1.10](https://github.com/crystal-lang/crystal/blob/master/CHANGELOG.md#1100-2023-10-09), [v1.11](https://github.com/crystal-lang/crystal/blob/master/CHANGELOG.md#1110-2024-01-08))
|
||||
|
||||
## Other Notable Changes {#sec-release-24.05-notable-changes}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
|
|
|||
|
|
@ -145,6 +145,8 @@ in
|
|||
# This installCredentials script is written so that it's as easy as
|
||||
# possible for a user to audit before confirming the `sudo`
|
||||
installCredentials = hostPkgs.writeShellScript "install-credentials" ''
|
||||
set -euo pipefail
|
||||
|
||||
KEYS="''${1}"
|
||||
INSTALL=${hostPkgs.coreutils}/bin/install
|
||||
"''${INSTALL}" -g nixbld -m 600 "''${KEYS}/${user}_${keyType}" ${privateKey}
|
||||
|
|
@ -154,6 +156,9 @@ in
|
|||
hostPkgs = config.virtualisation.host.pkgs;
|
||||
|
||||
script = hostPkgs.writeShellScriptBin "create-builder" (
|
||||
''
|
||||
set -euo pipefail
|
||||
'' +
|
||||
# When running as non-interactively as part of a DarwinConfiguration the working directory
|
||||
# must be set to a writeable directory.
|
||||
(if cfg.workingDirectory != "." then ''
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ let
|
|||
device = "none";
|
||||
fsType = "envfs";
|
||||
options = [
|
||||
"bind-mount=/bin"
|
||||
"fallback-path=${pkgs.runCommand "fallback-path" {} (''
|
||||
mkdir -p $out
|
||||
ln -s ${config.environment.usrbinenv} $out/env
|
||||
|
|
@ -15,6 +16,9 @@ let
|
|||
"nofail"
|
||||
];
|
||||
};
|
||||
# We need to bind-mount /bin to /usr/bin, because otherwise upgrading
|
||||
# from envfs < 1.0.5 will cause having the old envs with no /bin bind mount.
|
||||
# Systemd is smart enough to not mount /bin if it's already mounted.
|
||||
"/bin" = {
|
||||
device = "/usr/bin";
|
||||
fsType = "none";
|
||||
|
|
|
|||
|
|
@ -128,9 +128,7 @@ import ../make-test-python.nix ({ pkgs, lib, k3s, ... }:
|
|||
};
|
||||
};
|
||||
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ euank ];
|
||||
};
|
||||
meta.maintainers = k3s.meta.maintainers;
|
||||
|
||||
testScript = ''
|
||||
machines = [server, server2, agent]
|
||||
|
|
|
|||
|
|
@ -25,9 +25,7 @@ import ../make-test-python.nix ({ pkgs, lib, k3s, ... }:
|
|||
in
|
||||
{
|
||||
name = "${k3s.name}-single-node";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ euank ];
|
||||
};
|
||||
meta.maintainers = k3s.meta.maintainers;
|
||||
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
environment.systemPackages = with pkgs; [ k3s gzip ];
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ let
|
|||
description = "A lightweight Kubernetes distribution";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://k3s.io";
|
||||
maintainers = with maintainers; [ euank mic92 yajo ];
|
||||
maintainers = with maintainers; [ euank mic92 superherointj yajo ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
# resolves collisions with other installations of kubectl, crictl, ctr
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
, vips
|
||||
, at-spi2-core
|
||||
, autoPatchelfHook
|
||||
, wrapGAppsHook
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation {
|
|||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
wrapGAppsHook
|
||||
makeWrapper
|
||||
dpkg
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
let
|
||||
pname = "zulip";
|
||||
version = "5.10.5";
|
||||
version = "5.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
|
||||
hash = "sha256-dWTczjE6QAW26bGTIeFTuXl1JwYr3Ma+8Ab6MjeDr78=";
|
||||
hash = "sha256-snxeMgcLFMYDEsog7Xqeybw8GkU4kPqHMds1174bPd0=";
|
||||
name="${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ let
|
|||
in appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
runScript = "appimage-exec.sh -w ${appimageContents} -- \${NIXOS_OZONE_WL:+\${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}";
|
||||
runScript = "appimage-exec.sh -w ${appimageContents} -- \${NIXOS_OZONE_WL:+\${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}";
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv "$out/bin/${pname}-${version}" "$out/bin/${pname}"
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nextcloud-client";
|
||||
version = "3.12.1";
|
||||
version = "3.12.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "nextcloud";
|
||||
repo = "desktop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WGmabfOuEs9WRq1Ta7ZiZQuscoEdxhaFhuppE7MpZfk=";
|
||||
hash = "sha256-qVb0omSWzwkbqdtYXy8VWYyCM0CDCAW9L78pli9TbO4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -33,14 +33,14 @@ let
|
|||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-L76UTgy1tGxj5KVXefz2uj2M/sse2n0byqRtW/wvwz8=";
|
||||
x86_64-linux = "sha256-GcFds6PCEuvZ7oIfWMEkRIWMWU/jmCsj4zCkMe3+QM0=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
displayname = "XPipe";
|
||||
|
||||
in stdenvNoCC.mkDerivation rec {
|
||||
pname = "xpipe";
|
||||
version = "8.4";
|
||||
version = "8.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.1";
|
||||
version = "4.2";
|
||||
pname = "messer-slim";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MesserLab";
|
||||
repo = "SLiM";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mb6xcu28QYAFm2906lRNY0zciQBKSGcz3q/cvOEh/VE=";
|
||||
sha256 = "sha256-PDIaOMA1QHrJC5xVW+Mzx8ja/YvZBMKvV88MjSoSpfM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gcc gcc-unwrapped ];
|
||||
|
|
|
|||
|
|
@ -1,26 +1,32 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, jdk
|
||||
, ant
|
||||
, jdk
|
||||
, makeWrapper
|
||||
, strip-nondeterminism
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dataexplorer";
|
||||
version = "3.8.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz";
|
||||
sha256 = "sha256-b68xIZNbzHdPyZwLngcnjcoBtI6AeTdrblz/qx/HbGQ=";
|
||||
url = "mirror://savannah/dataexplorer/dataexplorer-${finalAttrs.version}-src.tar.gz";
|
||||
hash = "sha256-b68xIZNbzHdPyZwLngcnjcoBtI6AeTdrblz/qx/HbGQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ant makeWrapper ];
|
||||
|
||||
buildInputs = [ jdk ];
|
||||
nativeBuildInputs = [
|
||||
ant
|
||||
jdk
|
||||
makeWrapper
|
||||
strip-nondeterminism
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
ant -f build/build.xml dist
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
|
@ -30,6 +36,8 @@ stdenv.mkDerivation rec {
|
|||
#'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
ant -Dprefix=$out/share/ -f build/build.xml install
|
||||
|
||||
# The sources contain a wrapper script in $out/share/DataExplorer/DataExplorer
|
||||
|
|
@ -49,6 +57,14 @@ stdenv.mkDerivation rec {
|
|||
$out/etc/udev/rules.d/50-Junsi-iCharger-USB.rules
|
||||
install -Dvm644 build/misc/GNU_LINUX_SKYRC_UDEV_RULE/50-SkyRC-Charger.rules \
|
||||
$out/etc/udev/rules.d/50-SkyRC-Charger.rules
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# manually call strip-nondeterminism because using stripJavaArchivesHook takes
|
||||
# too long to strip bundled jars
|
||||
postFixup = ''
|
||||
strip-nondeterminism --type jar $out/share/DataExplorer/{DataExplorer.jar,devices/*.jar}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -63,4 +79,4 @@ stdenv.mkDerivation rec {
|
|||
binaryBytecode # contains thirdparty jar files, e.g. javax.json, org.glassfish.json
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gerrit";
|
||||
version = "3.9.1";
|
||||
version = "3.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
|
||||
hash = "sha256-WQjzkykKtrXfkNSWcM9GWy8LPMwxJpSbnWjpmslP0HA=";
|
||||
hash = "sha256-KsuuwFKdpXHDVAZZ2JiX781mgqDQyyEILo4lmNn+8YE=";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
|
|
|||
|
|
@ -8,18 +8,19 @@
|
|||
, mpv
|
||||
, aria2
|
||||
, ffmpeg
|
||||
, fzf
|
||||
, openssl
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "dra-cla";
|
||||
version = "unstable-2023-10-10";
|
||||
version = "unstable-2024-02-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CoolnsX";
|
||||
repo = "dra-cla";
|
||||
rev = "12e9557fb8dfdff7350e0102a625170bb69acf01";
|
||||
hash = "sha256-cGY/FRV2BAS4fzJqIfD7FlIPIS0fCIIBenQYjB2dEsc=";
|
||||
rev = "cf8a90c0c68338404e8a1434af0a6e65fc5d0a08";
|
||||
hash = "sha256-3cz1VeDM0NHdYMiCDVnIq6Y/7rFSijhNrnxC36Yixxc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -30,7 +31,7 @@ stdenvNoCC.mkDerivation {
|
|||
install -Dm755 dra-cla $out/bin/dra-cla
|
||||
|
||||
wrapProgram $out/bin/dra-cla \
|
||||
--prefix PATH : ${lib.makeBinPath [ gnugrep gnused curl mpv aria2 ffmpeg openssl ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ gnugrep gnused curl mpv aria2 ffmpeg fzf openssl ]}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ rec {
|
|||
# package dependencies
|
||||
, stdenv, fetchFromGitHub, fetchpatch, buildGoPackage
|
||||
, makeWrapper, installShellFiles, pkg-config, glibc
|
||||
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
|
||||
, go-md2man, go, containerd, runc, tini, libtool
|
||||
, sqlite, iproute2, docker-buildx, docker-compose, docker-sbom
|
||||
, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
|
||||
, procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests
|
||||
|
|
@ -137,6 +137,7 @@ rec {
|
|||
installPhase = ''
|
||||
cd ./go/src/${goPackagePath}
|
||||
install -Dm755 ./bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd
|
||||
install -Dm755 ./bundles/dynbinary-daemon/docker-proxy $out/libexec/docker/docker-proxy
|
||||
|
||||
makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
|
||||
--prefix PATH : "$out/libexec/docker:$extraPath"
|
||||
|
|
@ -144,7 +145,6 @@ rec {
|
|||
ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd
|
||||
ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/containerd-shim
|
||||
ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc
|
||||
ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy
|
||||
ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init
|
||||
|
||||
# systemd
|
||||
|
|
@ -172,7 +172,7 @@ rec {
|
|||
buildGoPackage (lib.optionalAttrs (!clientOnly) {
|
||||
# allow overrides of docker components
|
||||
# TODO: move packages out of the let...in into top-level to allow proper overrides
|
||||
inherit docker-runc docker-containerd docker-proxy docker-tini moby;
|
||||
inherit docker-runc docker-containerd docker-tini moby;
|
||||
} // rec {
|
||||
pname = "docker";
|
||||
inherit version;
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "docker-proxy";
|
||||
version = "unstable-2020-12-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "libnetwork";
|
||||
rev = "fa125a3512ee0f6187721c88582bf8c4378bd4d7";
|
||||
sha256 = "1r47y0gww3j7fas4kgiqbhrz5fazsx1c6sxnccdfhj8fzik77s9y";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/docker/libnetwork";
|
||||
|
||||
installPhase = ''
|
||||
install -m755 -D ./go/bin/proxy $out/bin/docker-proxy
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Docker proxy binary to forward traffic between host and containers";
|
||||
mainProgram = "docker-proxy";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://github.com/docker/libnetwork";
|
||||
maintainers = with maintainers; [vdemeester];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "atlauncher";
|
||||
version = "3.4.35.4";
|
||||
version = "3.4.35.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar";
|
||||
hash = "sha256-M8ygN70yizJM6VEffBh/lH/DneKAzQ5UFzc3g51dja0=";
|
||||
hash = "sha256-Y2MGhzq4IbtjEG+CER+FWU8CY+hn5ehjMOcP02zIsR4=";
|
||||
};
|
||||
|
||||
env.ICON = fetchurl {
|
||||
|
|
|
|||
|
|
@ -1,31 +1,13 @@
|
|||
{ lib
|
||||
, dbus
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, python3
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
# autosuspend is incompatible with tzlocal v5
|
||||
# See https://github.com/regebro/tzlocal#api-change
|
||||
tzlocal = super.tzlocal.overridePythonAttrs (prev: rec {
|
||||
version = "4.3.1";
|
||||
src = fetchPypi {
|
||||
inherit (prev) pname;
|
||||
inherit version;
|
||||
hash = "sha256-7jLvjCCAPBmpbtNmrd09SnKe9jCctcc1mgzC7ut/pGo=";
|
||||
};
|
||||
propagatedBuildInputs = with self; [
|
||||
pytz-deprecation-shim
|
||||
];
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "autosuspend";
|
||||
version = "6.0.0";
|
||||
version = "6.1.1";
|
||||
|
||||
disabled = python3.pythonOlder "3.8";
|
||||
|
||||
|
|
@ -33,15 +15,15 @@ python.pkgs.buildPythonApplication rec {
|
|||
owner = "languitar";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gS8NNks4GaIGl7cEqWSP53I4/tIV4LypkmZ5vNOjspY=";
|
||||
hash = "sha256-LGU/yhwuc6BuctCibm0AaRheQkuSIgEVXzcWQHCJ/8Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace '--cov-config=setup.cfg' ""
|
||||
--replace-fail '--cov-config=setup.cfg' ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
dependencies = with python3.pkgs; [
|
||||
dbus-python
|
||||
icalendar
|
||||
jsonpath-ng
|
||||
|
|
@ -56,7 +38,8 @@ python.pkgs.buildPythonApplication rec {
|
|||
tzlocal
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python.pkgs; [
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
dbus
|
||||
freezegun
|
||||
pytest-datadir
|
||||
pytest-httpserver
|
||||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "decker";
|
||||
version = "1.39";
|
||||
version = "1.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JohnEarnest";
|
||||
repo = "Decker";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-77x+LT+oTDtK4jszL3A9MAv9Hakovz47yFaiu8kFtTg=";
|
||||
hash = "sha256-AnWFAa96/lO5to7mVzHGkyzJ8U+2A9u9N1w91vHDsFo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,20 +21,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "delfin";
|
||||
version = "0.4.0";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "avery42";
|
||||
repo = "delfin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QwxdNPLL7PBokq5WaPylD4bBmXmJWyEQsWKN7DM2utk=";
|
||||
hash = "sha256-7GHwwwFibmwBcrlC2zSpEUZ2dca14wZFU6PJWjincPQ=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-ElB9TbfmYn/A1Y3+oQ752zHqkC+f2RJPxfGXH0m5C/E=";
|
||||
hash = "sha256-zlecw6230AC/+y537iEhJU+BgWRs2WCFP0AIcxchZBA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
{ cmake
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lib60870";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mz-automation";
|
||||
repo = "lib60870";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-9o+gWQbpCJb+UZzPNmzGqpWD0QbGjg41is/f1POUEQs=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
preConfigure = "cd lib60870-C";
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Implementation of the IEC 60870-5-101/104 protocol";
|
||||
homepage = "https://libiec61850.com/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ stv0g ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
})
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "AAXClean"; version = "1.1.2"; sha256 = "0hxn1giq99rcd6z43ar79awlzyv0mnxpvmarsl2ypi52d3dizf01"; })
|
||||
(fetchNuGet { pname = "AAXClean.Codecs"; version = "1.1.3"; sha256 = "0hqj9hslscl110h2mr7mf0lb0s7dczx73mplkpgx1gpshyfg5xj8"; })
|
||||
(fetchNuGet { pname = "AudibleApi"; version = "9.0.0.1"; sha256 = "1j6bigvvldg4m82vb7ry8y06sh3a0q4mdshlsrppq6bivwsalazc"; })
|
||||
(fetchNuGet { pname = "AudibleApi"; version = "9.1.0.1"; sha256 = "131ibkglq5x72lfblbk4d50mmah8iwhws30va8v7qazaxy5rdbm3"; })
|
||||
(fetchNuGet { pname = "Avalonia"; version = "11.0.5"; sha256 = "1l8vpw7dmkgll197i42r98ikkl0g08469wkl1kxkcv8f0allgah6"; })
|
||||
(fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; })
|
||||
(fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; })
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
(fetchNuGet { pname = "Avalonia.X11"; version = "11.0.5"; sha256 = "1bixdr5yzd9spyjc4n2kf1bwg52q3p5akj9xsr25xp310j3kgyxf"; })
|
||||
(fetchNuGet { pname = "BouncyCastle.Cryptography"; version = "2.2.1"; sha256 = "13fx7cg5hmk2y33438wjz0c74c0lvbmh8fa33gwldldmf72mwcr8"; })
|
||||
(fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
|
||||
(fetchNuGet { pname = "CsvHelper"; version = "30.0.1"; sha256 = "0v01s672zcrd3fjwzh14dihbal3apzyg3dc80k05a90ljk8yh9wl"; })
|
||||
(fetchNuGet { pname = "CsvHelper"; version = "31.0.2"; sha256 = "14x5a81yc3psz5lsafknafbbs19kd05s80lpnyrr225q0w7vfqlk"; })
|
||||
(fetchNuGet { pname = "Dinah.Core"; version = "8.0.0.1"; sha256 = "1kfnc7bfs6bmy41rvnybhpfwrd2p4rjgg8jzzajk7v7smci1m04d"; })
|
||||
(fetchNuGet { pname = "Dinah.EntityFrameworkCore"; version = "8.0.0.1"; sha256 = "1125s6lypmk447d6pba6kn5r82c552l6ck54a7mgaa9n2448lcn5"; })
|
||||
(fetchNuGet { pname = "DynamicData"; version = "7.9.5"; sha256 = "1m9qx8g6na5ka6kd9vhg8gjmxrnkzb6v5cl5yqp1kdjsw4rcwy6x"; })
|
||||
|
|
@ -51,15 +51,19 @@
|
|||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0"; sha256 = "1wjwsrnn5frahqciwaxsgalv80fs6xhqy6kcqy7hcsh7jrfc1kjq"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })
|
||||
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.0"; sha256 = "05qjnzk1fxybks92y93487l3mj5nghjcwiy360xjgk3jykz3rv39"; })
|
||||
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.2"; sha256 = "1p8fnnkgcvqnszp2ym4cn9ysa3c409yqnq3nrpnwldz6zi42jdgz"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.0"; sha256 = "1xhmax0xrvw4lyz1868f1sr3nbrcv3ckr5qnf61c8q9bwj06b9v7"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.2"; sha256 = "09qdjvb2prlhkb08nzdjabwj43wrsc4b83spmig2qj65jp10pgiw"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.0"; sha256 = "019r991228nxv1fibsxg5z81rr7ydgy77c9v7yvlx35kfppxq4s3"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.2"; sha256 = "10qsmgh2fbrkikvahgyfs9kvvq7jd648nz169gv9fh92k8rz01ww"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.0"; sha256 = "1vcbad0pzkx5wadnd5inglx56x0yybdlxgknbhifdga0bx76j9sa"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.0"; sha256 = "0pa1v87q4hzphv0h020adw7hn84803lrrxylk8h57j93axm5kmm0"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.2"; sha256 = "1j7jvza125nfjzlnyk1kc4w7qqlw1imp47f1zrxfxvwdy51nfsik"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.2"; sha256 = "1i9qyamizqha69x4pcmdr8rjy8pmdmnjcbb3xmlb7jwwzrzjvjhj"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.0"; sha256 = "0ngsxk717si11g4a01ah2np8gp8b3k09y23229anr9jrhykr1bw1"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.0"; sha256 = "156v8xr5xk9b7a9ncxjpv30hp0nfgbb0plzd3709sa8g0a7dvi53"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.0"; sha256 = "0jg524cr8j779av1whwk120xajymb8086abn5wzdb4fyrc0ivf8l"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Tools"; version = "8.0.0"; sha256 = "1qm8qscp4g4y4mg5z9i9zp4b17wlhndh4isy78ajw9891yp3cxll"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.2"; sha256 = "1qnb33mqnhbx8r0sn2kj32idv7yzrgnapkh39is8m1qhfp6gmaih"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.2"; sha256 = "0jj4pgmapab646k57587w8byzsdknfpwjqw93m91q5h0carqax6j"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.2"; sha256 = "1wvp7r8nxfj5wlba8qkyfspz5gcj4d8d946s39qifdbasnfa0sv9"; })
|
||||
(fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Tools"; version = "8.0.2"; sha256 = "086n9n8hqssmxlyx8449r9pd4jj1pw55d6w9qli3ii1355l0cmr4"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; sha256 = "04m6ywsf9731z24nfd14z0ah8xl06619ba7mkdb4vg8h5jpllsn4"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; sha256 = "0bv8ihd5i2gwr97qljwf56h8mdwspmlw0zs64qyk608fb3ciwi25"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; })
|
||||
|
|
@ -88,10 +92,10 @@
|
|||
(fetchNuGet { pname = "NAudio.Core"; version = "2.2.1"; sha256 = "0ivki33p5mcm7iigya22llgk0p6m4j99sbfmcc38ir1hzpdlaikr"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
|
||||
(fetchNuGet { pname = "NPOI"; version = "2.6.2"; sha256 = "19jc9fzbwgs8hydvgbn9qnkncifx9lz0qgrq4jfqv9q1yynh27q2"; })
|
||||
(fetchNuGet { pname = "Octokit"; version = "9.1.0"; sha256 = "02qd23zsr8pffkznb7znq1n2bz9x8y3b6kcz0xp9z98wqxpb9y2k"; })
|
||||
(fetchNuGet { pname = "Octokit"; version = "10.0.0"; sha256 = "19crbmzkqx8bbl6a55n2b9k4ljyml0h6nq78nayz1vl2ji2f0r23"; })
|
||||
(fetchNuGet { pname = "Pluralize.NET"; version = "1.0.2"; sha256 = "0187adfnl288v7izgwx1iskgi024nm4l83s898x6pg2j79h8gxdv"; })
|
||||
(fetchNuGet { pname = "Polly"; version = "8.2.0"; sha256 = "0gxdi4sf60vpxsb258v592ykkq9a3dq2awayp99yy9djys8bglks"; })
|
||||
(fetchNuGet { pname = "Polly.Core"; version = "8.2.0"; sha256 = "00b4jbyiyslqvswy4j2lfw0rl0gq8m4v5fj2asb96i6l224bs7d3"; })
|
||||
(fetchNuGet { pname = "Polly"; version = "8.3.0"; sha256 = "1pmh6iwkzgbxn62k1g1agwzgqdbq8g0yj5wslyxknpri6pyx9y5c"; })
|
||||
(fetchNuGet { pname = "Polly.Core"; version = "8.3.0"; sha256 = "16bkagvrpfr58lfmzyxic1dzmxxbi0vkgd8jfyfbaa6nscadf8xb"; })
|
||||
(fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; sha256 = "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; })
|
||||
|
|
@ -123,7 +127,6 @@
|
|||
(fetchNuGet { pname = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; })
|
||||
(fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; })
|
||||
(fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; })
|
||||
(fetchNuGet { pname = "Serilog"; version = "2.12.0"; sha256 = "0lqxpc96qcjkv9pr1rln7mi4y7n7jdi4vb36c2fv3845w1vswgr4"; })
|
||||
(fetchNuGet { pname = "Serilog"; version = "2.8.0"; sha256 = "0fnrs05yjnni06mbax7ig74wiiqjyyhrxmr1hrhlpwcmc40zs4ih"; })
|
||||
(fetchNuGet { pname = "Serilog"; version = "3.1.0"; sha256 = "1fd3hwhsicjmav56ff6d8x6lmalggy52kvw2mb85hz13w2kw086l"; })
|
||||
(fetchNuGet { pname = "Serilog"; version = "3.1.1"; sha256 = "0ck51ndmaqflsri7yyw5792z42wsp91038rx2i6vg7z4r35vfvig"; })
|
||||
|
|
@ -131,7 +134,7 @@
|
|||
(fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.0"; sha256 = "0245gvndwbj4nbp8q09vp7w4i9iddxr0vzda2c3ja5afz1zgs395"; })
|
||||
(fetchNuGet { pname = "Serilog.Sinks.Console"; version = "5.0.0"; sha256 = "0qk5b9vfgzx00a1c2rnih2p3jlcc88vdi9ar5cpwv1jb09x6brah"; })
|
||||
(fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; })
|
||||
(fetchNuGet { pname = "Serilog.Sinks.ZipFile"; version = "1.0.1"; sha256 = "18swb04gk0hxwcbc4gndkpl8jgj643f8fga3w26sjkx6r2nhg35q"; })
|
||||
(fetchNuGet { pname = "Serilog.Sinks.ZipFile"; version = "3.1.1"; sha256 = "0m7a8ygfwx90n86qmkpfdgn4wvi94vwxi6m9mhx8gy25wsw1g2jv"; })
|
||||
(fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; })
|
||||
(fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0"; sha256 = "1lsc789fqsnh3jx5w0g5k2n1wlww58zyzrcf5rs3wx2fjrqi084k"; })
|
||||
(fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.4"; sha256 = "0rbv3a20ar73vy6mnj10s245lpninvjz7rhrmqz9vxq42k6g8diy"; })
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "libation";
|
||||
version = "11.3.1";
|
||||
version = "11.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rmcrackan";
|
||||
repo = "Libation";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oTqV1pmjjxzLdvEIUmg3cRFhnPG69yHMbSd9ZBv+XVE=";
|
||||
hash = "sha256-LH8p14oMjqo648h0TYClutPx19v5cWa9ffUlxuPWX5o=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/Source";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
{ cmake
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libiec61850";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mz-automation";
|
||||
repo = "libiec61850";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-SwJjjSapNaVOH5g46MiS9BkzI0fKm/P1xYug3OX5XbA=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source library for the IEC 61850 protocols";
|
||||
homepage = "https://libiec61850.com/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ stv0g ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
})
|
||||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "normaliz";
|
||||
version = "3.10.1";
|
||||
version = "3.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "normaliz";
|
||||
repo = "normaliz";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-nnSauTlS5R6wbaoGxR6HFacFYm5r4DAhoP9IVe4ajdc=";
|
||||
hash = "sha256-Q4OktVvFobP25fYggIqBGtSJu2HsYz9Tm+QbEAz0fMg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, fmt, lzo, pkg-config, zlib, zstd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ntfs2btrfs";
|
||||
version = "20240115";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maharmstone";
|
||||
repo = "ntfs2btrfs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-sZ8AWREe2jasy3hqLTjaLcOMCNsrDjz2eIuknA2TsEs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ fmt lzo zlib zstd ];
|
||||
|
||||
meta = {
|
||||
description = "A CLI tool which does in-place conversion of Microsoft's NTFS filesystem to the open-source filesystem Btrfs";
|
||||
homepage = "https://github.com/maharmstone/ntfs2btrfs";
|
||||
license = with lib.licenses; [ gpl2Only ];
|
||||
maintainers = with lib.maintainers; [ j1nxie ];
|
||||
mainProgram = "ntfs2btrfs";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
omniorb,
|
||||
pkg-config,
|
||||
python3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "omniorbpy";
|
||||
version = "4.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.sourceforge.net/omniorb/omniORBpy-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-y1cX1BKhAbr0MPWYysfWkjGITa5DctjirfPd7rxffrs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
omniorb
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-omniorb=${omniorb}"
|
||||
"PYTHON_PREFIX=$out"
|
||||
"PYTHON=${lib.getExe python3}"
|
||||
];
|
||||
|
||||
# Transform omniidl_be into a PEP420 namespace
|
||||
postInstall = ''
|
||||
rm $out/${python3.sitePackages}/omniidl_be/__init__.py
|
||||
rm $out/${python3.sitePackages}/omniidl_be/__pycache__/__init__.*.pyc
|
||||
'';
|
||||
|
||||
# Ensure both python & cxx backends are available
|
||||
doInstallCheck = true;
|
||||
postInstallCheck = ''
|
||||
export PYTHONPATH=$out/${python3.sitePackages}:${omniorb}/${python3.sitePackages}:$PYTHONPATH
|
||||
${lib.getExe python3} -c "import omniidl_be.cxx; import omniidl_be.python"
|
||||
'';
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "The python backend for omniorb";
|
||||
homepage = "http://omniorb.sourceforge.net";
|
||||
license = with licenses; [ gpl2Plus lgpl21Plus ];
|
||||
maintainers = with maintainers; [ nim65s ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -11,20 +11,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "uv";
|
||||
version = "0.1.22";
|
||||
version = "0.1.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
rev = version;
|
||||
hash = "sha256-AbixSkwyhj3eBMLvGlodpz7XE3ln0IokNMdu5SOZjOE=";
|
||||
hash = "sha256-XsBTfe2+J5CGdjYZjhgxiP20OA7+VTCvD9JniLOjhKs=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"async_zip-0.0.16" = "sha256-M94ceTCtyQc1AtPXYrVGplShQhItqZZa/x5qLiL+gs0=";
|
||||
"pubgrub-0.2.1" = "sha256-Pn60v5tfpGrssCeuaUcxw5eJ1g8Dk/+un0s8+k4abpo=";
|
||||
"pubgrub-0.2.1" = "sha256-SdgxoJ37cs+XwWRCFX4uKhJ9Juu9R/jENb6tzUMam4k=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vesktop";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vencord";
|
||||
repo = "Vesktop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-27998q9wbaNP1xYY+KHTBeJRfR6Q/K0LNdbRb3YHC6c=";
|
||||
hash = "sha256-OyAGzlwwdEKBbJJ7h3glwx/THy2VvUn/kA/Df3arWQU=";
|
||||
};
|
||||
|
||||
# NOTE: This requires pnpm 8.10.0 or newer
|
||||
|
|
@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
dontBuild = true;
|
||||
dontFixup = true;
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-cnk+KFdvsgG1wGDib7zgIS6/RkrR5EYAHtHcrFSU0Es=";
|
||||
outputHash = "sha256-JLjJZYFMH4YoIFuyXbGUp6lIy+VlYZtmwk2+oUwtTxQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -268,6 +268,16 @@ rec {
|
|||
};
|
||||
};
|
||||
|
||||
binaryCrystal_1_10 = genericBinary {
|
||||
version = "1.10.1";
|
||||
sha256s = {
|
||||
x86_64-linux = "sha256-F0LjdV02U9G6B8ApHxClF/o5KvhxMNukSX7Z2CwSNIs=";
|
||||
aarch64-darwin = "sha256-5kkObQl0VIO6zqQ8TYl0JzYyUmwfmPE9targpfwseSQ=";
|
||||
x86_64-darwin = "sha256-5kkObQl0VIO6zqQ8TYl0JzYyUmwfmPE9targpfwseSQ=";
|
||||
aarch64-linux = "sha256-AzFz+nrU/HJmCL1hbCKXf5ej/uypqV1GJPVLQ4J3778=";
|
||||
};
|
||||
};
|
||||
|
||||
crystal_1_2 = generic {
|
||||
version = "1.2.2";
|
||||
sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU=";
|
||||
|
|
@ -297,5 +307,12 @@ rec {
|
|||
llvmPackages = llvmPackages_15;
|
||||
};
|
||||
|
||||
crystal = crystal_1_9;
|
||||
crystal_1_11 = generic {
|
||||
version = "1.11.2";
|
||||
sha256 = "sha256-BBEDWqFtmFUNj0kuGBzv71YHO3KjxV4d2ySTCD4HhLc=";
|
||||
binary = binaryCrystal_1_10;
|
||||
llvmPackages = llvmPackages_15;
|
||||
};
|
||||
|
||||
crystal = crystal_1_11;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ck";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "concurrencykit";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-HUC+8Vd0koAmumRZ8gS5u6LVa7fUfkIYRaxVv6/7Hgg=";
|
||||
sha256 = "sha256-lxJ8WsZ3pBGf4sFYj5+tR37EYDZqpksaoohiIKA4pRI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nco";
|
||||
version = "5.2.1";
|
||||
version = "5.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nco";
|
||||
repo = "nco";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-6j9gBvhNTww9nOKMcCvOxoLJwU/3RtS6OvofjrpZhmk=";
|
||||
hash = "sha256-d90088MKliM90KSbL0TNEafhfvLQlD/stO5V83fTXO0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
, qmake, GLUT, fixDarwinDylibNames }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.4.2";
|
||||
version = "1.6.0";
|
||||
pname = "opencsg";
|
||||
src = fetchurl {
|
||||
url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz";
|
||||
sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr";
|
||||
hash = "sha256-v4+4Dj4M4R2H3XjdFaDehy27iXLYf1+Jz/xGHvrUe+g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ]
|
||||
|
|
@ -18,15 +18,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = false;
|
||||
|
||||
patches = [ ./fix-pro-files.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
rm example/Makefile src/Makefile
|
||||
qmakeFlags=("''${qmakeFlags[@]}" "INSTALLDIR=$out")
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -D license.txt "$out/share/doc/opencsg/license.txt"
|
||||
install -D copying.txt "$out/share/doc/opencsg/copying.txt"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv $out/bin/*.app $out/Applications
|
||||
|
|
@ -49,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://www.opencsg.org/";
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.raskin ];
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
diff -ur OpenCSG-1.4.2-pristine/example/example.pro OpenCSG-1.4.2/example/example.pro
|
||||
--- OpenCSG-1.4.2-pristine/example/example.pro 2016-09-27 06:11:16.000000000 +0900
|
||||
+++ OpenCSG-1.4.2/example/example.pro 2019-05-07 10:45:18.785251737 +0900
|
||||
@@ -6,7 +6,9 @@
|
||||
INCLUDEPATH += ../include
|
||||
LIBS += -L../lib -lopencsg -lGLEW
|
||||
|
||||
-INSTALLDIR = /usr/local
|
||||
+isEmpty(INSTALLDIR) {
|
||||
+ INSTALLDIR = /usr/local
|
||||
+}
|
||||
INSTALLS += target
|
||||
target.path = $$INSTALLDIR/bin
|
||||
|
||||
diff -ur OpenCSG-1.4.2-pristine/opencsg.pro OpenCSG-1.4.2/opencsg.pro
|
||||
--- OpenCSG-1.4.2-pristine/opencsg.pro 2016-09-27 06:11:16.000000000 +0900
|
||||
+++ OpenCSG-1.4.2/opencsg.pro 2019-05-07 10:44:50.578698165 +0900
|
||||
@@ -1,2 +1,3 @@
|
||||
TEMPLATE = subdirs
|
||||
SUBDIRS = src example
|
||||
+CONFIG += ordered
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pythia";
|
||||
version = "8.310";
|
||||
version = "8.311";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pythia.org/download/pythia83/pythia${builtins.replaceStrings ["."] [""] version}.tgz";
|
||||
sha256 = "sha256-kMgRq+ej0v/b+bSuq1HPbgpai++04++oBvPVucMR4ic=";
|
||||
sha256 = "sha256-J4LV5CnBVDxnN1r+VH/UxMoHIDCd6wCPfbeGJtx9FGQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ rsync ]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, qmake
|
||||
, qtbase
|
||||
, qtsvg
|
||||
|
|
@ -14,23 +15,24 @@
|
|||
, wrapQtAppsHook
|
||||
, gitUpdater
|
||||
|
||||
, qt5Kvantum ? null
|
||||
, qt6Kvantum ? null
|
||||
}:
|
||||
let
|
||||
isQt6 = lib.versionAtLeast qtbase.version "6";
|
||||
isQt5 = lib.versionOlder qtbase.version "6";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtstyleplugin-kvantum${lib.optionalString isQt6 "6"}";
|
||||
version = "1.0.10";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qtstyleplugin-kvantum${lib.optionalString isQt5 "5"}";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tsujan";
|
||||
repo = "Kvantum";
|
||||
rev = "V${version}";
|
||||
sha256 = "48Blio8qHLmXSKG0c1tphXSfiwQXs0Xqwxe187nM3Ro=";
|
||||
rev = "V${finalAttrs.version}";
|
||||
hash = "sha256-i+QjVPSzWNPVQmQkB+u/3Wrvqqoz5OIjRdyZKXzxZh4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
|
|
@ -41,10 +43,11 @@ stdenv.mkDerivation rec {
|
|||
qtsvg
|
||||
libX11
|
||||
libXext
|
||||
] ++ lib.optionals (!isQt6) [ qtx11extras kwindowsystem ]
|
||||
++ lib.optional isQt6 qtwayland;
|
||||
kwindowsystem
|
||||
] ++ lib.optionals isQt5 [ qtx11extras ]
|
||||
++ lib.optionals (!isQt5) [ qtwayland ];
|
||||
|
||||
sourceRoot = "${src.name}/Kvantum";
|
||||
sourceRoot = "${finalAttrs.src.name}/Kvantum";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
|
|
@ -56,15 +59,19 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix plugin dir
|
||||
substituteInPlace style/style.pro \
|
||||
--replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
|
||||
substituteInPlace style/CMakeLists.txt \
|
||||
--replace-fail '"''${_Qt6_PLUGIN_INSTALL_DIR}/' "\"$out/$qtPluginPrefix/" \
|
||||
--replace-fail '"''${_Qt5_PLUGIN_INSTALL_DIR}/' "\"$out/$qtPluginPrefix/"
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString isQt6 ''
|
||||
# make default Kvantum themes available for Qt 6 apps
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "ENABLE_QT5" isQt5)
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString isQt5 ''
|
||||
# make default Kvantum themes available for Qt 5 apps
|
||||
mkdir -p "$out/share"
|
||||
ln -s "${qt5Kvantum}/share/Kvantum" "$out/share/Kvantum"
|
||||
ln -s "${qt6Kvantum}/share/Kvantum" "$out/share/Kvantum"
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
|
|
@ -78,4 +85,4 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo Scrumplex ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "cypari2";
|
||||
# upgrade may break sage, please test the sage build or ping @timokau on upgrade
|
||||
version = "2.1.4";
|
||||
version = "2.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-76SkTZb2k8sRVtof1vzMEw2vz5wZr0GFz3cL9E0A2/w=";
|
||||
sha256 = "sha256-GiWGXDTyCx3JWDB5jjSrZDbieLjgyA3HvwqzTF2wOrg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@ let
|
|||
inherit pname version hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
boto3
|
||||
] ++ lib.optionals (pythonOlder "3.12") [
|
||||
typing-extensions
|
||||
|
|
@ -159,7 +159,7 @@ rec {
|
|||
|
||||
mypy-boto3-cloudwatch = buildMypyBoto3Package "cloudwatch" "1.34.40" "sha256-M/C3Rzie5dcv6TGVl7ilI5WiT1uYFrCGL+7Fga+xSLw=";
|
||||
|
||||
mypy-boto3-codeartifact = buildMypyBoto3Package "codeartifact" "1.34.0" "sha256-iUgoanqMSyxRopVctyFLiu+otFSgRvdgQPw4mKX3QIk=";
|
||||
mypy-boto3-codeartifact = buildMypyBoto3Package "codeartifact" "1.34.68" "sha256-Ey0cmx0OxN1/VXIyvn0EOBP9qYIuc/XyFVZniHLaNEY=";
|
||||
|
||||
mypy-boto3-codebuild = buildMypyBoto3Package "codebuild" "1.34.67" "sha256-Kvd8zAHfepA4dulpiQCaT2pfKCH567d6CYd5QlweXIY=";
|
||||
|
||||
|
|
@ -295,7 +295,7 @@ rec {
|
|||
|
||||
mypy-boto3-finspace-data = buildMypyBoto3Package "finspace-data" "1.34.0" "sha256-8mND5BbdKY5srFwdpxSyfCUTIP4fa9hztP4daUJOB8k=";
|
||||
|
||||
mypy-boto3-firehose = buildMypyBoto3Package "firehose" "1.34.46" "sha256-Fgs7wrwKPK79cYduCR/RYQ2FEZvghDuWI1hXKzFLfJo=";
|
||||
mypy-boto3-firehose = buildMypyBoto3Package "firehose" "1.34.69" "sha256-GCMH/XA9ETSuo39OnlvyhfHDKylsTeLO1R1+7tl2S/E=";
|
||||
|
||||
mypy-boto3-fis = buildMypyBoto3Package "fis" "1.34.63" "sha256-TJnzgQGDcybpVqg+p7Tuvw/RoY79cQPPChyHWlMxhiY=";
|
||||
|
||||
|
|
@ -393,7 +393,7 @@ rec {
|
|||
|
||||
mypy-boto3-kafkaconnect = buildMypyBoto3Package "kafkaconnect" "1.34.50" "sha256-frPPAQeFyO92uMqqzBcSC3MVK4V4hbdO9tx4awAKAUU=";
|
||||
|
||||
mypy-boto3-kendra = buildMypyBoto3Package "kendra" "1.34.0" "sha256-j1fph9WwqBns2BpZjoKTpXC9gUJ4lu+poPBV6LIOusM=";
|
||||
mypy-boto3-kendra = buildMypyBoto3Package "kendra" "1.34.69" "sha256-OKUSsCfv2X9ad5XUSwm0KRwW++qb+AVtvCOurlRM/bo=";
|
||||
|
||||
mypy-boto3-kendra-ranking = buildMypyBoto3Package "kendra-ranking" "1.34.0" "sha256-hbemz5ECtfP3oi645lZT7CCx31yg8MNqbAD32Am6l1U=";
|
||||
|
||||
|
|
@ -565,7 +565,7 @@ rec {
|
|||
|
||||
mypy-boto3-polly = buildMypyBoto3Package "polly" "1.34.43" "sha256-rx5sW32N6H47fpy5yGvwlKKVKS/uIKOtLfsjoGoNPJg=";
|
||||
|
||||
mypy-boto3-pricing = buildMypyBoto3Package "pricing" "1.34.39" "sha256-SdIK9pWjyY6rcK9Kak5r66hP6tc/OVp+gQ9wo7HKVms=";
|
||||
mypy-boto3-pricing = buildMypyBoto3Package "pricing" "1.34.69" "sha256-0+bak3+4FQK0vAjI1r7uKvhwspZxt/zLCJRVMvH41qs=";
|
||||
|
||||
mypy-boto3-privatenetworks = buildMypyBoto3Package "privatenetworks" "1.34.0" "sha256-WFX0KaJRo0LCPKEAq8LES0P3WJkt6ywLXqTlOFZyZ1w=";
|
||||
|
||||
|
|
@ -603,7 +603,7 @@ rec {
|
|||
|
||||
mypy-boto3-robomaker = buildMypyBoto3Package "robomaker" "1.34.0" "sha256-dAL2P2bxhSc5oLZXhhekrt9y4bWXg7kIr+/FVbkFTww=";
|
||||
|
||||
mypy-boto3-rolesanywhere = buildMypyBoto3Package "rolesanywhere" "1.34.0" "sha256-U/j/u6pqoHpfNP3GbQ8SZb+qIL842ZcwwdBr1QQhlj0=";
|
||||
mypy-boto3-rolesanywhere = buildMypyBoto3Package "rolesanywhere" "1.34.69" "sha256-wuPEIXHDNvPOWIKLRx5ZR/SgQaWEYqA+IHNR3NZDhIs=";
|
||||
|
||||
mypy-boto3-route53 = buildMypyBoto3Package "route53" "1.34.31" "sha256-MtmEtt57vhFRG1O+VnFXFUhSWAQ7JrnV3hBZx4TpOh8=";
|
||||
|
||||
|
|
@ -649,7 +649,7 @@ rec {
|
|||
|
||||
mypy-boto3-secretsmanager = buildMypyBoto3Package "secretsmanager" "1.34.63" "sha256-oZM3PXGPdH1Th4tcx/7y6bj944kuR4isaQ/SsWo1Vkw=";
|
||||
|
||||
mypy-boto3-securityhub = buildMypyBoto3Package "securityhub" "1.34.20" "sha256-EcLY5SXSN2kJEuo8s2sYJJfq/X78BM1msyI9TfYD7Xw=";
|
||||
mypy-boto3-securityhub = buildMypyBoto3Package "securityhub" "1.34.69" "sha256-2fJx1VaOhYSjTXAEboBhHhMdTH697zcGHmrJsGknDTI=";
|
||||
|
||||
mypy-boto3-securitylake = buildMypyBoto3Package "securitylake" "1.34.53" "sha256-O/RHRoeUYT5DerEXIQ1NL288bcgA6bGdI29sN7WoQac=";
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygithub";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "PyGithub";
|
||||
repo = "PyGithub";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RNv/6Rs7NapP/XOdBFIWPg+/BmaK1+OY0+bP/i2YKaA=";
|
||||
hash = "sha256-ccAbn9x1r+wBIAK66ur8+2Op9ij09rQvHumq5Wh7TUU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -10,23 +10,23 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rope";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-rope";
|
||||
repo = pname;
|
||||
repo = "rope";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-j/9q2S2B3DzmEqMOBLG9iHwnLqZipcPxLaKppysJffA=";
|
||||
hash = "sha256-g/fta5gW/xPs3VaVuLtikfLhqCKyy1AKRnOcOXjQ8bA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
pytoolconfig
|
||||
] ++ pytoolconfig.optional-dependencies.global;
|
||||
|
||||
|
|
|
|||
|
|
@ -44,10 +44,11 @@ buildPythonPackage rec {
|
|||
substituteInPlace scapy/data.py --replace "/opt/wireshark" "${wireshark}"
|
||||
'';
|
||||
|
||||
buildInputs = lib.optional withVoipSupport sox;
|
||||
|
||||
propagatedBuildInputs = [ pycrypto ecdsa ]
|
||||
++ lib.optionals withOptionalDeps [ tcpdump ipython ]
|
||||
++ lib.optional withCryptography cryptography
|
||||
++ lib.optional withVoipSupport sox
|
||||
++ lib.optional withPlottingSupport matplotlib
|
||||
++ lib.optionals withGraphicsSupport [ pyx texliveBasic graphviz imagemagick ];
|
||||
|
||||
|
|
|
|||
|
|
@ -15,14 +15,15 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Shapely";
|
||||
pname = "shapely";
|
||||
version = "1.8.5";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
pname = "Shapely";
|
||||
inherit version;
|
||||
hash = "sha256-6CttYOz7EkEgyI/hBqR4WWu+qxQhFtfn9ko2TayQKpI=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "xiaomi-ble";
|
||||
version = "0.27.1";
|
||||
version = "0.28.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = "xiaomi-ble";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/LOq35YrGacXXP1Izl9xoF5rrCQGONPGj/u2zGOqbt0=";
|
||||
hash = "sha256-Va/fzGDjBR/h1lUN47AixZnDYzEPNXQKTVXILKayhBc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
|||
--replace-fail " --cov=xiaomi_ble --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
|
@ -43,7 +43,7 @@ buildPythonPackage rec {
|
|||
"pycryptodomex"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
bleak
|
||||
bleak-retry-connector
|
||||
bluetooth-data-tools
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, fetchFromGitHub, fetchpatch, crystal }:
|
||||
{ lib, fetchFromGitHub, crystal }:
|
||||
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "ameba";
|
||||
version = "1.5.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crystal-ameba";
|
||||
repo = "ameba";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TdyEnTloaciSpkPmnm+OM75sz9jaCaQ3VoDEepfescU=";
|
||||
hash = "sha256-NwmsNz9YfHDk0hVwVb5zczuzvErrwPhd3rs75t/Fj+I=";
|
||||
};
|
||||
|
||||
format = "make";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.16.4";
|
||||
version = "2.16.5";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
|
||||
hash = "sha256-wpiySSAs4x0KfzBLHzP4YC2GB1NpeEHQlbfAWCUaV90=";
|
||||
hash = "sha256-p6jTGf8A1ENKxZryfHpdPxisQ4GuuYOP2tThj1MAEn4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ginkgo";
|
||||
version = "2.17.0";
|
||||
version = "2.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onsi";
|
||||
repo = "ginkgo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-g34kXd2Xcw7+iyS5F6fiMbyUbKLTUxFUrpxl+ueyl1U=";
|
||||
sha256 = "sha256-fxP4+YqhYPeGVpW6VkSm3+FGnmgbKx77anSYUv41PSE=";
|
||||
};
|
||||
vendorHash = "sha256-XtO7HiaE/xCT3tjVZzzMcO9y8Yk8Wyy1S3S1qioMaQU=";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +1,31 @@
|
|||
{ stdenv, lib, fetchFromGitHub, buildGoModule }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, unzip
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goresym";
|
||||
version = "2.3";
|
||||
version = "2.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mandiant";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-o2t542q6UGjWdhJkcAm34kGhPUGNsvZKf940T+vydoE=";
|
||||
sha256 = "sha256-bZOq3GvGRyeIyN/CEuMA6mQjjrRvoVU9fUEUptd6NH0=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorHash = "sha256-ElV5edbe1LQWbA1NKv52/rLZJeOLBahE4YBKg9OA7YY=";
|
||||
vendorHash = "sha256-pjkBrHhIqLmSzwi1dKS5+aJrrAAIzNATOt3LgLsMtx0=";
|
||||
|
||||
nativeCheckInputs = [ unzip ];
|
||||
|
||||
preCheck = ''
|
||||
cd test
|
||||
unzip weirdbins.zip
|
||||
cd ..
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
@ -21,6 +33,7 @@ buildGoModule rec {
|
|||
description = "Go symbol recovery tool";
|
||||
mainProgram = "GoReSym";
|
||||
homepage = "https://github.com/mandiant/GoReSym";
|
||||
changelog = "https://github.com/mandiant/GoReSym/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ thehedgeh0g ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "0.10.0";
|
||||
version = "0.12.1";
|
||||
in
|
||||
crystal.buildCrystalPackage {
|
||||
pname = "crystalline";
|
||||
|
|
@ -17,7 +17,7 @@ crystal.buildCrystalPackage {
|
|||
owner = "elbywan";
|
||||
repo = "crystalline";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-g4k/vP7yYbTAy2bTAfr6HQhkskWfI6Zv2lxP+AZf6yw=";
|
||||
hash = "sha256-b/j1V5JlT+rjWYAA8nrE0PWHrzQq4rUZxZlADMmtpBk=";
|
||||
};
|
||||
|
||||
format = "crystal";
|
||||
|
|
|
|||
|
|
@ -21,6 +21,21 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
# Transform omniidl_be into a PEP420 namespace to allow other projects to define
|
||||
# their omniidl backends. Especially useful for omniorbpy, the python backend.
|
||||
postInstall = ''
|
||||
rm $out/${python3.sitePackages}/omniidl_be/__init__.py
|
||||
rm $out/${python3.sitePackages}/omniidl_be/__pycache__/__init__.*.pyc
|
||||
'';
|
||||
|
||||
# Ensure postInstall didn't break cxx backend
|
||||
# Same as 'pythonImportsCheck = ["omniidl_be.cxx"];', but outside buildPythonPackage
|
||||
doInstallCheck = true;
|
||||
postInstallCheck = ''
|
||||
export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH
|
||||
${lib.getExe python3} -c "import omniidl_be.cxx"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A robust high performance CORBA ORB for C++ and Python";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,12 @@
|
|||
{ stdenv, lib, buildGoModule, fetchFromGitHub }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, lndir
|
||||
, testers
|
||||
, regclient
|
||||
}:
|
||||
|
||||
let bins = [ "regbot" "regctl" "regsync" ]; in
|
||||
|
||||
|
|
@ -20,22 +28,48 @@ buildGoModule rec {
|
|||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.VCSTag=${tag}"
|
||||
"-X github.com/regclient/regclient/internal/version.vcsTag=${tag}"
|
||||
];
|
||||
|
||||
postInstall =
|
||||
lib.concatStringsSep "\n" (
|
||||
map (bin: ''
|
||||
mkdir -p ''$${bin}/bin &&
|
||||
mv $out/bin/${bin} ''$${bin}/bin/ &&
|
||||
ln -s ''$${bin}/bin/${bin} $out/bin/
|
||||
'') bins
|
||||
);
|
||||
nativeBuildInputs = [ installShellFiles lndir ];
|
||||
|
||||
postInstall = lib.concatMapStringsSep "\n"
|
||||
(bin: ''
|
||||
export bin=''$${bin}
|
||||
export outputBin=bin
|
||||
|
||||
mkdir -p $bin/bin
|
||||
mv $out/bin/${bin} $bin/bin
|
||||
|
||||
installShellCompletion --cmd ${bin} \
|
||||
--bash <($bin/bin/${bin} completion bash) \
|
||||
--fish <($bin/bin/${bin} completion fish) \
|
||||
--zsh <($bin/bin/${bin} completion zsh)
|
||||
|
||||
lndir -silent $bin $out
|
||||
|
||||
unset bin outputBin
|
||||
'')
|
||||
bins;
|
||||
|
||||
passthru.tests = lib.mergeAttrsList (
|
||||
map
|
||||
(bin: {
|
||||
"${bin}Version" = testers.testVersion {
|
||||
package = regclient;
|
||||
command = "${bin} version";
|
||||
version = tag;
|
||||
};
|
||||
})
|
||||
bins
|
||||
);
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Docker and OCI Registry Client in Go and tooling using those libraries";
|
||||
homepage = "https://github.com/regclient/regclient";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ maxbrunet ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-machete";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bnjbvr";
|
||||
repo = "cargo-machete";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xLquursKMpV6ZELCRBrAEZ40Ypx2+vtpTVmVvOPdYS4=";
|
||||
hash = "sha256-8ktiBnlcnC4QD3rIox8rfxhF0ZWOlbok8rK7fnqeZOM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-F0pNAZ5ZcpGrfYt1TqtBcC2WUwjOEYf/yHero250fl0=";
|
||||
cargoHash = "sha256-emW/TDpeh/7hgqTgXAZeQwzkSIktDxk3Lp3JyhdTSRo=";
|
||||
|
||||
# tests require internet access
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-update";
|
||||
version = "13.3.0";
|
||||
version = "13.4.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-owiMVeH7m4LoM8c4qjLyFx3v/+Flzt+C+O8qEuXazvc=";
|
||||
sha256 = "sha256-/9igT1/3ck8Roy2poq1urf+cLblentOB7S9Hh6uqIEw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WtNH62DBo6WFOUcHnZxn0Jco4SUmhO0+1wXPRB2wxic=";
|
||||
cargoHash = "sha256-pdWVp9+CLnNO7+U0a8WXWHZ+EeGNYx9J7WWAI1MTDvc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "turso-cli";
|
||||
version = "0.89.0";
|
||||
version = "0.90.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tursodatabase";
|
||||
repo = "turso-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BFL5D4GkcYdHkEc5448jgQflhhncePYfHMTprPynvmU=";
|
||||
hash = "sha256-NkCkInQLwGwb8bFeRTSk2rpuPBOkMvWBgVx2IFFyRFQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oxlIaSSLZ6JirvUPOIHirp43G5qrDFJhNd6HjA9UYKo=";
|
||||
|
|
|
|||
|
|
@ -15,24 +15,15 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SpaceCadetPinball";
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k4zmu2a";
|
||||
repo = pname;
|
||||
rev = "Release_${version}";
|
||||
sha256 = "sha256-LmYplJr1Mg4yNg9eP02FXf9mL1FnzNBhpted3GpmlQ0=";
|
||||
hash = "sha256-W2P7Txv3RtmKhQ5c0+b4ghf+OMsN+ydUZt+6tB+LClM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# remove when updating past 2.0.1
|
||||
(fetchpatch {
|
||||
name = "fix-install-directories";
|
||||
url = "https://github.com/k4zmu2a/SpaceCadetPinball/commit/d8ee1b9bfeee21d3981a40e735411393392bc1f6.patch";
|
||||
sha256 = "sha256-BtCDJ+a9AFaOM8nyId0eU9GN/gUQT2kFCO4RIVTzZlE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
buildInputs = [
|
||||
SDL2
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "geoserver";
|
||||
version = "2.24.2";
|
||||
version = "2.25.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip";
|
||||
sha256 = "sha256-1ArG7CneJRY9y6rYaVjNU6L6RsUgVvjpwt07Rd+WGrE=";
|
||||
sha256 = "sha256-maWDRRIo5Mqjb6K1NWFplmQwvJ9fLXGnelZcslwp4Oo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@ let
|
|||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "homepage-dashboard";
|
||||
version = "0.8.9";
|
||||
version = "0.8.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gethomepage";
|
||||
repo = "homepage";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wG7+w6Hsqs1skxUyEMx2j3R8qh3dHXtBg2ADdWBPc/g=";
|
||||
hash = "sha256-mWUjBRepV7RjX4aPzRks/7NUbPyhaxSqarqnIM0NDQs=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ZpH9rVe3bAhVbq7uTVDvaPpA6XRRKT/ySdytZMlemCE=";
|
||||
|
|
|
|||
|
|
@ -1,17 +1,14 @@
|
|||
diff -u openafs-1.8.0/src/bozo/bosserver.c /tmp/buffer-content-13110-gd
|
||||
--- openafs-1.8.0/src/bozo/bosserver.c
|
||||
+++ #<buffer bosserver.c>
|
||||
@@ -244,24 +244,6 @@
|
||||
diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
|
||||
index 371cb638e4..e4d58c3562 100644
|
||||
--- a/src/bozo/bosserver.c
|
||||
+++ b/src/bozo/bosserver.c
|
||||
@@ -246,20 +246,6 @@ MakeDir(const char *adir)
|
||||
static int
|
||||
CreateDirs(const char *coredir)
|
||||
{
|
||||
- if ((!strncmp
|
||||
- (AFSDIR_USR_DIRPATH, AFSDIR_CLIENT_ETC_DIRPATH,
|
||||
- strlen(AFSDIR_USR_DIRPATH)))
|
||||
- ||
|
||||
- (!strncmp
|
||||
- if (!strncmp
|
||||
- (AFSDIR_USR_DIRPATH, AFSDIR_SERVER_BIN_DIRPATH,
|
||||
- strlen(AFSDIR_USR_DIRPATH)))) {
|
||||
- strlen(AFSDIR_USR_DIRPATH))) {
|
||||
- if (MakeDir(AFSDIR_USR_DIRPATH))
|
||||
- return errno;
|
||||
- }
|
||||
|
|
@ -26,5 +23,3 @@ diff -u openafs-1.8.0/src/bozo/bosserver.c /tmp/buffer-content-13110-gd
|
|||
if (MakeDir(AFSDIR_SERVER_ETC_DIRPATH))
|
||||
return errno;
|
||||
if (MakeDir(AFSDIR_SERVER_LOCAL_DIRPATH))
|
||||
|
||||
Diff finished. Fri Jun 29 15:45:46 2018
|
||||
|
|
|
|||
|
|
@ -33,80 +33,150 @@ stdenv.mkDerivation {
|
|||
inherit src;
|
||||
|
||||
patches = [
|
||||
# cf: Fix cast-function-type err w/disable-checking
|
||||
(fetchpatch {
|
||||
url = "https://git.openafs.org?p=openafs.git;a=patch;h=6867a3e8429f37fb748575df52256227ae9e5b53";
|
||||
hash = "sha256-FDvOFDzl2eFN7ZKUqQBQSWGo0ntayc8NCYh/haVi8Ng=";
|
||||
# afs: Make afs_AllocDCache static
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15679/revisions/889d335497aa9f5ee38789fb50fc15694b8e17f8/patch";
|
||||
hash = "sha256-XJAiZ7XL+QFk3l0CUSzudUSGC+oC7v4Kew9TWmEKvNg=";
|
||||
})
|
||||
# LINUX: Make 'fs flush*' invalidate dentry
|
||||
(fetchpatch {
|
||||
url = "https://git.openafs.org?p=openafs.git;a=patch;h=898098e01e19970f80f60a0551252b2027246038";
|
||||
hash = "sha256-ehwRrzpqB8iJKuZ/18oJsrHVlKQs6EzCNaPtSG1m0sw=";
|
||||
# LINUX: Minor osi_vfsop.c cleanup
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15680/revisions/342e9cbad84c762934787106a4a8baab7cd7f5aa/patch";
|
||||
hash = "sha256-kw8CQrpK9caq8eXrCEbk2zTSb727d8NmaSQg0Bg/TAM=";
|
||||
})
|
||||
# Linux 6.5: Replace generic_file_splice_read
|
||||
(fetchpatch {
|
||||
url = "https://git.openafs.org?p=openafs.git;a=patch;h=fef245769366efe8694ddadd1e1f2ed5ef8608f4";
|
||||
hash = "sha256-TD1xYvlc9aJyravNZLPhceeOwBawvn0Ndxd50rszTJU=";
|
||||
# afs: Remove SRXAFSCB_GetDE
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15681/revisions/27e7adf192a1dd07505e0b3d0c89426910f7daa4/patch";
|
||||
hash = "sha256-3AMq5fAUt/HAIRuh/GAWPov3gwvMzVAqzmvpIKZLbBo=";
|
||||
})
|
||||
# LINUX: Make sysctl definitions more concise
|
||||
(fetchpatch {
|
||||
url = "https://git.openafs.org?p=openafs.git;a=patch;h=d15c7ab50c92671052cbe9a93b0440c81156d8aa";
|
||||
hash = "sha256-6K593AJvgC34RfnIqW8+0A/v9cF6tsbVMeKpCv+QrK4=";
|
||||
# afs: remove dead ICL (fstrace) code
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15682/revisions/61d3bef0ded0999366e6487d39ab6aabaaceeb71/patch";
|
||||
hash = "sha256-4LnNwJ7xZAoPqHnyKai4kCEGiG037rlZwkEjmD6xBeM=";
|
||||
})
|
||||
# Linux 6.5: Use register_sysctl()
|
||||
(fetchpatch {
|
||||
url = "https://git.openafs.org?p=openafs.git;a=patch;h=63801cfd1fc06ec3259fcfd67229f3a3c70447ed";
|
||||
hash = "sha256-eoQxaZ28OanSoaHRJcfvXQORbe21YLhwPLoJUILjMkU=";
|
||||
# cf: Add function prototypes for linux conftest
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15683/revisions/f7f37de075700bda5f75c405f0f775ea4e118089/patch";
|
||||
hash = "sha256-6tceVLqrhdo5QWjOCvutvZmetopz+tyP5AtJUh7Kkkc=";
|
||||
})
|
||||
# hcrypto: rename abort to _afscrypto_abort
|
||||
(fetchpatch {
|
||||
url = "https://git.openafs.org?p=openafs.git;a=patch;h=538f450033a67e251b473ff92238b3124b85fc72";
|
||||
hash = "sha256-ztfJQKvGHGdWQe/0+BGkgRFxOi3n4YY+EFxgbD3DO1E=";
|
||||
# afs: Remove DFlushDCache()
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15684/revisions/e0f425a3d8bccb48a69f27dff209e32cf05f4305/patch";
|
||||
hash = "sha256-/S4uZj+cScPFihvJDW49dQ2awrt7Thx7tIpoImIl/kg=";
|
||||
})
|
||||
# cf: Avoid nested C functions built by autoconf
|
||||
(fetchpatch {
|
||||
url = "https://git.openafs.org?p=openafs.git;a=patch;h=d50ced2a17e05884ea18bb3dfcde6378b2531dc7";
|
||||
hash = "sha256-dK2/9bGhlXCPCB9t9T/K2dKdRBShVKXtYXWPttsOhAM=";
|
||||
# afs: Remove afs_MemExtendEntry()
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15685/revisions/aae8b00d97585b60702151c6f28ff7ec4d65c2d9/patch";
|
||||
hash = "sha256-9CA0lwiNjzeteAPXh/Yyu3gqZBSi2b9XBrl43w2VzSs=";
|
||||
})
|
||||
# cf: Use static allocated structs for cf tests
|
||||
(fetchpatch {
|
||||
url = "https://git.openafs.org?p=openafs.git;a=patch;h=00f13c45d637249a0d698458e08c1b8e2da8e219";
|
||||
hash = "sha256-YNszJIxBDIsl3RgBcHEpNtYIrNLC0tnSbIOQvX0oZ+s=";
|
||||
# afs: Remove afs_osi_UnmaskUserLoop()
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15686/revisions/5312d069bc57d200ff65bf968c9bdff0f38fe653/patch";
|
||||
hash = "sha256-jBwd0zFidIfNx6csPSNp1RGCq1JKmXNXWbQnG2pIgvM=";
|
||||
})
|
||||
# LINUX: Pass an array of structs to register_sysctl
|
||||
(fetchpatch {
|
||||
url = "https://git.openafs.org?p=openafs.git;a=patch;h=5b647bf17a878271e1ce9882e41663770ee73528";
|
||||
hash = "sha256-9o4cr/KORtanTfuKMAMAOvePB+vK579rR85rY+m8VNM=";
|
||||
# afs: Remove dummy_PSetAcl()
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15687/revisions/056a7a8005a68cf2fb8be80668b139aa87a0de0b/patch";
|
||||
hash = "sha256-ExvIzyyqPijf5c1T3mpSqFefvbd42FpLIFYUpcc5fyk=";
|
||||
})
|
||||
# linux: Replace fop iterate with fop iterate_shared
|
||||
(fetchpatch {
|
||||
url = "https://git.openafs.org?p=openafs.git;a=patch;h=6de0a646036283266e1d4aeb583e426005ca5ad4";
|
||||
hash = "sha256-cL3ByjUS3QU8fSbuN7ZEEKyjb+6TbbZL10UKbSgNl6c=";
|
||||
# afs: Remove SRXAFSCB_FetchData/StoreData
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15688/revisions/073adec17a9b7b55d3672b17f7faa4a122ce6e9d/patch";
|
||||
hash = "sha256-dMVeHTdLde22cxtRzSJLI0MUKgZRYzVRjAeuKgMKFtQ=";
|
||||
})
|
||||
# Linux 6.6: convert to ctime accessor functions
|
||||
(fetchpatch {
|
||||
url = "https://git.openafs.org?p=openafs.git;a=patch;h=6413fdbc913834f2884989e5811841f4ccea2b5f";
|
||||
hash = "sha256-vdK25vfS5Yr0xQufzUk431FXHwMIWlP2UpLjqnobJWI=";
|
||||
# afs: Remove afs_DbgDisconFiles()
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15689/revisions/db913849047d0ec77e735f14dbbce63652209cc1/patch";
|
||||
hash = "sha256-v0kWFBEFdfpNQWzs4vA0Pu25ZR/nC36x6mqP3rOujxY=";
|
||||
})
|
||||
# Linux 6.6: Pass request_mask to generic_fillattr
|
||||
(fetchpatch {
|
||||
url = "https://git.openafs.org?p=openafs.git;a=patch;h=4f1d8104d17d2b4e95c7abaf5498db6b80aefa8f";
|
||||
hash = "sha256-XJpqbDB/LOuqZj3gPHlcLeGzAQCGvPH8ArgWf+sbBJU=";
|
||||
# afs: Add declaration for RXAFS_ResidencyCmd()
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15690/revisions/67e48c84b9971e6b865274408080fbf5ec7ba1ac/patch";
|
||||
hash = "sha256-jzZG7w0tOxkrcphiITHrfodCZ6wyGp1NVARLI/tfN3c=";
|
||||
})
|
||||
# Linux: Fix to use time_t instead of time64_t
|
||||
(fetchpatch {
|
||||
url = "https://git.openafs.org?p=openafs.git;a=patch;h=56763a199f92101c35d6b9b733302cb08fe0cdbe";
|
||||
hash = "sha256-A2z+smBLQg6k+cHPpNr2s/SgoYuCOMNLcvm5LFRiqeM=";
|
||||
# roken: Declare ct_memcmp in hcrypto kernel roken.h
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15691/revisions/d1c89acf70a794b78c5daaff206d734e36bbec6d/patch";
|
||||
hash = "sha256-OrkUiybGI2jOsEqQFeGXTQqWvgp1NwttuPvokNkwxHw=";
|
||||
})
|
||||
# dir: Introduce struct DirEntryFlex
|
||||
(fetchpatch {
|
||||
url = "https://git.openafs.org?p=openafs.git;a=patch;h=fd527549c2d2b29a955f8c0427ac67c5d49ef38c";
|
||||
hash = "sha256-jblsaJuTt3BsW5MG69ETcao/ZzSuh9aKRZyTIxZ7Ty4=";
|
||||
# Linux 6.8: Add function prototypes for krb5
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15692/revisions/a14a9add73341bc3c355250bc43282e022bff95c/patch";
|
||||
hash = "sha256-PMnW4H/s2uKda3xbka2+2nz422pksttrYvsTf+omzrc=";
|
||||
})
|
||||
# Linux 6.7: convert to inode a/mtime accessor funcs
|
||||
(fetchpatch {
|
||||
url = "https://git.openafs.org?p=openafs.git;a=patch;h=6edf9d350c6ffd9d5e51fb8106701c1bc2f6a4d9";
|
||||
hash = "sha256-oQVyKzIcqzYDZHSut9Mw1t3kcEC5HGUX6eGlGJ9fZYo=";
|
||||
# afs: Declare init_hckernel_mutex()
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15693/revisions/112fb94a608a9a810cc9b43fdf762f15277d9eaa/patch";
|
||||
hash = "sha256-73zpSSF2yfbA7wxZVdKWnOqkMtdi/EkT8IjpXIMNUnc=";
|
||||
})
|
||||
# afs: Add includes to pick up function prototypes
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15694/revisions/87ab04acc921794f49084548cf5fc94f6f37f10e/patch";
|
||||
hash = "sha256-KCBjBLBH530+vr5hmA/r6RK7VYpoiJYgkks1pQplYXU=";
|
||||
})
|
||||
# afs: Move function prototypes into headers
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15695/revisions/0d9f6cf121e49cfe1a2047b98d4c30b82a1898bd/patch";
|
||||
hash = "sha256-WrfPZvNNVN3VuuBGH4sshpJOoPP2hwVitQW8PqQCBRA=";
|
||||
})
|
||||
# afs: Add afs_xioctl prototyes to afs_prototypes.h
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15696/revisions/dffd0e1475f9fb346a146607335c9f9d847d4429/patch";
|
||||
hash = "sha256-HJzTJlKNGjuXALXoaUjuQEr5Us2KLM9Exuj7jGqvHyg=";
|
||||
})
|
||||
# afs: Remove SRXAFSCB* protos from afs_prototypes.h
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15697/revisions/a87845d40aac04ff12dde369753c9472a8e4808d/patch";
|
||||
hash = "sha256-XO8+aL/yTkMdUT4sDRTFO3CspvO6nmF8M4Y/V0Y+dww=";
|
||||
})
|
||||
# rx: Add function prototypes to rx_prototypes.h
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15698/revisions/f5bafb0680a063d710b6e5e8ccf833f1dd371896/patch";
|
||||
hash = "sha256-KYGehW48hw71dAIdd5Z5U5Kvp72Gk4Tu2q+VA50LL7A=";
|
||||
})
|
||||
# afs: fix 'ops' variable may be used uninitialized
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15699/revisions/6b207567af7244a4fc6c314fdc815aa14c4eae09/patch";
|
||||
hash = "sha256-IIjuY9LL2BjnUh8W8n5ohUVY7RNk5qoH58JpimXqrNo=";
|
||||
})
|
||||
# afs: Add static attribute to internal functions
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15700/revisions/e157f8f39bd367151f5a9264c7d4ce8bcbed08fb/patch";
|
||||
hash = "sha256-LKBYqorko5HmaigKWFiIiYHgVnyc03UcQX6p8CjfYrs=";
|
||||
})
|
||||
# rx: Add static attribute to internal functions
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15701/revisions/2056ce8ae0d617d663e6181573c982994a1836db/patch";
|
||||
hash = "sha256-+Oq8CFI3+29WdCabrHV4+AU3U3fuyIUO+wYzy/QJ/24=";
|
||||
})
|
||||
# rxgen: Declare generated PKG_TranslateOpCode()
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15702/revisions/b77b304bb58f472e8a9d2f3b6d47fffd38d0c905/patch";
|
||||
hash = "sha256-iErcC/J9L7TrjnbkJw9yHXR4wHCM+KHai0vzs+KEgfo=";
|
||||
})
|
||||
# rxgen: Declare generated PKG_OpCodeStats()
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15703/revisions/e428053b5bc1250fdcc3ed8ac52ee798d96ad284/patch";
|
||||
hash = "sha256-copfhVvIa6zScehQm6gZ5FaIT42wr+YoFdhPCN50xn4=";
|
||||
})
|
||||
# Linux 6.8: use hlist iteration for dentry children
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15704/revisions/7cae97b86fbcc4a53967927d6c2cae9dcbc6ac4d/patch";
|
||||
hash = "sha256-NwF1CvdI9ZjISc1A/nJP4Ea1LJY4lBnsbkRqvQFo5Wc=";
|
||||
})
|
||||
# Linux 6.8: Remove ctl_table sentinels
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15705/revisions/81b910ab4a0ef0d0b6cd3a1a636fcbcd050c0245/patch";
|
||||
hash = "sha256-g8acwb7bGF+LjQN8tVKFLXvATddN+8gSepVoM28AehA=";
|
||||
})
|
||||
# Linux 6.8: Use roken's strlcpy() in kernel module
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15706/revisions/d9f3a2c6639e694c8d6fc4ad00d6a37d6e1f9bf6/patch";
|
||||
hash = "sha256-4P+9VkDhMezPHa47a5L92Rh+6PMGxF54Agdx4uAU63Y=";
|
||||
})
|
||||
# afs: Drop GLOCK for various Rx calls
|
||||
(fetchBase64Patch {
|
||||
url = "https://gerrit.openafs.org/changes/15707/revisions/0e983a9a7e010a4e7c8a4c60cf313e566323bbf1/patch";
|
||||
hash = "sha256-uHYuCxC0xAd8BQmNbTFGfVstq8LC2PM2aZ0EcWfRIJM=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ fetchurl }:
|
||||
rec {
|
||||
version = "1.8.10";
|
||||
version = "1.8.11";
|
||||
src = fetchurl {
|
||||
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
|
||||
hash = "sha256-n+wRNkYjVJ6NtzdAcvXI8BuEH2v+foVnPLzjX/Q/+wc=";
|
||||
hash = "sha256-4u+0cQmWt9IxmLU8Vilaj54k6KVVMXxfxjuBJaNxTs0=";
|
||||
};
|
||||
|
||||
srcs = [
|
||||
src
|
||||
(fetchurl {
|
||||
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
|
||||
hash = "sha256-nDgJ6K/qAX2K8lKPYM8OD5+oRU+shlM6PmciHy61+10=";
|
||||
hash = "sha256-OsarP52T1V3hd1eQOwST/JAg8eBALqMZ5hIIs5ALYHw=";
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abcMIDI";
|
||||
version = "2024.03.13";
|
||||
version = "2024.03.21";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
|
||||
hash = "sha256-lhnCf4Il3pRNY6tfb19qyRDbeuWSPK6JEmOrcG92MeI=";
|
||||
hash = "sha256-tK7+09vCZXj79jEY3Zxz1cdt5UdfOVy4gjqewdAMiP4=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ rustPlatform, lib, fetchFromGitHub, nixosTests }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "envfs";
|
||||
version = "1.0.3";
|
||||
version = "1.0.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "envfs";
|
||||
rev = version;
|
||||
hash = "sha256-WbMqh/MzEMfZmKl/DNBGnzG3l8unFmAYbG6feSiMz+Y=";
|
||||
hash = "sha256-kOfnKguvJQHW/AfQOetxVefjoEj7ec5ew6fumhOwP08=";
|
||||
};
|
||||
cargoHash = "sha256-RoreNBZvTsVY87nbVibJBy4gsafFwAMctVncAhhiaP8=";
|
||||
cargoHash = "sha256-isx4jBsA3HX6124R3qtwTqH5fLTAP7xdQD5bTzCAybo=";
|
||||
|
||||
passthru.tests = {
|
||||
envfs = nixosTests.envfs;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
, rustPlatform
|
||||
, darwin
|
||||
, pandoc
|
||||
, pkg-config
|
||||
, openssl
|
||||
, installShellFiles
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
|
|
@ -16,19 +18,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fend";
|
||||
version = "1.4.3";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "printfn";
|
||||
repo = "fend";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-X96r5wN5eq1PZD/JGqnG/0kg6PYEdnj5h9zc+GXQjQM=";
|
||||
hash = "sha256-l4AZpvLMmNuUWHqm5b0ngBxSHh5CV0SMOyKSF4LaxSI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UIZs45OQ1j57VEb6g4P0AwjmEsjMt0am5FUXXDODaWI=";
|
||||
cargoHash = "sha256-mx0KXGbSxn54JUyLVJms/AdPseKA9QH1Ixi7XKydf2w=";
|
||||
|
||||
nativeBuildInputs = [ pandoc installShellFiles copyDesktopItems ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
nativeBuildInputs = [ pandoc installShellFiles pkg-config copyDesktopItems ];
|
||||
buildInputs = [ pkg-config openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
postBuild = ''
|
||||
patchShebangs --build ./documentation/build.sh
|
||||
|
|
@ -82,7 +84,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "Arbitrary-precision unit-aware calculator";
|
||||
homepage = "https://github.com/printfn/fend";
|
||||
changelog = "https://github.com/printfn/fend/releases/tag/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ djanatyn liff ];
|
||||
mainProgram = "fend";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, ant, jdk, hdf4, hdf5, makeDesktopItem, copyDesktopItems }:
|
||||
{ lib, stdenv, fetchurl, ant, jdk, hdf4, hdf5, makeDesktopItem, copyDesktopItems, strip-nondeterminism, stripJavaArchivesHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hdfview";
|
||||
|
|
@ -14,12 +14,16 @@ stdenv.mkDerivation rec {
|
|||
./0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch
|
||||
# Disable signing on macOS
|
||||
./disable-mac-signing.patch
|
||||
# Remove timestamp comment from generated versions.properties file
|
||||
./remove-properties-timestamp.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
ant
|
||||
jdk
|
||||
copyDesktopItems
|
||||
strip-nondeterminism
|
||||
stripJavaArchivesHook
|
||||
];
|
||||
|
||||
HDFLIBS = (hdf4.override { javaSupport = true; }).out;
|
||||
|
|
@ -64,6 +68,11 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
# Remove build timestamp from javadoc files
|
||||
find $out/lib/app{,/mods}/doc/javadocs -name "*.html" -exec strip-nondeterminism --type javadoc {} +
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A visual tool for browsing and editing HDF4 and HDF5 files";
|
||||
license = lib.licenses.free; # BSD-like
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/build.xml b/build.xml
|
||||
index fcc4931..2afeb6c 100644
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -345,6 +345,9 @@
|
||||
<entry key="HDF5_VERSION" value="${hdf5.version}"/>
|
||||
<entry key="HDFVIEW_VERSION" value="${app.version}"/>
|
||||
</propertyfile>
|
||||
+ <exec executable="sed" failonerror="true">
|
||||
+ <arg line="-i /#/d ${classes.dir}/hdf/versions.properties" />
|
||||
+ </exec>
|
||||
</target>
|
||||
|
||||
<target name="compile" depends="clean, create-property-file, compileobj, compilehdf4, compilefits, compilenc2, compilehdf5">
|
||||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nexttrace";
|
||||
version = "1.2.8";
|
||||
version = "1.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nxtrace";
|
||||
repo = "NTrace-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fd6d9wtapztPZpbRn73q35D6LfHpfjF4KRBgokWIWYc=";
|
||||
sha256 = "sha256-cnFFlEgq3zYIvVAe7ocw4oiqZQHINvrquBfylm2+dCw=";
|
||||
};
|
||||
vendorHash = "sha256-xGE2iUCWMNfiI18N8dyubuhhaY5JD/sy1uRSDyTSqVA=";
|
||||
vendorHash = "sha256-eNRJxz/rbqf1mVRvE83JXUR3/F7XmBhfsOvxaSgDRjc=";
|
||||
|
||||
doCheck = false; # Tests require a network connection.
|
||||
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openvpn";
|
||||
version = "2.6.9";
|
||||
version = "2.6.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://swupdate.openvpn.net/community/releases/openvpn-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-4I0UfhW0UI380dZhih8h8UlfmBeo2twe3fBTL6EW1+M=";
|
||||
hash = "sha256-GZO7t7nttDBibqokVz+IH9PfZC9Cf8uCSxrtH8obzJs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
, openssl
|
||||
, p11-kit
|
||||
, pcsclite
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ];
|
||||
nativeBuildInputs = [ wrapGAppsHook autoreconfHook autoconf-archive pkg-config makeWrapper ];
|
||||
buildInputs = [ curl gtk3 libassuan libbsd libproxy libxml2 openssl p11-kit pcsclite ];
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "swtpm";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stefanberger";
|
||||
repo = "swtpm";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-QKR5S7FlMFDw4+VpyRdqixMWyzLpQkf3QCUceQvsliU=";
|
||||
hash = "sha256-48/BOzGPoKr/BGEXFo3FXWr6ZoPB+ixZIvv78g6L294=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -101,5 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.baloo ];
|
||||
mainProgram = "swtpm";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -20,6 +20,9 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoHash = "sha256-K0T0uTERjxlI3bGG/Tz6sJ0A08J0ROAhpppdZcdQPB8=";
|
||||
|
||||
# used for "Server Installed" version in admin panel
|
||||
env.VW_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = with lib; [ openssl ]
|
||||
++ optionals stdenv.isDarwin [ libiconv Security CoreServices SystemConfiguration ]
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "asciigraph";
|
||||
version = "0.5.6";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guptarohit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZmH0+UXPUyO90ZI6YsKiTd6Nf8dgZAgm7Qx8PVUkHAU=";
|
||||
sha256 = "sha256-tImHxTVKFFE5RcHCyJ3dyV6kGp3keZzDRhpHsp+IGB0=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
let
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "highlight";
|
||||
version = "4.10";
|
||||
version = "4.11";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "saalen";
|
||||
repo = "highlight";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WBX5WQXGgB7n7htxHxpBNIE1wFCFht6sMy5lkqeieqM=";
|
||||
sha256 = "sha256-8QWcpSYkzw62XFyIqisM2x1AOqzVUPUYgs5bPA4liSw=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -237,6 +237,7 @@ mapAliases ({
|
|||
docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27
|
||||
docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27
|
||||
docker-machine-xhyve = throw "'docker-machine-xhyve' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27
|
||||
docker-proxy = throw "`docker-proxy` has been merged to the main repo of Moby since Docker 22.06"; # Added 2024-03-14
|
||||
dogecoin = throw "'dogecoin' has been removed, as it was broken and unmaintained"; # Added 2024-03-11
|
||||
dogecoind = throw "'dogecoind' has been removed, as it was broken and unmaintained"; # Added 2024-03-11
|
||||
dolphin-emu-beta = dolphin-emu; # Added 2023-02-11
|
||||
|
|
|
|||
|
|
@ -3337,8 +3337,6 @@ with pkgs;
|
|||
|
||||
autospotting = callPackage ../applications/misc/autospotting { };
|
||||
|
||||
autosuspend = callPackage ../os-specific/linux/autosuspend { };
|
||||
|
||||
avfs = callPackage ../tools/filesystems/avfs { };
|
||||
|
||||
aliyun-cli = callPackage ../tools/admin/aliyun-cli { };
|
||||
|
|
@ -30611,8 +30609,6 @@ with pkgs;
|
|||
docker = docker_24;
|
||||
docker-client = docker.override { clientOnly = true; };
|
||||
|
||||
docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
|
||||
|
||||
docker-gc = callPackage ../applications/virtualization/docker/gc.nix { };
|
||||
docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { };
|
||||
docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { };
|
||||
|
|
|
|||
|
|
@ -251,7 +251,9 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP
|
|||
|
||||
qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { };
|
||||
|
||||
qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { };
|
||||
qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum {
|
||||
qt6Kvantum = pkgs.qt6Packages.qtstyleplugin-kvantum;
|
||||
};
|
||||
|
||||
quazip = callPackage ../development/libraries/quazip { };
|
||||
|
||||
|
|
|
|||
|
|
@ -79,9 +79,7 @@ makeScopeWithSplicing' {
|
|||
|
||||
qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { };
|
||||
|
||||
qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum {
|
||||
qt5Kvantum = pkgs.libsForQt5.qtstyleplugin-kvantum;
|
||||
};
|
||||
qtstyleplugin-kvantum = kdePackages.callPackage ../development/libraries/qtstyleplugin-kvantum { };
|
||||
|
||||
qtutilities = callPackage ../development/libraries/qtutilities { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue