mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
2e27a36b4b
@ -19,6 +19,9 @@ pandoc_flags = --extract-media=$(pandoc_media_dir) \
|
||||
.PHONY: all
|
||||
all: validate format out/html/index.html out/epub/manual.epub
|
||||
|
||||
.PHONY: render-md
|
||||
render-md: ${MD_TARGETS}
|
||||
|
||||
.PHONY: debug
|
||||
debug:
|
||||
nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml"
|
||||
|
||||
@ -20,6 +20,10 @@ in pkgs.stdenv.mkDerivation {
|
||||
ln -s ${doc-support} ./doc-support/result
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
make -j$NIX_BUILD_CORES render-md
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
dest="$out/share/doc/nixpkgs"
|
||||
mkdir -p "$(dirname "$dest")"
|
||||
|
||||
@ -192,6 +192,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- `lib.systems.examples.ghcjs` and consequently `pkgsCross.ghcjs` now use the target triplet `javascript-unknown-ghcjs` instead of `js-unknown-ghcjs`. This has been done to match an [upstream decision](https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c) to follow Cabal's platform naming more closely. Nixpkgs will also reject `js` as an architecture name.
|
||||
|
||||
- `dokuwiki` has been updated from 2023-07-31a (Igor) to 2023-04-04 (Jack Jackrum), which has [completely removed](https://www.dokuwiki.org/changes#release_2023-04-04_jack_jackrum) the options to embed HTML and PHP for security reasons. The [htmlok plugin](https://www.dokuwiki.org/plugin:htmlok) can be used to regain this functionality.
|
||||
|
||||
- The old unsupported version 6.x of the ELK-stack and Elastic beats have been removed. Use OpenSearch instead.
|
||||
|
||||
- The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead.
|
||||
|
||||
@ -19,20 +19,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "amberol";
|
||||
version = "unstable-2023-01-12";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
rev = "0623386c813d0d68564002324958cef7217cec7f";
|
||||
hash = "sha256-nVL4ydTg4ncDCA9J9qWv+RPDC0Txr/qpo5XxIUiV0zQ=";
|
||||
rev = version;
|
||||
hash = "sha256-G1B+kDH1eWYA/j1t2xJPoGQasIJ77y+BKnnu/6VEWts=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-E0ivUWD3jP/T1GOJ11grDwcF+m92I+W2a2HhZX1bCso=";
|
||||
hash = "sha256-5hy2u1flUKZCM4OPFhoT5b3R8v3zBGtwN+e6kwY3LQ4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -4,19 +4,20 @@
|
||||
, cmake
|
||||
, libsecret
|
||||
, qtkeychain
|
||||
, qttools
|
||||
, restic
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "restique";
|
||||
version = "unstable-2021-05-03";
|
||||
version = "unstable-2022-11-29";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.srcbox.net";
|
||||
owner = "stefan";
|
||||
repo = "restique";
|
||||
rev = "f83ea63c2e2f2a41e845f54c7fe2c391a528a121";
|
||||
sha256 = "0j1qihv7hd90xkfm4ksv74q6m7cq781fbdnc3l4spcd7h2p8lh0z";
|
||||
rev = "906b0b1726c26988c910baea9665f540c37c99c4";
|
||||
hash = "sha256-EYoADtYX+gm8T3/3gxTtdFOFGJf2rXryiTu8NIO0Ez4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -26,6 +27,7 @@ mkDerivation rec {
|
||||
buildInputs = [
|
||||
libsecret
|
||||
qtkeychain
|
||||
qttools
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
|
||||
@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.191.0";
|
||||
version = "1.191.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
hash = "sha256-wn2pSzz4w8tQjVFEIfR3/1ddeTjQBQaKl26SxXbOXG0=";
|
||||
hash = "sha256-jGIdDgSDgKXI9DHEmu2FRXjoFsvmxUbK5xoajLjX7zQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
8
pkgs/applications/editors/cudatext/deps.json
generated
8
pkgs/applications/editors/cudatext/deps.json
generated
@ -16,8 +16,8 @@
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.04.17",
|
||||
"hash": "sha256-QllXTq9BCKedt/Pv14qOn1UoxZ57qz76OyptnjT92hA="
|
||||
"rev": "2023.04.22",
|
||||
"hash": "sha256-12W0p18s15KFFIopgit8l/Bf1KjMZkP2kCAaeaoqfyQ="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
@ -26,8 +26,8 @@
|
||||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.04.17",
|
||||
"hash": "sha256-EdtrKYZTP+1MQU5fLO6vYoU3EjS91PaSQnIxtgAs7TI="
|
||||
"rev": "2023.04.18",
|
||||
"hash": "sha256-Eb8ynxZP3OQ7TGFZMbw8r0HXXvaoR6yotwnwK6nwZxg="
|
||||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "orbiton";
|
||||
version = "2.60.6";
|
||||
version = "2.61.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xyproto";
|
||||
repo = "orbiton";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uDxdv7HlswGsuM4UewZOO45/P9jIOo4bb0T1RrQqtpg=";
|
||||
hash = "sha256-GknQXHwpdIRzSjIc1ITsoiaks4Vi5KmVqL7sHzmfnmQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -103,6 +103,7 @@ in mkDerivation rec {
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jot";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "araekiel";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CgS9I05Om4JxAbPN0vxh2Y7dftIkVnZkRP7PY4kOfpw=";
|
||||
sha256 = "sha256-Z8szd6ArwbGiHw7SeAah0LrrzUbcQYygX7IcPUYNxvM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-8nRO01/hUKT6Jt7/3Sw2+aLU6hITSNl6nn9UEAvfyJY=";
|
||||
cargoHash = "sha256-x61lOwMOOLD3RTdy3Ji+c7zcA1PCn09u75MyrPX/NbE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rapid note management for the terminal";
|
||||
|
||||
@ -73,5 +73,6 @@ mkDerivation rec {
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ yvesf ];
|
||||
platforms = qtbase.meta.platforms;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
let
|
||||
pname = "localsend";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.AppImage";
|
||||
hash = "sha256-Setxw0urfJCiHI+Ms+Igroi1CLCgB0H5BsV6RkxyBME=";
|
||||
hash = "sha256-i5/haQHsw3BAOFGsHO41oiop1JgMISTr1Dw0tAeYupU=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg";
|
||||
hash = "sha256-uVZ/ULhr8CiV/wL9Yaw6q2IYAHNqld606ADKab/EVlU=";
|
||||
hash = "sha256-Ibojcg5To288c+v6IKMOjuLz970osiKJU7/K0VnIs8k=";
|
||||
};
|
||||
};
|
||||
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
@ -21,7 +21,7 @@ let
|
||||
linux = appimageTools.wrapType2 rec {
|
||||
inherit pname version src meta;
|
||||
|
||||
extraPkgs = p: [ p.libepoxy ];
|
||||
extraPkgs = p: [ p.ayatana-ido p.libayatana-appindicator p.libayatana-indicator p.libdbusmenu p.libepoxy ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/${pname}-${version} $out/bin/${pname}
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "seaweedfs";
|
||||
version = "3.46";
|
||||
version = "3.47";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seaweedfs";
|
||||
repo = "seaweedfs";
|
||||
rev = version;
|
||||
hash = "sha256-ur4GAgGyqbot3Z8GsJLAj6WUJJ0C7slubemJL021gLM=";
|
||||
hash = "sha256-0RDzTS/bjcXeYBWqRq/oWwI0kEmxYkT6oqCBYRi3dnQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9DH/mkISdJCacpB8Nt9DA9fyHqOEdH1GpFZ6TuRQgAQ=";
|
||||
vendorHash = "sha256-oXf+aZxf0jBiOqYzD9mTjYND0LjjQeHIZXIrqcEuyYk=";
|
||||
|
||||
subPackages = [ "weed" ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-subrepo";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ingydotnet";
|
||||
repo = "git-subrepo";
|
||||
rev = version;
|
||||
sha256 = "sha256-ZU5yYaiear5AjlBqtzabmMJNUa2ypeJKW3sQPIcyskM=";
|
||||
sha256 = "sha256-83N0Ek6DawUrOc6s2Utzi8776bX4UTGS/a/OffkV44Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,12 +2,25 @@
|
||||
fixupOutputHooks+=('convertDesktopFiles $prefix')
|
||||
|
||||
# Get a param out of a desktop file. First parameter is the file and the second
|
||||
# is a pattern of the key who's value we should fetch.
|
||||
# is the key who's value we should fetch.
|
||||
getDesktopParam() {
|
||||
local file="$1";
|
||||
local pattern="$2";
|
||||
local file="$1"
|
||||
local key="$2"
|
||||
local line k v
|
||||
|
||||
awk -F "=" "/${pattern}/ {print \$2}" "${file}"
|
||||
while read -r line; do
|
||||
if [[ "$line" = *=* ]]; then
|
||||
k="${line%%=*}"
|
||||
v="${line#*=}"
|
||||
|
||||
if [[ "$k" = "$key" ]]; then
|
||||
echo "$v"
|
||||
return
|
||||
fi
|
||||
fi
|
||||
done < "$file"
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
# Convert a freedesktop.org icon theme for a given app to a .icns file. When possible, missing
|
||||
@ -41,21 +54,30 @@ convertIconTheme() {
|
||||
$((iconSize - 2))x$((iconSize - 2))${scaleSuffix}
|
||||
)
|
||||
|
||||
local fallbackIcon=
|
||||
|
||||
for iconIndex in "${!candidateIcons[@]}"; do
|
||||
for maybeSize in "${validSizes[@]}"; do
|
||||
icon=${candidateIcons[$iconIndex]}
|
||||
if [[ $icon = */$maybeSize/* ]]; then
|
||||
if [[ $maybeSize = $exactSize ]]; then
|
||||
echo "fixed $icon"
|
||||
return 0
|
||||
else
|
||||
echo "threshold $icon"
|
||||
return 0
|
||||
fi
|
||||
elif [[ -a $icon ]]; then
|
||||
echo "fallback $icon"
|
||||
elif [[ -a $icon && -z "$fallbackIcon" ]]; then
|
||||
fallbackIcon="$icon"
|
||||
fi
|
||||
return 0
|
||||
done
|
||||
done
|
||||
|
||||
if [[ -n "$fallbackIcon" ]]; then
|
||||
echo "fallback $fallbackIcon"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "scalable"
|
||||
}
|
||||
|
||||
@ -68,6 +90,7 @@ convertIconTheme() {
|
||||
local density=$((72 * scale))x$((72 * scale))
|
||||
local dim=$((iconSize * scale))
|
||||
|
||||
echo "desktopToDarwinBundle: resizing icon $in to $out, size $dim" >&2
|
||||
magick convert -scale "${dim}x${dim}" -density "$density" -units PixelsPerInch "$in" "$out"
|
||||
}
|
||||
|
||||
@ -80,6 +103,8 @@ convertIconTheme() {
|
||||
if [[ $in != '-' ]]; then
|
||||
local density=$((72 * scale))x$((72 * scale))
|
||||
local dim=$((iconSize * scale))
|
||||
|
||||
echo "desktopToDarwinBundle: rasterizing svg $in to $out, size $dim" >&2
|
||||
rsvg-convert --keep-aspect-ratio --width "$dim" --height "$dim" "$in" --output "$out"
|
||||
magick convert -density "$density" -units PixelsPerInch "$out" "$out"
|
||||
else
|
||||
@ -121,6 +146,7 @@ convertIconTheme() {
|
||||
local icon=${iconResult#* }
|
||||
local scaleSuffix=${scales[$scale]}
|
||||
local result=${resultdir}/${iconSize}x${iconSize}${scales[$scale]}${scaleSuffix:+x}.png
|
||||
echo "desktopToDarwinBundle: using $type icon $icon for size $iconSize$scaleSuffix" >&2
|
||||
case $type in
|
||||
fixed)
|
||||
local density=$((72 * scale))x$((72 * scale))
|
||||
@ -190,14 +216,14 @@ processExecFieldCodes() {
|
||||
convertDesktopFile() {
|
||||
local -r file=$1
|
||||
local -r sharePath=$(dirname "$(dirname "$file")")
|
||||
local -r name=$(getDesktopParam "${file}" "^Name")
|
||||
local -r name=$(getDesktopParam "${file}" "Name")
|
||||
local -r macOSExec=$(getDesktopParam "${file}" "X-macOS-Exec")
|
||||
if [[ "$macOSExec" ]]; then
|
||||
local -r exec="$macOSExec"
|
||||
else
|
||||
local -r exec=$(processExecFieldCodes "${file}")
|
||||
fi
|
||||
local -r iconName=$(getDesktopParam "${file}" "^Icon")
|
||||
local -r iconName=$(getDesktopParam "${file}" "Icon")
|
||||
local -r squircle=$(getDesktopParam "${file}" "X-macOS-SquircleIcon")
|
||||
|
||||
mkdir -p "${!outputBin}/Applications/${name}.app/Contents/MacOS"
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
"linux-x64-flutter-gtk.zip" = "sha256-boICnuJF4zqGb7kaN5haO/df9hC9KeJidt3uIK06S7M=";
|
||||
};
|
||||
"linux-x64-profile" = {
|
||||
"linux-x64-flutter-gtk.zip" = "sha256-RAsgupVF18IxLaP8tJ7XRQ8y/um46nlpA8fDITPwLqY=";
|
||||
"linux-x64-flutter-gtk.zip" = "sha256-AnkLMPW3mwiXdiDz3Zo802QZRi+8EMCy4Mx2ODSbMOU=";
|
||||
};
|
||||
"linux-x64-release" = {
|
||||
"linux-x64-flutter-gtk.zip" = "sha256-RAsgupVF18IxLaP8tJ7XRQ8y/um46nlpA8fDITPwLqY=";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation,
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules,
|
||||
kauth, kconfig, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n,
|
||||
kidletime, kio, lmdb, qtbase, qtdeclarative, solid,
|
||||
@ -22,4 +22,5 @@ mkDerivation {
|
||||
substituteInPlace "$sourceRoot"/src/file/kde-baloo.service.in \
|
||||
--replace @KDE_INSTALL_FULL_BINDIR@ /run/current-system/sw/bin
|
||||
'';
|
||||
meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ mkDerivation
|
||||
{ mkDerivation, lib
|
||||
, extra-cmake-modules
|
||||
, qtbase, qtdeclarative
|
||||
}:
|
||||
@ -12,4 +12,5 @@ mkDerivation {
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace /lib/udev/rules.d "$bin/lib/udev/rules.d"
|
||||
'';
|
||||
meta.platforms = lib.platforms.linux;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation,
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules,
|
||||
boost, kactivities, kconfig, qtbase,
|
||||
}:
|
||||
@ -10,4 +10,5 @@ mkDerivation {
|
||||
buildInputs = [ boost kactivities kconfig ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
outputs = [ "out" "dev" ];
|
||||
meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation, propagate, wrapGAppsHook,
|
||||
mkDerivation, lib, propagate, wrapGAppsHook,
|
||||
extra-cmake-modules, kdoctools,
|
||||
gsettings-desktop-schemas, kconfig, kcoreaddons, kcrash, kdbusaddons,
|
||||
kservice, qtbase,
|
||||
@ -18,4 +18,5 @@ mkDerivation {
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation,
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules,
|
||||
kcoreaddons, ki18n, kpty, kservice, qtbase,
|
||||
}:
|
||||
@ -11,4 +11,5 @@ mkDerivation {
|
||||
propagatedBuildInputs = [ kpty ];
|
||||
outputs = [ "out" "dev" ];
|
||||
patches = [ ./kdesu-search-for-wrapped-daemon-first.patch ];
|
||||
meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, stdenv
|
||||
, extra-cmake-modules
|
||||
, attr
|
||||
, ebook_tools
|
||||
@ -17,8 +18,9 @@
|
||||
mkDerivation {
|
||||
pname = "kfilemetadata";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
attr
|
||||
] ++ [
|
||||
ebook_tools
|
||||
exiv2
|
||||
ffmpeg
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation, lib, writeScript,
|
||||
mkDerivation, lib, stdenv, writeScript,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework
|
||||
}:
|
||||
@ -21,6 +21,7 @@ mkDerivation {
|
||||
CXXFLAGS = [
|
||||
''-DNIXPKGS_KF5_KIOCORE=\"${getLib kio}/lib/libKF5KIOCore.so.5\"''
|
||||
''-DNIXPKGS_KF5_PARTS=\"${getLib kparts}/lib/libKF5Parts.so.5\"''
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
''-DNIXPKGS_KF5_PLASMA=\"${getLib plasma-framework}/lib/libKF5Plasma.so.5\"''
|
||||
];
|
||||
setupHook = writeScript "setup-hook.sh" ''
|
||||
|
||||
@ -21,7 +21,9 @@ mkDerivation {
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice
|
||||
kxmlgui qtbase qttools solid kded
|
||||
kxmlgui qtbase qttools solid
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
kded
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
patches = [
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ mkDerivation
|
||||
{ mkDerivation, lib, stdenv
|
||||
, extra-cmake-modules
|
||||
, kcodecs, kconfig, kcoreaddons, kwindowsystem
|
||||
, libdbusmenu
|
||||
, phonon
|
||||
, qttools, qtx11extras
|
||||
, qttools, qtx11extras, qtmacextras
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -11,5 +11,7 @@ mkDerivation {
|
||||
nativeBuildInputs = [ extra-cmake-modules qttools ];
|
||||
buildInputs = [
|
||||
kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
qtmacextras
|
||||
];
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation, propagateBin,
|
||||
mkDerivation, propagateBin, lib,
|
||||
extra-cmake-modules,
|
||||
plasma-wayland-protocols, qtbase, wayland, wayland-protocols
|
||||
}:
|
||||
@ -10,4 +10,5 @@ mkDerivation {
|
||||
buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
setupHook = propagateBin; # XDG_CONFIG_DIRS
|
||||
meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation,
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules,
|
||||
modemmanager, qtbase
|
||||
}:
|
||||
@ -9,4 +9,5 @@ mkDerivation {
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
propagatedBuildInputs = [ modemmanager qtbase ];
|
||||
outputs = [ "out" "dev" ];
|
||||
meta.platforms = lib.platforms.linux;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation,
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules,
|
||||
networkmanager, qtbase,
|
||||
}:
|
||||
@ -9,4 +9,5 @@ mkDerivation {
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
propagatedBuildInputs = [ networkmanager qtbase ];
|
||||
outputs = [ "out" "dev" ];
|
||||
meta.platforms = lib.platforms.linux;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation,
|
||||
mkDerivation, lib, stdenv,
|
||||
bison, extra-cmake-modules, flex,
|
||||
media-player-info, qtbase, qtdeclarative, qttools
|
||||
}:
|
||||
@ -7,8 +7,9 @@
|
||||
mkDerivation {
|
||||
pname = "solid";
|
||||
patches = [ ./fix-search-path.patch ];
|
||||
nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ];
|
||||
nativeBuildInputs = [ bison extra-cmake-modules flex ]
|
||||
++ lib.optionals stdenv.isLinux [ media-player-info ];
|
||||
buildInputs = [ qtdeclarative qttools ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
propagatedUserEnvPkgs = [ media-player-info ];
|
||||
propagatedUserEnvPkgs = lib.optionals stdenv.isLinux [ media-player-info ];
|
||||
}
|
||||
|
||||
15
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
15
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
@ -1144,7 +1144,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat"
|
||||
version = "1.113.0"
|
||||
version = "1.114.0"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"anyhow",
|
||||
@ -1175,6 +1175,7 @@ dependencies = [
|
||||
"libc",
|
||||
"log",
|
||||
"mailparse",
|
||||
"mime",
|
||||
"num-derive",
|
||||
"num-traits",
|
||||
"num_cpus",
|
||||
@ -1218,7 +1219,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat-jsonrpc"
|
||||
version = "1.113.0"
|
||||
version = "1.114.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-channel",
|
||||
@ -1241,7 +1242,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat-repl"
|
||||
version = "1.113.0"
|
||||
version = "1.114.0"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"anyhow",
|
||||
@ -1256,7 +1257,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat-rpc-server"
|
||||
version = "1.113.0"
|
||||
version = "1.114.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"deltachat",
|
||||
@ -1281,7 +1282,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "deltachat_ffi"
|
||||
version = "1.113.0"
|
||||
version = "1.114.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"deltachat",
|
||||
@ -2806,9 +2807,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mime"
|
||||
version = "0.3.16"
|
||||
version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
|
||||
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
|
||||
|
||||
[[package]]
|
||||
name = "minimal-lexical"
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.113.0";
|
||||
version = "1.114.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ft7BMgHGeTEM3WQVhAEjtyYYCfVFa2+ZkbdmDF22X9A=";
|
||||
hash = "sha256-fonrf4DZI5HhUY08yZmAHp2SKJYA2OywVBa31W7O1qU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -39,6 +39,7 @@ mkDerivation rec {
|
||||
# Missing license information https://github.com/Nitrux/maui-core/issues/1
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -25,8 +25,9 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://community.kde.org/Phonon";
|
||||
description = "Multimedia API for Qt";
|
||||
license = lib.licenses.lgpl2;
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ ttuegel ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "algolia-cli";
|
||||
version = "1.3.4";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "algolia";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OclNhqJ7BJwpwu8EWjZuIw/an4K7dETjynrU0Ju1yak=";
|
||||
hash = "sha256-tz05j2XkA3Dh1RlQf8KHuPSqGhbFc0fxSe0LC2d5FYU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QgNL7pp0KH1RUV69BFVtHpaLHrPp4UQhEtOEiRmfAi0=";
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bacon";
|
||||
version = "2.7.0";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qN1Jpv6hoIKVGGQXzon8P0O12YlIB7Dam1UxXL3TQrY=";
|
||||
hash = "sha256-3LoqG7t2InDBrfOk0vve/6C5Vjifq5L+Tt8ulMGuASg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-253j34Kxzsfe5UeiWRdV+2P0rbnTYig18cZ25HVKX+8=";
|
||||
cargoHash = "sha256-k41hF7qhT9Y7IBp7rzpRP9pTIf1ZQsEyslaHmss+NhE=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:
|
||||
|
||||
let
|
||||
version = "15.10.0";
|
||||
version = "15.11.0";
|
||||
in
|
||||
buildGoModule rec {
|
||||
inherit version;
|
||||
@ -17,13 +17,13 @@ buildGoModule rec {
|
||||
# For patchShebangs
|
||||
buildInputs = [ bash ];
|
||||
|
||||
vendorHash = "sha256-ASmhcaywnVb62lPZk1+0hHme7IgXylnk8DryhCjQ6dc=";
|
||||
vendorHash = "sha256-4eSfNo5S/eottEN4AptGJq6pBDHkNud0Nj5GrqutADM=";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-runner";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HwG23eqTPQFvziRKhbMdl5O4OlrC9lgha92J2hzRRS8=";
|
||||
sha256 = "sha256-S4KdEepNWv8J5+r/GT8+8kAKU5fq2iwQU+qyoCY1s0o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "duckscript_cli";
|
||||
version = "0.8.17";
|
||||
version = "0.8.18";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-fEAm7HhRGYZpGL9I8h3wX8AnPs00pG/ui7Rm+PaXJpA=";
|
||||
sha256 = "sha256-AbdGyRCeypmsBc2QdR4Tdl3MeUlK9xmNmB63axpUfFI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
|
||||
|
||||
cargoHash = "sha256-kll2q5HhcpizBDbWipj30F8WEQnjG1fndxCHoXBbik8=";
|
||||
cargoHash = "sha256-Exsgt1yV3EiEewzDU4YLhSYGpzr4t2o5hm3evyAkO44=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple, extendable and embeddable scripting language.";
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "supabase-cli";
|
||||
version = "1.48.1";
|
||||
version = "1.50.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BTUeGaWWkq1kMGInpu/zlJ7lFSSoiPlTDS/jjKe/uD4=";
|
||||
sha256 = "sha256-e/jPtNzuETky8uwg1TnFOGKppSPuEkBiEfmPwiUM3V0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-PAsmUEw6nI2KTrvPCn2Dxm3mrM6f/O4i8P6P0UuDXzo=";
|
||||
vendorSha256 = "sha256-j2iEeAn+4Tn3h8lVKoaYE+6W4R/q+JaAWXxHllZGLNs=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X" "github.com/supabase/cli/cmd.version=${version}" ];
|
||||
|
||||
|
||||
1624
pkgs/servers/static-web-server/Cargo.lock
generated
1624
pkgs/servers/static-web-server/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -2,21 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "static-web-server";
|
||||
version = "2.15.0";
|
||||
version = "2.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "static-web-server";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TzMXVwtvslM57ucHT5NHMjsLex2VjuvyqP9gMdQXfFs=";
|
||||
sha256 = "sha256-ZHJGUgFCguUszcpzXwAK1XH3Ds4b87pyiohabvIwMX4=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"headers-0.3.8" = "sha256-zi9ytzjq5M1TtLJxibEnUdx42T+2v5uH9+3+3et6RXQ=";
|
||||
};
|
||||
};
|
||||
cargoHash = "sha256-7JOJknBJuX0anzd6Oqp3HEzYtEQfRkcHdjNBzW59P+E=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
@ -31,7 +26,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "An asynchronus web server for static files-serving";
|
||||
homepage = "https://sws.joseluisq.net";
|
||||
homepage = "https://static-web-server.net/";
|
||||
changelog = "https://github.com/static-web-server/static-web-server/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dokuwiki";
|
||||
version = "2022-07-31a";
|
||||
version = "2023-04-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "splitbrain";
|
||||
owner = "dokuwiki";
|
||||
repo = pname;
|
||||
rev = "release_stable_${version}";
|
||||
sha256 = "sha256-gtWEtc3kbMokKycTx71XXblkDF39i926uN2kU3oOeVw=";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-QJnXKsEhvEcE88wvfMZR2j7X/pW8+28zlEnxhvhl+44=";
|
||||
};
|
||||
|
||||
preload = writeText "preload.php" ''
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "restic";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "restic";
|
||||
repo = "restic";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KdPslVJHH+xdUuFfmLZumP2lHzkDrrAvpDaj38SuP8o=";
|
||||
hash = "sha256-YJBHk/B8+q5f0k5i5hpucsJK4T/cRu9Jv7+O6vlT64Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -17,7 +17,7 @@ buildGoModule rec {
|
||||
./0001-Skip-testing-restore-with-permission-failure.patch
|
||||
];
|
||||
|
||||
vendorHash = "sha256-oetaCiXWEBUEf382l4sjO0SCPxkoh+bMTgIf/qJTQms=";
|
||||
vendorHash = "sha256-GWFaCfiE8Ph2uBTBI0E47pH+EJsMsMr1NDuaIGvyXRM=";
|
||||
|
||||
subPackages = [ "cmd/restic" ];
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, fetchurl, jdk, buildFHSEnv, unzip, makeDesktopItem }:
|
||||
let
|
||||
version = "2023.2.4";
|
||||
version = "2023.3.5";
|
||||
|
||||
src = fetchurl {
|
||||
name = "burpsuite.jar";
|
||||
@ -8,7 +8,7 @@ let
|
||||
"https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
||||
"https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
||||
];
|
||||
sha256 = "4e9cd298a03af8684306ca2dfe52e630f032c1df7ca8baecbd329c792137052f";
|
||||
sha256 = "ef1b1094bbe7388b5b4d515b8e42347243efb34a4d8acc27d9d553fe62f45fb5";
|
||||
};
|
||||
|
||||
name = "burpsuite-${version}";
|
||||
@ -74,6 +74,6 @@ buildFHSEnv {
|
||||
license = licenses.unfree;
|
||||
platforms = jdk.meta.platforms;
|
||||
hydraPlatforms = [ ];
|
||||
maintainers = with maintainers; [ bennofs ];
|
||||
maintainers = with maintainers; [ bennofs stepech ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "godns";
|
||||
version = "2.9.4";
|
||||
version = "2.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TimothyYe";
|
||||
repo = "godns";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7AIr35vsjI5jamvdA1EwTwkr8MiEOjTntFeeg4b7RCw=";
|
||||
hash = "sha256-PrjkZxMgj2+jttkXVkn1JoLKGfBOMMbTLimngUDEuX8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+wnaTrY7Mt6bCNTRZbJDFD75RCHyz5gtFi4DN0ng0/M=";
|
||||
vendorHash = "sha256-y2DRQ4nryUCrGUHmEuJSrYDjJ3X4sAcyWOp6ZKcoSSo=";
|
||||
|
||||
# Some tests require internet access, broken in sandbox
|
||||
doCheck = false;
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trufflehog";
|
||||
version = "3.32.1";
|
||||
version = "3.32.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CRgGQZf+97gvnMcZF6al4cEnf8ndQwoGBqGRZG865Nw=";
|
||||
hash = "sha256-+iGk3pmmpiljnmX0yCL3/X+icWvukxVA5n32npVBGOM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NnYQGbG4R/Ar0goOtymuohHO36t3UQhjg53ufneCFxQ=";
|
||||
vendorHash = "sha256-sSpRu6zLIvllrDYdtrj3oD3pCVs9ucSXbu3IYTqjT+k=";
|
||||
|
||||
# Test cases run git clone and require network access
|
||||
doCheck = false;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user