mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
a86f721682
|
|
@ -203,7 +203,11 @@ rec {
|
|||
|
||||
in if missingArgs == {}
|
||||
then makeOverridable f allArgs
|
||||
else throw "lib.customisation.callPackageWith: ${error}";
|
||||
# This needs to be an abort so it can't be caught with `builtins.tryEval`,
|
||||
# which is used by nix-env and ofborg to filter out packages that don't evaluate.
|
||||
# This way we're forced to fix such errors in Nixpkgs,
|
||||
# which is especially relevant with allowAliases = false
|
||||
else abort "lib.customisation.callPackageWith: ${error}";
|
||||
|
||||
|
||||
/* Like callPackage, but for a function that returns an attribute
|
||||
|
|
|
|||
|
|
@ -98,6 +98,9 @@ rec {
|
|||
{ cpu = { family = "riscv"; }; }
|
||||
{ cpu = { family = "x86"; }; }
|
||||
];
|
||||
|
||||
isElf = { kernel.execFormat = execFormats.elf; };
|
||||
isMacho = { kernel.execFormat = execFormats.macho; };
|
||||
};
|
||||
|
||||
# given two patterns, return a pattern which is their logical AND.
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
, libxkbcommon
|
||||
, wlroots
|
||||
, xorg
|
||||
, gitUpdater
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
|
|
@ -71,7 +72,13 @@ in stdenv.mkDerivation rec {
|
|||
patchShebangs build-aux/post_install.py
|
||||
'';
|
||||
|
||||
passthru.tests.phosh = nixosTests.phosh;
|
||||
passthru = {
|
||||
tests.phosh = nixosTests.phosh;
|
||||
updateScript = gitUpdater {
|
||||
url = "https://gitlab.gnome.org/World/Phosh/phoc";
|
||||
rev-prefix = "v";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wayland compositor for mobile phones like the Librem 5";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubectl-gadget";
|
||||
version = "0.23.1";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inspektor-gadget";
|
||||
repo = "inspektor-gadget";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rlsjkjJg0IRGRBpTGhKTpMVQgxhizN7P+py2R+sczrk=";
|
||||
hash = "sha256-JC6+6PADTfxpVRowh09fXC8EO/qIsUTTba2uYxxxJ/A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+DXQ4Rgd7egKsDyU0/WQgninlsjPHFAoHy/sSQYE1p8=";
|
||||
vendorHash = "sha256-7pwEQ1O3i4SmVSTTmOX9KPR0ePdDpf2dQgD4e6fDyzQ=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gridtracker";
|
||||
version = "1.23.1207";
|
||||
version = "1.24.0104";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gridtracker.org";
|
||||
repo = "gridtracker";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r7H+fds8FbSLDxPQqn0XUPC6loLgsaNX+DBqJJ96/d4=";
|
||||
sha256 = "sha256-p3PdYOk0yvG3QkM17grzZmf9upK1n0zo4aOrlhGTvTU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
libsForQt5.mkDerivation rec {
|
||||
pname = "kgeotag";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
repo = "kgeotag";
|
||||
owner = "graphics";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-az/kXEhD/RGfxOMiLEcb651WVPcyBSa8B2sWOF7bz8E=";
|
||||
hash = "sha256-G9SyGvoSOL6nsWnMuSIUSFHFUwZUzExBJBkKN46o8GI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
inherit buildUnstable;
|
||||
}).overrideAttrs (finalAttrs: _: {
|
||||
pname = "renode-unstable";
|
||||
version = "1.14.0+20231229gita76dac0ae";
|
||||
version = "1.14.0+20240106git1b3952c2c";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
|
||||
hash = "sha256-fvwNN3sT8VZ7XJPrfpAbjSiuAB274QhuPeekwz0AU3c=";
|
||||
hash = "sha256-tDo/01jYoq1Qg8h0BS4BQSPh3rsINpe72eMk9UBWgR0=";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
--run 'echo "You may now open a web browser on http://localhost:$port"' \
|
||||
--add-flags '-S "localhost:$port" -t public'
|
||||
|
||||
runHook preInstall
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -9,14 +9,16 @@
|
|||
, libnotify
|
||||
, libxml2
|
||||
, libcanberra-gtk3
|
||||
, mod_dnssd
|
||||
, apacheHttpd
|
||||
, apacheHttpdPackages
|
||||
, hicolor-icon-theme
|
||||
, mate
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (apacheHttpdPackages) apacheHttpd mod_dnssd;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-user-share";
|
||||
version = "1.26.0";
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ final: _: {
|
|||
autoAddCudaCompatRunpathHook =
|
||||
final.callPackage
|
||||
(
|
||||
{makeSetupHook, cuda_compat}:
|
||||
{makeSetupHook, cuda_compat ? throw "autoAddCudaCompatRunpathHook: No cuda_compat for CUDA ${final.cudaMajorMinorVersion}" }:
|
||||
makeSetupHook
|
||||
{
|
||||
name = "auto-add-cuda-compat-runpath-hook";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gtk-layer-shell";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "devdoc"; # for demo
|
||||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "wmww";
|
||||
repo = "gtk-layer-shell";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-WW5sdOAJUKbSLWUpI9BK7O63/Uli+Tu9Tj9ccCOREPM=";
|
||||
hash = "sha256-8wpfoZcgusJdEbKGZ02UtOOcSogMTNP9Lm+ujo/eKdA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
, xorg
|
||||
, libpng
|
||||
, ffmpeg_4
|
||||
, ffmpeg
|
||||
, hwdata
|
||||
, seatd
|
||||
, vulkan-loader
|
||||
|
|
@ -57,7 +58,6 @@ let
|
|||
++ extraNativeBuildInputs;
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg_4
|
||||
libGL
|
||||
libcap
|
||||
libinput
|
||||
|
|
@ -116,6 +116,9 @@ rec {
|
|||
wlroots_0_15 = generic {
|
||||
version = "0.15.1";
|
||||
hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM=";
|
||||
extraBuildInputs = [
|
||||
ffmpeg_4
|
||||
];
|
||||
};
|
||||
|
||||
wlroots_0_16 = generic {
|
||||
|
|
@ -125,23 +128,20 @@ rec {
|
|||
substituteInPlace backend/drm/meson.build \
|
||||
--replace /usr/share/hwdata/ ${hwdata}/share/hwdata/
|
||||
'';
|
||||
extraBuildInputs = [
|
||||
ffmpeg_4
|
||||
];
|
||||
};
|
||||
|
||||
wlroots_0_17 = generic {
|
||||
version = "0.17.0";
|
||||
hash = "sha256-VUrnSG4UAAH0cBy15lG0w8RernwegD6lkOdLvWU3a4c=";
|
||||
version = "0.17.1";
|
||||
hash = "sha256-Z0gWM7AQqJOSr2maUtjdgk/MF6pyeyFMMTaivgt+RMI=";
|
||||
extraBuildInputs = [
|
||||
ffmpeg
|
||||
hwdata
|
||||
libliftoff
|
||||
libdisplay-info
|
||||
];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "tinywl-fix-wlroots-dependency-constraint-in-Makefile.patch";
|
||||
url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/fe53ec693789afb44c899cad8c2df70c8f9f9023.patch";
|
||||
hash = "sha256-wU62hXgmsAyT5j/bWeCFBkvM9cYjUntdCycQt5HAhb8=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
wlroots = wlroots_0_17;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
# dependencies
|
||||
, cmake
|
||||
, dateutil
|
||||
, python-dateutil
|
||||
, dbus-python
|
||||
, dnf4
|
||||
, gettext
|
||||
|
|
@ -54,7 +54,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dateutil
|
||||
python-dateutil
|
||||
dbus-python
|
||||
dnf4.py
|
||||
libcomps
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ezyrb";
|
||||
version = "1.3.0.post2312";
|
||||
version = "1.3.0.post2401";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "mathLab";
|
||||
repo = "EZyRB";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-uS0/Y4luCzJ2zJ0dQ84n4AsQXGWxUv/m5/xiJGPTGDI=";
|
||||
hash = "sha256-mNpW9RSli7af0fHLh+cmBrOQaO0wlGOrcLigefMR2ww=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "formulaic";
|
||||
version = "0.6.6";
|
||||
version = "1.0.1";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "matthewwardrop";
|
||||
repo = "formulaic";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-82+j3JAkjltXuzRhdvO4hoesSTWlNCY6w2mn6TsZqGM=";
|
||||
hash = "sha256-qivWv1LtFkW55tVKD/Zjd8Q5gVbxhDpZ0inkV6NR7bA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pot";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -28,8 +28,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "PythonOT";
|
||||
repo = "POT";
|
||||
rev = version;
|
||||
hash = "sha256-D61/dqO16VvcQx4FG1beKR4y1OQHndwCizaugNaUe4g=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-sq8jIWC2DD0T6675W4THbNethm7a//U8HuccKuK0Hjo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchFromGitHub, buildPythonPackage, radicale }:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "radicale_infcloud";
|
||||
pname = "radicale-infcloud";
|
||||
version = "unstable-2022-04-18";
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, argparse-dataclass
|
||||
, ConfigArgParse
|
||||
, configargparse
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
argparse-dataclass
|
||||
ConfigArgParse
|
||||
configargparse
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "snakemake_interface_common" ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
, aiosqlite
|
||||
, asyncmy
|
||||
, asyncpg
|
||||
, cx_oracle
|
||||
, cx-oracle
|
||||
, mariadb
|
||||
, mypy
|
||||
, mysql-connector
|
||||
|
|
@ -79,7 +79,7 @@ buildPythonPackage rec {
|
|||
mariadb
|
||||
];
|
||||
oracle = [
|
||||
cx_oracle
|
||||
cx-oracle
|
||||
];
|
||||
postgresql = [
|
||||
psycopg2
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "moon";
|
||||
version = "1.18.5";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonrepo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NZiFxcEdNdqR38VDJe4lC5maLTguk3+t78yG1zqXuA0=";
|
||||
hash = "sha256-BjSe5N9rFsVL5EueCbBTcnIJM4TYd5q/1wrsANCyniU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-BecaYeQYYoP7SubTktYqOejFyCTRolmUTV7rpGwXOGI=";
|
||||
cargoHash = "sha256-tMqk0aI+ObxlgAOa1inL8mba9ti9Gxhg9mckmyNsuv8=";
|
||||
|
||||
env = {
|
||||
RUSTFLAGS = "-C strip=symbols";
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helm-ls";
|
||||
version = "0.0.8";
|
||||
version = "0.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrjosh";
|
||||
repo = "helm-ls";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-q9RK7wTEbwptzNrXzifq6vUpOKD3idsG5FZKpQZ1uCc=";
|
||||
hash = "sha256-DfFXKkYrJbO4stBM/5qewhy1etvJS6ey12jmd/NIs8Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KyeXVS07+WUV+Q5Z9Q+SFp/q9KLLQBpuBH9kRSAh8qg=";
|
||||
vendorHash = "sha256-8mSX7fwgxwZ8aIXfv3WxLiVH5PjSFzcxM0oekod84tA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klipper";
|
||||
version = "unstable-2023-12-13";
|
||||
version = "unstable-2024-01-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KevinOConnor";
|
||||
repo = "klipper";
|
||||
rev = "f0753bd3381a86826082d5bf7a349c1f0b9f7e48";
|
||||
sha256 = "sha256-4xaee/7tXmR4/249lxHocana0KoesdH22/7HXWq1xwk=";
|
||||
rev = "b50d6669a8b491edf07602c0528d26abe8985536";
|
||||
sha256 = "sha256-qI+0bia5ROzXcuz0JVLdGyRa45NWTU/MH8dBUXGaHgA=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/klippy";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "weaviate";
|
||||
version = "1.23.0";
|
||||
version = "1.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaviate";
|
||||
repo = "weaviate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gm8PNNRnfnpLR5dS7nFfbvbZSSvTxbC4lUma2HI/+ZM=";
|
||||
hash = "sha256-sQp0RarW+SRxhDmXm1fSI1xEPKPMQ8coJiyJK5d2NlA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UEdGoXKq7ewNszahgcomjjuO2uzRZpiwkvvnXyFc9Og=";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ hello, checkpointBuildTools, runCommandNoCC, texinfo, stdenv, rsync }:
|
||||
{ hello, checkpointBuildTools, runCommand, texinfo, stdenv, rsync }:
|
||||
let
|
||||
baseHelloArtifacts = checkpointBuildTools.prepareCheckpointBuild hello;
|
||||
patchedHello = hello.overrideAttrs (old: {
|
||||
buildInputs = [ texinfo ];
|
||||
src = runCommandNoCC "patch-hello-src" { } ''
|
||||
src = runCommand "patch-hello-src" { } ''
|
||||
mkdir -p $out
|
||||
cd $out
|
||||
tar xf ${hello.src} --strip-components=1
|
||||
|
|
@ -24,7 +24,7 @@ let
|
|||
patches = [ ./hello-additionalFile.patch ];
|
||||
}));
|
||||
|
||||
preparedHelloRemoveFileSrc = runCommandNoCC "patch-hello-src" { } ''
|
||||
preparedHelloRemoveFileSrc = runCommand "patch-hello-src" { } ''
|
||||
mkdir -p $out
|
||||
cd $out
|
||||
tar xf ${hello.src} --strip-components=1
|
||||
|
|
@ -33,7 +33,7 @@ let
|
|||
|
||||
patchedHelloRemoveFile = hello.overrideAttrs (old: {
|
||||
buildInputs = [ texinfo ];
|
||||
src = runCommandNoCC "patch-hello-src" { } ''
|
||||
src = runCommand "patch-hello-src" { } ''
|
||||
mkdir -p $out
|
||||
cd $out
|
||||
${rsync}/bin/rsync -cutU --chown=$USER:$USER --chmod=+w -r ${preparedHelloRemoveFileSrc}/* .
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "moar";
|
||||
version = "1.18.6";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "walles";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QQapWDTJkP0YuyNR8J1N2IEETG1BfkdWv40SPD/JKYg=";
|
||||
hash = "sha256-7Wgt1LE+YmUlV4d79/sXoBmeH4KUhSNUVW5wjYUjg9Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-x6BeU6JDayCOi8T8+NvXZe59QmTaO9RAYwSiFlDPL/c=";
|
||||
vendorHash = "sha256-RJdjaq2meZ9E3g5E2B1PdRvVCVLwK0WMwM5uYOn3B34=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minio-client";
|
||||
version = "2023-10-30T18-43-32Z";
|
||||
version = "2024-01-05T05-04-32Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "mc";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-4WYJaFVB/+ERMNKvfDZvJGEiImwISM8fXLbi+Y986AM=";
|
||||
sha256 = "sha256-1A5Nzlf9xBcOcPdKXZut+4ViUvsDa2uFtfN/nIRoUf8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YDXkJVFK09I/Ic3ZBlO2AtybH6+RfwLmBCldX4i41Po=";
|
||||
vendorHash = "sha256-rqlPUU9phbsw9cjGvU86DjA3cWhcoxX3kxQ1buLM+hg=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "cdxgen";
|
||||
version = "9.10.1";
|
||||
version = "9.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AppThreat";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FkOWkjf/TXjmSOMSTHvf/MhRtuIPFwGwMt1IUJdvKM0=";
|
||||
sha256 = "sha256-d4abSPP0dLi5xzq1CYxi1MSKogrQ+YcZjmlUEr5+oBQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-2DDLogGXT9G8tKJYxVtS7oa5szlaaQTs1kJcgq9GA7k=";
|
||||
npmDepsHash = "sha256-KLI6wJrP2s2UWkSC5zmFuC2sa2owRgAhnR4UVrI0ThY=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tuptime";
|
||||
version = "5.2.2";
|
||||
version = "5.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rfmoz";
|
||||
repo = "tuptime";
|
||||
rev = version;
|
||||
sha256 = "sha256-YrZP2sovAwwfDBoKoobgkf0+7RmYFUtrV9jfBmDsNL8=";
|
||||
sha256 = "sha256-kR+Pi7/nsRzmmvibp95wjj8/B/Q6FCDSn2A7vJ3sM94=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -30316,7 +30316,7 @@ with pkgs;
|
|||
aaxtomp3 = callPackage ../applications/audio/aaxtomp3 { };
|
||||
|
||||
abcde = callPackage ../applications/audio/abcde {
|
||||
inherit (python3Packages) eyeD3;
|
||||
inherit (python3Packages) eyed3;
|
||||
};
|
||||
|
||||
abiword = callPackage ../applications/office/abiword { };
|
||||
|
|
|
|||
|
|
@ -409,6 +409,7 @@ mapAliases ({
|
|||
qcodes-loop = throw "qcodes-loop has been removed due to deprecation"; # added 2023-11-30
|
||||
qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages";
|
||||
rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01
|
||||
radicale_infcloud = radicale-infcloud; # added 2024-01-07
|
||||
radio_beam = radio-beam; # added 2023-11-04
|
||||
ratelimiter = throw "ratelimiter has been removed, since it is unmaintained and broken"; # added 2023-10-21
|
||||
rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05
|
||||
|
|
|
|||
|
|
@ -12289,7 +12289,7 @@ self: super: with self; {
|
|||
|
||||
rachiopy = callPackage ../development/python-modules/rachiopy { };
|
||||
|
||||
radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud {
|
||||
radicale-infcloud = callPackage ../development/python-modules/radicale-infcloud {
|
||||
radicale = pkgs.radicale.override { python3 = python; };
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue