Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2023-02-27 00:13:53 +00:00 committed by GitHub
commit df97b4d4b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 2817 additions and 37 deletions

View File

@ -4023,6 +4023,11 @@
githubId = 1931963;
name = "David Sferruzza";
};
dsymbol = {
name = "dsymbol";
github = "dsymbol";
githubId = 88138099;
};
dtzWill = {
email = "w@wdtz.org";
github = "dtzWill";
@ -9675,6 +9680,12 @@
github = "michaelBelsanti";
githubId = 62124625;
};
michaelgrahamevans = {
email = "michaelgrahamevans@gmail.com";
name = "Michael Evans";
github = "michaelgrahamevans";
githubId = 5932424;
};
michaelpj = {
email = "michaelpj@gmail.com";
github = "michaelpj";

View File

@ -10,7 +10,7 @@
buildDotnetModule rec {
pname = "Pinta";
version = "2.1";
version = "2.1.1";
nativeBuildInputs = [
intltool
@ -36,7 +36,7 @@ buildDotnetModule rec {
owner = "PintaProject";
repo = "Pinta";
rev = version;
hash = "sha256-hugV4I13wZhPnVTUlGlaVxdjpGRvWDnfRVXgV+oy+sE=";
hash = "sha256-sdSGBf/dk+3Oy/aCfmIDuymwXQZwnth923Wdggir/Q0=";
};
# https://github.com/NixOS/nixpkgs/issues/38991

View File

@ -0,0 +1,49 @@
{ desktop-file-utils
, fetchurl
, gobject-introspection
, gtk3
, lib
, libhandy
, meson
, ninja
, pkg-config
, python3
, stdenv
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "shipments";
version = "0.3.0";
src = fetchurl {
url = "https://git.sr.ht/~martijnbraam/shipments/archive/${version}.tar.gz";
sha256 = "1znybldx21wjnb8qy6q9p52pi6lfz81743xgrnjmvjji4spwaipf";
};
nativeBuildInputs = [
desktop-file-utils
meson
ninja
pkg-config
wrapGAppsHook
];
buildInputs = [
gobject-introspection
gtk3
libhandy
(python3.withPackages (ps: with ps; [
pygobject3
requests
]))
];
meta = with lib; {
description = "Postal package tracking application";
homepage = "https://sr.ht/~martijnbraam/shipments/";
changelog = "https://git.sr.ht/~martijnbraam/shipments/refs/${version}";
license = licenses.lgpl3;
maintainers = with maintainers; [ michaelgrahamevans ];
};
}

View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "wtf";
version = "0.42.0";
version = "0.43.0";
src = fetchFromGitHub {
owner = "wtfutil";
repo = pname;
rev = "v${version}";
sha256 = "sha256-6dSKambBAi1JHVyhq9xBUx5X6QmjsZCV8lENB55Wzto=";
sha256 = "sha256-DFrA4bx+wSOxmt1CVA1oNiYVmcWeW6wpfR5F1tnhyDY=";
};
vendorSha256 = "sha256-Qe+u0u/NBXpEDvfKAF50Uxu5rh8BLa7N0wJ4bEuKOps=";
vendorHash = "sha256-f82ibPnauUOuZ5D6Rz3Yyt0jiAXvjN8Or3gud+ri6FA=";
doCheck = false;

View File

@ -0,0 +1,32 @@
{ lib
, stdenv
, fetchFromGitHub
, buildGoModule
}:
buildGoModule rec {
name = "gossa";
version = "0.2.2";
src = fetchFromGitHub {
owner = "pldubouilh";
repo = "gossa";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-eMO9aoI+otGQcvBUJtxciQ7yhUidYizLrDjMVchH3qA=";
};
vendorHash = null;
ldflags = [ "-s" "-w" ];
# Tests require a socket connection to be created.
doCheck = false;
meta = with lib; {
homepage = "https://github.com/pldubouilh/gossa";
description = "A fast and simple multimedia fileserver";
license = licenses.mit;
maintainers = with maintainers; [ dsymbol ];
};
}

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "3.42";
version = "3.43";
src = fetchFromGitHub {
owner = "seaweedfs";
repo = "seaweedfs";
rev = version;
hash = "sha256-MolxbV+B/u2v+9dcdia1QzvElxX5arZMpu1DnRvUam4=";
hash = "sha256-u2HGawshd2OdkchgpZUN6P2fTBSwJk+RjHAYYEpPgCg=";
};
vendorHash = "sha256-79nX7l++brumkuFjKuDKxw6EhH0U+aYpia8fdSyY208=";
vendorHash = "sha256-Q6B+iqUb97ZayjYDe4OOhkWj1Cxy+ILQxxEU2Jw/Als=";
subPackages = [ "weed" ];

View File

@ -0,0 +1,38 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
accent ? "Blue",
variant ? "Frappe",
}: let
pname = "catppuccin-kvantum";
in
lib.checkListOfEnum "${pname}: theme accent" ["Blue" "Flamingo" "Green" "Lavender" "Maroon" "Mauve" "Peach" "Pink" "Red" "Rosewater" "Sapphire" "Sky" "Teal" "Yellow"] [accent]
lib.checkListOfEnum "${pname}: color variant" ["Latte" "Frappe" "Macchiato" "Mocha"] [variant]
stdenvNoCC.mkDerivation {
inherit pname;
version = "unstable-2022-07-04";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "Kvantum";
rev = "d1e174c85311de9715aefc1eba4b8efd6b2730fc";
sha256 = "sha256-IrHo8pnR3u90bq12m7FEXucUF79+iub3I9vgH5h86Lk=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/share/Kvantum
cp -a src/Catppuccin-${variant}-${accent} $out/share/Kvantum
runHook postInstall
'';
meta = with lib; {
description = "Soothing pastel theme for Kvantum";
homepage = "https://github.com/catppuccin/Kvantum";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ggwpaiushtha];
};
}

View File

@ -0,0 +1,99 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, pkg-config
, wrapQtAppsHook
, dtkwidget
, qt5integration
, qt5platform-plugins
, dde-qt-dbus-factory
, udisks2-qt5
, qtmpris
, qtdbusextended
, qtmultimedia
, qttools
, kcodecs
, ffmpeg
, libvlc
, libcue
, taglib
, gsettings-qt
, SDL2
, gtest
, qtbase
, gst_all_1
}:
stdenv.mkDerivation rec {
pname = "deepin-music";
version = "6.2.21";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-sN611COCWy1gF/BZZqZ154uYuRo9HsbJw2wXe9OJ+iQ=";
};
postPatch = ''
substituteInPlace src/music-player/CMakeLists.txt \
--replace "include_directories(/usr/include/vlc)" "include_directories(${libvlc}/include/vlc)" \
--replace "include_directories(/usr/include/vlc/plugins)" "include_directories(${libvlc}/include/vlc/plugins)" \
--replace "/usr/share" "$out/share"
substituteInPlace src/libmusic-plugin/CMakeLists.txt \
--replace "/usr/lib/deepin-aiassistant" "$out/lib/deepin-aiassistant"
substituteInPlace src/music-player/data/deepin-music.desktop \
--replace "/usr/bin/deepin-music" "$out/bin/deepin-music"
'';
nativeBuildInputs = [
cmake
pkg-config
qttools
wrapQtAppsHook
];
buildInputs = [
dtkwidget
qt5platform-plugins
dde-qt-dbus-factory
udisks2-qt5
qtmpris
qtdbusextended
qtmultimedia
kcodecs
ffmpeg
libvlc
libcue
taglib
gsettings-qt
SDL2
gtest
] ++ (with gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-good
]);
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
qtWrapperArgs = [
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
];
cmakeFlags = [
"-DVERSION=${version}"
];
preFixup = ''
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
'';
meta = with lib; {
description = "Awesome music player with brilliant and tweakful UI Deepin-UI based";
homepage = "https://github.com/linuxdeepin/deepin-music";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.deepin.members;
};
}

View File

@ -42,6 +42,7 @@ let
deepin-draw = callPackage ./apps/deepin-draw { };
deepin-editor = callPackage ./apps/deepin-editor { };
deepin-image-viewer = callPackage ./apps/deepin-image-viewer { };
deepin-music = callPackage ./apps/deepin-music { };
deepin-picker = callPackage ./apps/deepin-picker { };
deepin-terminal = callPackage ./apps/deepin-terminal { };
deepin-reader = callPackage ./apps/deepin-reader { };
@ -53,6 +54,7 @@ let
go-dbus-factory = callPackage ./go-package/go-dbus-factory { };
dde-api = callPackage ./go-package/dde-api { inherit replaceAll; };
deepin-pw-check = callPackage ./go-package/deepin-pw-check { };
deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { };
#### TOOLS
deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { };

View File

@ -0,0 +1,57 @@
{ stdenv
, lib
, fetchFromGitHub
, buildGoPackage
, go-lib
, glib
}:
buildGoPackage rec {
pname = "deepin-desktop-schemas";
version = "5.10.11";
goPackagePath = "github.com/linuxdeepin/deepin-desktop-schemas";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-MboNj0zC3azavDUsmeNNafCcUa0GeoySl610+WOtNww=";
};
nativeBuildInputs = [ glib ];
buildInputs = [ go-lib ];
postPatch = ''
# Relocate files path for backgrounds and wallpapers
for file in $(grep -rl "/usr/share")
do
substituteInPlace $file \
--replace "/usr/share" "/run/current-system/sw/share"
done
'';
buildPhase = ''
runHook preBuild
GOPATH="$GOPATH:${go-lib}/share/gocode"
make ARCH=${stdenv.targetPlatform.linuxArch} -C go/src/${goPackagePath}
runHook postBuild
'';
installPhase = ''
runHook preInstall
make install DESTDIR="$out" PREFIX="/" -C go/src/${goPackagePath}
runHook postInstall
'';
preFixup = ''
glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"}
'';
meta = with lib; {
description = "GSettings deepin desktop-wide schemas";
homepage = "https://github.com/linuxdeepin/deepin-desktop-schemas";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.deepin.members;
};
}

View File

@ -21,13 +21,14 @@ assert zlibSupport -> zlib != null;
let
isPy3k = (lib.versions.major pythonVersion) == "3";
isPy38OrNewer = lib.versionAtLeast pythonVersion "3.8";
isPy39OrNewer = lib.versionAtLeast pythonVersion "3.9";
passthru = passthruFun {
passthru = passthruFun rec {
inherit self sourceVersion pythonVersion packageOverrides;
implementation = "pypy";
libPrefix = "pypy${pythonVersion}";
executable = "pypy${if isPy39OrNewer then lib.versions.majorMinor pythonVersion else lib.optionalString isPy3k "3"}";
sitePackages = "site-packages";
sitePackages = "${lib.optionalString isPy38OrNewer "lib/${libPrefix}/"}site-packages";
hasDistutilsCxxPatch = false;
inherit pythonAttr;
@ -122,7 +123,7 @@ in with passthru; stdenv.mkDerivation rec {
ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix}
# Include a sitecustomize.py file
cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py
cp ${../sitecustomize.py} $out/${if isPy38OrNewer then sitePackages else "lib/${libPrefix}/${sitePackages}"}/sitecustomize.py
runHook postInstall
'';

View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "plaid-python";
version = "11.5.0";
version = "11.6.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-SGWMLMwNAAi93dw053uiz+4K84v6g/6WD6q0rW00JHw=";
hash = "sha256-du6UqzZthjzkRkkqXzl/019bNMQH/K3tqmFOtA/hm6M=";
};
propagatedBuildInputs = [

View File

@ -2,9 +2,6 @@
, buildPythonPackage
, fetchFromGitHub
# native
, flake8
# tests
, pytestCheckHook
, pexpect
@ -26,11 +23,13 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.cfg \
--replace "--cov=readchar" ""
# run Linux tests on Darwin as well
# see https://github.com/magmax/python-readchar/pull/99 for why this is not upstreamed
substituteInPlace tests/linux/conftest.py \
--replace 'sys.platform.startswith("linux")' 'sys.platform.startswith(("darwin", "linux"))'
'';
nativeBuildInputs = [
flake8
];
pythonImportsCheck = [ "readchar" ];
nativeCheckInputs = [
pytestCheckHook

View File

@ -1,29 +1,24 @@
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, nix-update-script
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-cross";
version = "0.2.4";
version = "0.2.5";
src = fetchFromGitHub {
owner = "rust-embedded";
owner = "cross-rs";
repo = "cross";
rev = "v${version}";
sha256 = "sha256-gaY34ziC+ugw/HUTSh0Uk5WBfWMRZLybfpAMkUzsj8g=";
rev = "refs/tags/v${version}";
sha256 = "sha256-TFPIQno30Vm5m2nZ2b3d0WPu/98UqANLhw3IZiE5a38=";
};
cargoSha256 = "sha256-bdcdlnNr4CdkIJNoo8tb4ohVDmAcKIOP0nRr6BM+EPw=";
cargoSha256 = "sha256-x+DrKo79R8TAeLVuvIIguQs3gdAHiAQ9dUU2/eZRZ0c=";
# Fixes https://github.com/cross-rs/cross/issues/943
cargoPatches = [
(fetchpatch {
url = "https://github.com/cross-rs/cross/commit/d639578881d21d28d91d155722201cc53b00c5e7.patch";
sha256 = "sha256-FWaYIEMonb1Z8g5yXfd/Rl/LnxSYVwLfFIvPY1mJNxU=";
})
checkFlags = [
"--skip=docker::shared::tests::directories::test_host"
];
passthru = {
@ -32,7 +27,8 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Zero setup cross compilation and cross testing";
homepage = "https://github.com/rust-embedded/cross";
homepage = "https://github.com/cross-rs/cross";
changelog = "https://github.com/cross-rs/cross/blob/v${version}/CHANGELOG.md";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ otavio ];
mainProgram = "cross";

View File

@ -37,6 +37,44 @@ stdenv.mkDerivation {
buildInputs = [ libkrb5 ];
patches = [
# LINUX: Run the 'sparse' checker if available
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=2cf76b31ce4c912b1151c141818f6e8c5cddcab2";
hash = "sha256-//7HSlotx70vWDEMB8P8or4ZmmXZthgioUOkvOcJpgk=";
})
# cf: Detect how to pass CFLAGS to linux kbuild
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=57df4dff496ca9bea04510759b8fdd9cd2cc0009";
hash = "sha256-pJnW9bVz2ZQZUvZ+PcZ5gEgCL5kcbTGxsyMNvM2IseU=";
})
# cf: Handle autoconf linux checks with -Werror
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=b17625959386459059f6f43875d8817383554481";
hash = "sha256-Kqx5QEX1p4UoIsWxqvJVX4IyCQFiWxtAOgvAtk+ULuQ=";
})
# Linux: Fix functions without prototypes
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=3084117f10bd62acb1182cb54fc85b1d96738f70";
hash = "sha256-nNyqDQfS9zzlS2i3dbfud2tQOaTQ1x/rZcQEsaLu3qc=";
})
# Linux: Check for block_dirty_folio
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=f0fee2c7752d18ff183d60bcfba4c98c3348cd5f";
hash = "sha256-tnNlVjZ5exC+jo78HC/y8yp0L8KQroFvVRzTC+O6vlY=";
})
# Linux: Replace lru_cache_add with folio_add_lru
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=b885159cc2bc6c746aec1d54cdd8a515d1115d14";
hash = "sha256-ptPALSbZPSGu8PMmZiOkHUd5x0UItqIM7U7wJlxtSL8=";
})
# LINUX 5.13: set .proc_lseek in proc_ops
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=cba2b88851c3ae0ab1b18ea3ce77f7f5e8200b2f";
hash = "sha256-suj7n0U0odHXZHLPqeB/k96gyBh52uoS3AuHvOzPyd8=";
})
];
hardeningDisable = [ "pic" ];
configureFlags = [

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bdf2psf";
version = "1.215";
version = "1.217";
src = fetchurl {
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
sha256 = "+xqxI4qaIJc6z7BcVDcKg4dhc+xH56ZEspWf7UPdHnY=";
sha256 = "sha256-Rsud1DEsI946F8VzaF+S8nqTMih7ILWPhfx4zqa4Y9E=";
};
nativeBuildInputs = [ dpkg ];

View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "lxi-tools";
version = "2.4";
version = "2.5";
src = fetchFromGitHub {
owner = "lxi-tools";
repo = "lxi-tools";
rev = "v${version}";
sha256 = "sha256-1CuE/OuClVqw8bG1N8DFNqqQGmXyGyk1LICrcHyuVxw=";
sha256 = "sha256-F9svLaQnQyVyC5KzDnaGwB8J/nBZ3zzOVwYNxWBPifU=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,26 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "shellclear";
version = "0.4.8";
src = fetchFromGitHub {
owner = "rusty-ferris-club";
repo = "shellclear";
rev = "refs/tags/v${version}";
hash = "sha256-/0pqegVxrqqxaQ2JiUfkkFK9hp+Vuq7eTap052HEcJs=";
};
cargoHash = "sha256-vPd1cFfoSkOnXH3zKQUB0zWDzEtao50AUrUzhpZIkgI=";
meta = with lib; {
description = "Secure shell history commands by finding sensitive data";
homepage = "https://github.com/rusty-ferris-club/shellclear";
changelog = "https://github.com/rusty-ferris-club/shellclear/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

2369
pkgs/tools/text/autocorrect/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,36 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }:
rustPlatform.buildRustPackage rec {
pname = "autocorrect";
version = "2.6.2";
src = fetchFromGitHub {
owner = "huacnlee";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QHQQrUQCfDAlAtDcfrAkOwRhQkO+HcwnPfJ5+jb1290=";
};
cargoLock = {
lockFile = ./Cargo.lock;
};
postPatch = ''
cp ${./Cargo.lock} Cargo.lock
'';
buildInputs = lib.optional stdenv.isDarwin Security;
cargoBuildFlags = [ "-p" "autocorrect-cli" ];
cargoTestFlags = [ "-p" "autocorrect-cli" ];
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "A linter and formatter for help you improve copywriting, to correct spaces, punctuations between CJK (Chinese, Japanese, Korean)";
homepage = "https://huacnlee.github.io/autocorrect";
changelog = "https://github.com/huacnlee/autocorrect/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ candyc1oud ];
};
}

View File

@ -0,0 +1,15 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p coreutils curl jq common-updater-scripts cargo
# shellcheck shell=bash
set -euo pipefail
version=$(curl -s https://api.github.com/repos/huacnlee/autocorrect/releases/latest | jq -r .tag_name)
update-source-version autocorrect "${version#v}"
tmp=$(mktemp -d)
trap 'rm -rf -- "${tmp}"' EXIT
git clone --depth 1 --branch "${version}" https://github.com/huacnlee/autocorrect.git "${tmp}/autocorrect"
cargo generate-lockfile --manifest-path "${tmp}/autocorrect/Cargo.toml"
cp "${tmp}/autocorrect/Cargo.lock" "$(dirname "$0")/Cargo.lock"

View File

@ -386,6 +386,8 @@ with pkgs;
catppuccin-kde = callPackage ../data/themes/catppuccin-kde { };
catppuccin-kvantum = callPackage ../data/themes/catppuccin-kvantum { };
catppuccin-papirus-folders = callPackage ../data/icons/catppuccin-papirus-folders { };
btdu = callPackage ../tools/misc/btdu { };
@ -5508,6 +5510,8 @@ with pkgs;
shellhub-agent = callPackage ../applications/networking/shellhub-agent { };
shellclear = callPackage ../tools/security/shellclear { };
shellnoob = callPackage ../tools/security/shellnoob { };
sheesy-cli = callPackage ../tools/security/sheesy-cli {
@ -14114,6 +14118,10 @@ with pkgs;
asciigraph = callPackage ../tools/text/asciigraph { };
autocorrect = callPackage ../tools/text/autocorrect {
inherit (darwin.apple_sdk.frameworks) Security;
};
as31 = callPackage ../development/compilers/as31 { };
asl = callPackage ../development/compilers/asl {
@ -30091,6 +30099,8 @@ with pkgs;
gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; };
gossa = callPackage ../applications/networking/gossa { };
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { };
gpsbabel-gui = gpsbabel.override {
@ -32916,9 +32926,11 @@ with pkgs;
shfmt = callPackage ../tools/text/shfmt { };
shipments = callPackage ../applications/misc/shipments { };
shortwave = callPackage ../applications/audio/shortwave { };
shotgun = callPackage ../tools/graphics/shotgun {};
shotgun = callPackage ../tools/graphics/shotgun { };
shutter = callPackage ../applications/graphics/shutter { };