mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 09:53:10 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
9feb9fda3e
@ -16681,7 +16681,8 @@
|
||||
}];
|
||||
};
|
||||
yuu = {
|
||||
email = "yuuyin@protonmail.com";
|
||||
email = "yuunix@grrlz.net";
|
||||
matrix = "@yuu:matrix.org";
|
||||
github = "yuuyins";
|
||||
githubId = 86538850;
|
||||
name = "Yuu Yin";
|
||||
|
||||
@ -207,6 +207,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- To reduce closure size in `nixos/modules/profiles/minimal.nix` profile disabled installation documentations and manuals. Also disabled `logrotate` and `udisks2` services.
|
||||
|
||||
- To reduce closure size in `nixos/modules/installer/netboot/netboot-minimal.nix` profile disabled load linux firmwares, pre-installing the complete stdenv and `networking.wireless` service.
|
||||
|
||||
- The minimal ISO image now uses the `nixos/modules/profiles/minimal.nix` profile.
|
||||
|
||||
- The `ghcWithPackages` and `ghcWithHoogle` wrappers will now also symlink GHC's
|
||||
|
||||
@ -9,4 +9,7 @@
|
||||
];
|
||||
|
||||
documentation.man.enable = lib.mkOverride 500 true;
|
||||
hardware.enableRedistributableFirmware = lib.mkOverride 70 false;
|
||||
system.extraDependencies = lib.mkOverride 70 [];
|
||||
networking.wireless.enable = lib.mkOverride 500 false;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# This module defines the software packages included in the "minimal"
|
||||
# installation CD. It might be useful elsewhere.
|
||||
# installation CD. It might be useful elsewhere.
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
@ -17,7 +17,6 @@
|
||||
pkgs.ddrescue
|
||||
pkgs.ccrypt
|
||||
pkgs.cryptsetup # needed for dm-crypt volumes
|
||||
pkgs.mkpasswd # for generating password files
|
||||
|
||||
# Some text editors.
|
||||
(pkgs.vim.customize {
|
||||
@ -32,7 +31,6 @@
|
||||
pkgs.fuse
|
||||
pkgs.fuse3
|
||||
pkgs.sshfs-fuse
|
||||
pkgs.rsync
|
||||
pkgs.socat
|
||||
pkgs.screen
|
||||
pkgs.tcpdump
|
||||
@ -45,22 +43,14 @@
|
||||
pkgs.usbutils
|
||||
pkgs.nvme-cli
|
||||
|
||||
# Tools to create / manipulate filesystems.
|
||||
pkgs.ntfsprogs # for resizing NTFS partitions
|
||||
pkgs.dosfstools
|
||||
pkgs.mtools
|
||||
pkgs.xfsprogs.bin
|
||||
pkgs.jfsutils
|
||||
pkgs.f2fs-tools
|
||||
|
||||
# Some compression/archiver tools.
|
||||
pkgs.unzip
|
||||
pkgs.zip
|
||||
];
|
||||
|
||||
# Include support for various filesystems.
|
||||
# Include support for various filesystems and tools to create / manipulate them.
|
||||
boot.supportedFilesystems =
|
||||
[ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ] ++
|
||||
[ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ] ++
|
||||
lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs";
|
||||
|
||||
# Configure host id for ZFS to work
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
version = "1.7.1";
|
||||
version = "1.10.1";
|
||||
cfg = config.services.kubernetes.addons.dns;
|
||||
ports = {
|
||||
dns = 10053;
|
||||
@ -59,9 +59,9 @@ in {
|
||||
type = types.attrs;
|
||||
default = {
|
||||
imageName = "coredns/coredns";
|
||||
imageDigest = "sha256:4a6e0769130686518325b21b0c1d0688b54e7c79244d48e1b15634e98e40c6ef";
|
||||
imageDigest = "sha256:a0ead06651cf580044aeb0a0feba63591858fb2e43ade8c9dea45a6a89ae7e5e";
|
||||
finalImageTag = version;
|
||||
sha256 = "02r440xcdsgi137k5lmmvp0z5w5fmk8g9mysq5pnysq1wl8sj6mw";
|
||||
sha256 = "0wg696920smmal7552a2zdhfncndn5kfammfa8bk8l7dz9bhk0y1";
|
||||
};
|
||||
};
|
||||
|
||||
@ -136,6 +136,11 @@ in {
|
||||
resources = [ "nodes" ];
|
||||
verbs = [ "get" ];
|
||||
}
|
||||
{
|
||||
apiGroups = [ "discovery.k8s.io" ];
|
||||
resources = [ "endpointslices" ];
|
||||
verbs = [ "list" "watch" ];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@ -283,7 +283,8 @@ in {
|
||||
phpfpm = lib.mkIf useNginx {
|
||||
pools.zoneminder = {
|
||||
inherit user group;
|
||||
phpPackage = pkgs.php.withExtensions ({ enabled, all }: enabled ++ [ all.apcu ]);
|
||||
phpPackage = pkgs.php.withExtensions (
|
||||
{ enabled, all }: enabled ++ [ all.apcu all.sysvsem ]);
|
||||
phpOptions = ''
|
||||
date.timezone = "${config.time.timeZone}"
|
||||
'';
|
||||
@ -326,6 +327,15 @@ in {
|
||||
fi
|
||||
|
||||
${zoneminder}/bin/zmupdate.pl -nointeractive
|
||||
${zoneminder}/bin/zmupdate.pl --nointeractive -f
|
||||
|
||||
# Update ZM's Nix store path in the configuration table. Do nothing if the config doesn't
|
||||
# contain ZM's Nix store path.
|
||||
${config.services.mysql.package}/bin/mysql -u zoneminder zm << EOF
|
||||
UPDATE Config
|
||||
SET Value = REGEXP_REPLACE(Value, "^/nix/store/[^-/]+-zoneminder-[^/]+", "${pkgs.zoneminder}")
|
||||
WHERE Name = "ZM_FONT_FILE_LOCATION";
|
||||
EOF
|
||||
'';
|
||||
serviceConfig = {
|
||||
User = user;
|
||||
|
||||
@ -25,7 +25,7 @@ in
|
||||
|
||||
compressionLevel = mkOption {
|
||||
type = types.nullOr types.int;
|
||||
description = lib.mdDoc "The compression level for XZ compression (between 0 and 9)";
|
||||
description = lib.mdDoc "The compression level for ZSTD compression (between 0 and 16)";
|
||||
default = null;
|
||||
};
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ in
|
||||
{
|
||||
config = mkIf (any (fs: fs == "vfat") config.boot.supportedFilesystems) {
|
||||
|
||||
system.fsPackages = [ pkgs.dosfstools ];
|
||||
system.fsPackages = [ pkgs.dosfstools pkgs.mtools ];
|
||||
|
||||
boot.initrd.kernelModules = mkIf inInitrd [ "vfat" "nls_cp437" "nls_iso8859-1" ];
|
||||
|
||||
|
||||
@ -1,25 +1,38 @@
|
||||
{ lib, stdenv, fetchFromGitHub, alsa-lib, file, fluidsynth, jack2,
|
||||
liblo, libpulseaudio, libsndfile, pkg-config, python3Packages,
|
||||
which, withFrontend ? true,
|
||||
withQt ? true, qtbase ? null, wrapQtAppsHook ? null,
|
||||
withGtk2 ? true, gtk2 ? null,
|
||||
withGtk3 ? true, gtk3 ? null }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, alsa-lib
|
||||
, file
|
||||
, fluidsynth
|
||||
, jack2
|
||||
, liblo
|
||||
, libpulseaudio
|
||||
, libsndfile
|
||||
, pkg-config
|
||||
, python3Packages
|
||||
, which
|
||||
, gtk2 ? null
|
||||
, gtk3 ? null
|
||||
, qtbase ? null
|
||||
, withFrontend ? true
|
||||
, withGtk2 ? true
|
||||
, withGtk3 ? true
|
||||
, withQt ? true
|
||||
, wrapQtAppsHook ? null
|
||||
}:
|
||||
|
||||
assert withFrontend -> python3Packages ? pyqt5;
|
||||
assert withQt -> qtbase != null;
|
||||
assert withQt -> wrapQtAppsHook != null;
|
||||
assert withGtk2 -> gtk2 != null;
|
||||
assert withGtk3 -> gtk3 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "carla";
|
||||
version = "2.5.1";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "falkTX";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SN+9Q5v0bv+kQcYLBJmSCd9WIGSeQuOZze8LVwF20EA=";
|
||||
hash = "sha256-J0C3GLdlLMkm3LHl6l3OI2rA73A6z5MMcNJ1I1T0pbI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -60,7 +73,6 @@ stdenv.mkDerivation rec {
|
||||
patchPythonScript "$f"
|
||||
done
|
||||
patchPythonScript "$out/share/carla/carla_settings.py"
|
||||
patchPythonScript "$out/share/carla/carla_database.py"
|
||||
|
||||
for program in $out/bin/*; do
|
||||
wrapQtApp "$program" \
|
||||
|
||||
@ -1,34 +1,43 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchFromSourcehut
|
||||
, SDL2
|
||||
, alsa-lib
|
||||
, libaudec
|
||||
, appstream
|
||||
, appstream-glib
|
||||
, bash-completion
|
||||
, boost
|
||||
, breeze-icons
|
||||
, carla
|
||||
, chromaprint
|
||||
, cmake
|
||||
, curl
|
||||
, dbus
|
||||
, dconf
|
||||
, libepoxy
|
||||
, faust2lv2
|
||||
, fftw
|
||||
, fftwFloat
|
||||
, flex
|
||||
, glib
|
||||
, graphviz
|
||||
, gtk4
|
||||
, gtksourceview5
|
||||
, guile
|
||||
, graphviz
|
||||
, help2man
|
||||
, json-glib
|
||||
, jq
|
||||
, json-glib
|
||||
, libadwaita
|
||||
, libaudec
|
||||
, libbacktrace
|
||||
, libcyaml
|
||||
, libepoxy
|
||||
, libgtop
|
||||
, libjack2
|
||||
, libpanel
|
||||
, libpulseaudio
|
||||
, libsamplerate
|
||||
, libsass
|
||||
, libsndfile
|
||||
, libsoundio
|
||||
, libxml2
|
||||
@ -46,31 +55,48 @@
|
||||
, rtaudio
|
||||
, rtmidi
|
||||
, rubberband
|
||||
, sassc
|
||||
, serd
|
||||
, sord
|
||||
, sox
|
||||
, sratom
|
||||
, texi2html
|
||||
, vamp-plugin-sdk
|
||||
, wrapGAppsHook
|
||||
, xdg-utils
|
||||
, xxHash
|
||||
, vamp-plugin-sdk
|
||||
, zix
|
||||
, zstd
|
||||
, libadwaita
|
||||
, sassc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zrythm";
|
||||
version = "1.0.0-alpha.28.1.3";
|
||||
let
|
||||
# As of zrythm-1.0.0-beta.4.5.62, Zrythm needs clap
|
||||
# https://github.com/falktx/carla/tree/main/source/includes/clap, which is
|
||||
# only available on Carla unstable as of 2023-02-24.
|
||||
carla-unstable = carla.overrideAttrs (oldAttrs: rec {
|
||||
pname = "carla";
|
||||
version = "unstable-2023-02-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
src = fetchFromGitHub {
|
||||
owner = "falkTX";
|
||||
repo = pname;
|
||||
rev = "33a142f447925f55d00532933a1f28e9745c13eb";
|
||||
hash = "sha256-hQj0HlcOYfwsxG05pq/qcuKcOwDMV1ED+YdxBToBzvk=";
|
||||
};
|
||||
});
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zrythm";
|
||||
version = "1.0.0-beta.4.5.62";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~alextee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ERE7I6E3+RmmpnZEtcJL/1v9a37IwFauVsbJvI9gsRQ=";
|
||||
hash = "sha256-K93Y4Adh9TqoetSn7nrbbruIri1MKYoSGzoRBGHwbPA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
help2man
|
||||
jq
|
||||
libaudec
|
||||
@ -81,36 +107,44 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
python3
|
||||
python3.pkgs.sphinx
|
||||
sassc
|
||||
texi2html
|
||||
wrapGAppsHook
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
alsa-lib
|
||||
appstream
|
||||
appstream-glib
|
||||
bash-completion
|
||||
carla
|
||||
boost
|
||||
breeze-icons
|
||||
carla-unstable
|
||||
chromaprint
|
||||
curl
|
||||
dbus
|
||||
dconf
|
||||
libepoxy
|
||||
faust2lv2
|
||||
fftw
|
||||
fftwFloat
|
||||
flex
|
||||
breeze-icons
|
||||
glib
|
||||
graphviz
|
||||
gtk4
|
||||
gtksourceview5
|
||||
graphviz
|
||||
guile
|
||||
json-glib
|
||||
libadwaita
|
||||
libbacktrace
|
||||
libcyaml
|
||||
libepoxy
|
||||
libgtop
|
||||
libjack2
|
||||
libpanel
|
||||
libpulseaudio
|
||||
libsamplerate
|
||||
libsass
|
||||
libsndfile
|
||||
libsoundio
|
||||
libyaml
|
||||
@ -124,34 +158,46 @@ stdenv.mkDerivation rec {
|
||||
rubberband
|
||||
serd
|
||||
sord
|
||||
sox
|
||||
sratom
|
||||
vamp-plugin-sdk
|
||||
xdg-utils
|
||||
xxHash
|
||||
zix
|
||||
zstd
|
||||
libadwaita
|
||||
sassc
|
||||
];
|
||||
|
||||
# Zrythm uses meson to build, but requires cmake for dependency detection.
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
mesonFlags = [
|
||||
"-Drtmidi=enabled"
|
||||
"-Drtaudio=enabled"
|
||||
"-Dsdl=enabled"
|
||||
"-Dcarla=enabled"
|
||||
"-Dmanpage=true"
|
||||
# "-Duser_manual=true" # needs sphinx-intl
|
||||
"-Dlsp_dsp=disabled"
|
||||
"-Db_lto=false"
|
||||
"-Dcarla=enabled"
|
||||
"-Dcarla_binaries_dir=${carla-unstable}/lib/carla"
|
||||
"-Ddebug=true"
|
||||
"-Dfftw3_threads_separate=false"
|
||||
"-Dfftw3_threads_separate_type=library"
|
||||
"-Dfftw3f_separate=false"
|
||||
"-Dlsp_dsp=disabled"
|
||||
"-Dmanpage=true"
|
||||
"-Drtaudio=enabled"
|
||||
"-Drtmidi=enabled"
|
||||
"-Dsdl=enabled"
|
||||
# "-Duser_manual=true" # needs sphinx-intl
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = ''
|
||||
-lfftw3_threads -lfftw3f_threads
|
||||
'';
|
||||
|
||||
GUILE_AUTO_COMPILE = 0;
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace meson.build \
|
||||
--replace "'/usr/lib', '/usr/local/lib', '/opt/homebrew/lib'" "'${fftw}/lib'"
|
||||
|
||||
chmod +x scripts/meson-post-install.sh
|
||||
patchShebangs ext/sh-manpage-completions/run.sh scripts/generic_guile_wrap.sh \
|
||||
scripts/meson-post-install.sh tools/check_have_unlimited_memlock.sh
|
||||
@ -160,13 +206,13 @@ stdenv.mkDerivation rec {
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix GSETTINGS_SCHEMA_DIR : "$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/"
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
|
||||
)
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${breeze-icons}/share"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.zrythm.org";
|
||||
description = "Highly automated and intuitive digital audio workstation";
|
||||
description = "Automated and intuitive digital audio workstation";
|
||||
maintainers = with maintainers; [ tshaynik magnetophon ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.agpl3Plus;
|
||||
|
||||
67
pkgs/applications/misc/valent/default.nix
Normal file
67
pkgs/applications/misc/valent/default.nix
Normal file
@ -0,0 +1,67 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, desktop-file-utils
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, evolution-data-server-gtk4
|
||||
, glib
|
||||
, gnutls
|
||||
, gst_all_1
|
||||
, json-glib
|
||||
, libadwaita
|
||||
, libpeas
|
||||
, libportal-gtk4
|
||||
, pulseaudio
|
||||
, sqlite
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "valent";
|
||||
version = "unstable-2023-03-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andyholmes";
|
||||
repo = "valent";
|
||||
rev = "4b60f28f46bc948c5f3b30189bb9b5fbe29d2745";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-ltf/srQLqtqE71sxEh7VTQqXy2wOpTSdGDsjITOt3f8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
evolution-data-server-gtk4
|
||||
glib
|
||||
gnutls
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
json-glib
|
||||
libadwaita
|
||||
libpeas
|
||||
libportal-gtk4
|
||||
pulseaudio
|
||||
sqlite
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dplugin_bluez=true"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An implementation of the KDE Connect protocol, built on GNOME platform libraries";
|
||||
homepage = "https://github.com/andyholmes/valent/";
|
||||
changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md";
|
||||
license = with licenses; [ gpl3Plus cc0 ];
|
||||
maintainers = with maintainers; [ federicoschonborn ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -228,7 +228,8 @@ buildStdenv.mkDerivation ({
|
||||
hash = "sha256-+wNZhkDB3HSknPRD4N6cQXY7zMT/DzNXx29jQH0Gb1o=";
|
||||
})
|
||||
]
|
||||
++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch
|
||||
++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch
|
||||
++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch
|
||||
++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch
|
||||
++ extraPatches;
|
||||
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
|
||||
index 6db876975187..5882c5d7f1d6 100644
|
||||
--- a/toolkit/xre/nsXREDirProvider.cpp
|
||||
+++ b/toolkit/xre/nsXREDirProvider.cpp
|
||||
@@ -11,6 +11,7 @@
|
||||
|
||||
#include "jsapi.h"
|
||||
#include "xpcpublic.h"
|
||||
+#include "prenv.h"
|
||||
#include "prprf.h"
|
||||
|
||||
#include "nsIAppStartup.h"
|
||||
@@ -309,7 +310,8 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) {
|
||||
"/usr/lib/mozilla"_ns
|
||||
# endif
|
||||
;
|
||||
- rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir));
|
||||
+ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR");
|
||||
+ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), false, getter_AddRefs(localDir));
|
||||
# endif
|
||||
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
@ -3,10 +3,10 @@
|
||||
rec {
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "110.0.1";
|
||||
version = "111.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "42c6a99a3874a0f60121188c43788fb35577734d9366c3f89ad41b8328cc542ce172ec81ca35b9ea551eaa698197ccdb43922ec3215d311e0770aaaa59625d21";
|
||||
sha512 = "cdb300fdbb2b60068b0fc10a18df587b417e484901d36f52dd174d320d3440a42b02ea000f325c5781fd8853a5171b1a5184562fb535ece90619e4c64d46bb82";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@ -29,11 +29,11 @@ rec {
|
||||
|
||||
firefox-esr-102 = buildMozillaMach rec {
|
||||
pname = "firefox-esr-102";
|
||||
version = "102.8.0esr";
|
||||
version = "102.9.0esr";
|
||||
applicationName = "Mozilla Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "93ea87997b66088b94c6e943b6e99e9a71d1908444d096c0f65b6876d2c584e55ff6120266f3851f986b664bd1f12fa31206b03479c2b751e7c3ca097ac14275";
|
||||
sha512 = "3923212ce4b7d1f589129025961ff1b380b8aaf1dd074674f3bd63cf14e9a44ff051bda556b7796c25634e153de00ce62243ece15a520f63dd0791a19b2a6685";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ haskellPackages, mkDerivation, fetchFromGitHub, lib
|
||||
{ haskellPackages, mkDerivation, fetchFromGitHub, lib, stdenv
|
||||
# the following are non-haskell dependencies
|
||||
, makeWrapper, which, maude, graphviz, glibcLocales
|
||||
}:
|
||||
@ -76,7 +76,9 @@ mkDerivation (common "tamarin-prover" src // {
|
||||
executableToolDepends = [ makeWrapper which maude graphviz ];
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/tamarin-prover \
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
--set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \
|
||||
'' + ''
|
||||
--prefix PATH : ${lib.makeBinPath [ which maude graphviz ]}
|
||||
# so that the package can be used as a vim plugin to install syntax coloration
|
||||
install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/syntax/spthy.vim
|
||||
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation ({
|
||||
runHook preInstall
|
||||
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} \
|
||||
${if lib.versionAtLeast Dune.version "2.9"
|
||||
then "--docdir $out/share/doc"
|
||||
then "--docdir $out/share/doc --man $out/share/man"
|
||||
else ""}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -27,13 +27,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p4c";
|
||||
version = "1.2.3.6";
|
||||
version = "1.2.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p4lang";
|
||||
repo = "p4c";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3i2L1wORVN+X5sr4Hs+zGD/GgM1sAXt34R4kGMkd4qk=";
|
||||
sha256 = "sha256-s9uUq86xbqU21jfAF42blbbIvHlkv7W75rotjSbMxHc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
42
pkgs/development/libraries/audio/zix/default.nix
Normal file
42
pkgs/development/libraries/audio/zix/default.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zix";
|
||||
version = "unstable-2023-02-13";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "drobilla";
|
||||
repo = pname;
|
||||
rev = "262d4a1522c38be0588746e874159da5c7bb457d";
|
||||
hash = "sha256-3vuefgnirM4ksK3j9sjBHgOmx0JpL+6tCPb69/7jI00=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dbenchmarks=disabled"
|
||||
"-Ddocs=disabled"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A lightweight C99 portability and data structure library";
|
||||
homepage = "https://gitlab.com/drobilla/zix";
|
||||
changelog = "https://gitlab.com/drobilla/zix/-/blob/${src.rev}/NEWS";
|
||||
license = licenses.isc;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [
|
||||
yuu
|
||||
zseri
|
||||
];
|
||||
};
|
||||
}
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "babl";
|
||||
version = "0.1.100";
|
||||
version = "0.1.102";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "pebhk2diFdZdfN/q8RWKBgtCoUKjbxqwdtGDMhL50tQ=";
|
||||
sha256 = "a88bb28506575f95158c8c89df6e23686e50c8b9fea412bf49fe8b80002d84f0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geographiclib";
|
||||
version = "2.1.2";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geographiclib";
|
||||
repo = "geographiclib";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DVJi6EosJOPoVJEgZYsro5C/lrHrXEfbjLWiQVJk4+U=";
|
||||
hash = "sha256-W2YbeUYr6rjzdufVGzJ1k56uHHMzq8eidDZbRxTyzAU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen ];
|
||||
|
||||
@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.bsd3;
|
||||
# https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/v0.3.1/webrtc/rtc_base/system/arch.h
|
||||
# + our patches
|
||||
platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86);
|
||||
platforms = intersectLists platforms.unix (platforms.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86);
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bellows";
|
||||
version = "0.34.9";
|
||||
version = "0.34.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "bellows";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2QTY6mZkhaXHeZcLKxW7BkzOj2jYJx1v4TKG5YBcSC0=";
|
||||
hash = "sha256-eD9E/NbM3t1kWhPwY2SmjuCk+XVwklm4rwzISlQHtq0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "eve";
|
||||
version = "2.0.4";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Eve";
|
||||
hash = "sha256-RZ6dwekCKA+PomBp2Ht7/0elOLLUs/sO0KgdxxTOjtc=";
|
||||
hash = "sha256-NobIzu+7+NI7M4NRQKjrhye3v6YGMeGnbDRB39b3Dy8=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -34,11 +34,12 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "flask<2.2" "flask" \
|
||||
--replace "events>=0.3,<0.4" "events>=0.3"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "eve" ];
|
||||
pythonImportsCheck = [
|
||||
"eve"
|
||||
];
|
||||
|
||||
# tests call a running mongodb instance
|
||||
doCheck = false;
|
||||
|
||||
@ -1,20 +1,24 @@
|
||||
{ lib
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, commonmark
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, linkify-it-py
|
||||
, markdown
|
||||
, mdurl
|
||||
, psutil
|
||||
, py
|
||||
, pytest-benchmark
|
||||
, mistletoe
|
||||
, mistune
|
||||
, myst-parser
|
||||
, panflute
|
||||
, pyyaml
|
||||
, sphinx
|
||||
, sphinx-book-theme
|
||||
, sphinx-copybutton
|
||||
, sphinx-design
|
||||
, pytest-regressions
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, typing-extensions
|
||||
# allow disabling tests for the nixos manual build.
|
||||
# the test suite closure is just too large.
|
||||
, disableTests ? false
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -36,30 +40,29 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
linkify-it-py
|
||||
mdurl
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
psutil
|
||||
py
|
||||
] ++ lib.optionals (! disableTests) [
|
||||
pytest-benchmark
|
||||
pytest-regressions
|
||||
pytestCheckHook
|
||||
];
|
||||
] ++ passthru.optional-dependencies.linkify;
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--benchmark-skip"
|
||||
];
|
||||
# disable and remove benchmark tests
|
||||
preCheck = ''
|
||||
rm -r benchmarking
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"markdown_it"
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
compare = [ commonmark markdown mistletoe mistune panflute ];
|
||||
linkify = [ linkify-it-py ];
|
||||
rtd = [ attrs myst-parser pyyaml sphinx sphinx-copybutton sphinx-design sphinx-book-theme ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Markdown parser in Python";
|
||||
homepage = "https://markdown-it-py.readthedocs.io/";
|
||||
|
||||
@ -6,9 +6,6 @@
|
||||
, markdown-it-py
|
||||
, pytest-regressions
|
||||
, pytestCheckHook
|
||||
# allow disabling tests for the nixos manual build.
|
||||
# the test suite closure is just too large.
|
||||
, disableTests ? false
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -33,7 +30,7 @@ buildPythonPackage rec {
|
||||
markdown-it-py
|
||||
];
|
||||
|
||||
nativeCheckInputs = lib.optionals (!disableTests) [
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-regressions
|
||||
];
|
||||
|
||||
@ -49,7 +49,7 @@ buildPythonPackage rec {
|
||||
pytest-regressions
|
||||
sphinx-pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
] ++ markdown-it-py.optional-dependencies.linkify;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"myst_parser"
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha-quirks";
|
||||
version = "0.0.93";
|
||||
version = "0.0.94";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zha-device-handlers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ilPwzQV4vucLV3QAR/otsVIDIxRw8iWPGXM8CvgtFxg=";
|
||||
hash = "sha256-WYMl/KN3JUmBV+O29WVxZXFpfJ5of7Jo2hFgrbn2NYc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "argc";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigoden";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Y6qXxnjep9AF3aAW6EZNx4dghMH3BSw8ExpNhTVH1QI=";
|
||||
sha256 = "sha256-G5dEN1yO/WnMLVZtxL6vD+YjvHDWiWehZSqeL43IDXE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Wr+sUtxxdmY6l+sMAcQGR3Zmqvj8qybC74o9ipkwTMk=";
|
||||
cargoSha256 = "sha256-carsp6IRFCw5bLRYoyy6QP8jnImTSf/6GxYDH9lR7GA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -1,21 +1,25 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jql";
|
||||
version = "5.1.7";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yamafaktory";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-V7JLoXYhCCh2XfNE7ry/us4b/NsoieFls88ewuyrN08=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gFPN3aSukh0QMfGLn65icf5ZyYb8Y+r+GMdG2gm2InY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+H9KlzrVZSAfzmdw3chJYHg2fbctIs9xCIqHk4ZJzOM=";
|
||||
cargoHash = "sha256-XJW0TDRJdLwgWDm5ZBSCUj5VS5ZowGCr6tHV0MpZuvI=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A JSON Query Language CLI tool built with Rust";
|
||||
homepage = "https://github.com/yamafaktory/jql";
|
||||
changelog = "https://github.com/yamafaktory/jql/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ akshgpt7 ];
|
||||
};
|
||||
|
||||
@ -15,16 +15,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "texlab";
|
||||
version = "5.3.0";
|
||||
version = "5.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latex-lsp";
|
||||
repo = "texlab";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-DOzXsxqOLlETCAVpKpUXAxO+T0pE+2LwnOS99vU2o48=";
|
||||
sha256 = "sha256-2P+aidfYkO8l9VjqTstXbksyGTQ3porJhrBYod9oCYQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-t/4nfsED29F8v3DkLYCh2A8AJvQvZvU8z6C0PLhTFuM=";
|
||||
cargoSha256 = "sha256-Yr4i35Yf9kWYD1xQi+RKx6RQtyQUlZS8cXWkGGNuwXI=";
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
|
||||
|
||||
@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
|
||||
# generate the man page
|
||||
postInstall = lib.optionalString (!isCross) ''
|
||||
# TexLab builds man page separately in CI:
|
||||
# https://github.com/latex-lsp/texlab/blob/v5.3.0/.github/workflows/publish.yml#L127-L131
|
||||
# https://github.com/latex-lsp/texlab/blob/v5.4.0/.github/workflows/publish.yml#L127-L131
|
||||
help2man --no-info "$out/bin/texlab" > texlab.1
|
||||
installManPage texlab.1
|
||||
'';
|
||||
|
||||
@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-binstall";
|
||||
version = "0.21.0";
|
||||
version = "0.21.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cargo-bins";
|
||||
repo = "cargo-binstall";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-btpXmtnsnZy7ai+WlWtgLjwbHqQvIphNM7aqMmA5Wjs=";
|
||||
hash = "sha256-8iJOjaOnbvRZWkygkXK0e/BiImpyQ92E0XQDklb4JJQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bfdyLXfasPeUAxiA7tFV1vc4tVnTO84GFOdBWjTx/4s=";
|
||||
cargoHash = "sha256-+u1v3XJ+DCXMbMpLcjxUZMKcF0E9LrNv6+9XVo/DduQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2023.3.3";
|
||||
version = "2023.3.4";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
||||
@ -181,11 +181,11 @@ let
|
||||
});
|
||||
|
||||
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.0.5.post1";
|
||||
version = "2.0.6";
|
||||
src = super.fetchPypi {
|
||||
pname = "SQLAlchemy";
|
||||
inherit version;
|
||||
hash = "sha256-E+sqWILP2fTu2q7BSlYDoJbwEl98PLSGEbO/o8JT8l0=";
|
||||
hash = "sha256-w0PwtUZJX116I5xwv1CpmkjXMhwWW4Kvr6hIO56+v24=";
|
||||
};
|
||||
nativeCheckInputs = oldAttrs.nativeCheckInputs ++ (with super; [
|
||||
pytest-xdist
|
||||
@ -263,7 +263,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2023.3.3";
|
||||
hassVersion = "2023.3.4";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -279,7 +279,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
# Primary source is the pypi sdist, because it contains translations
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-AJJ0w66a8D3kiLHhnoFmnGRWyDJ4OCebwwKTGdprGa0=";
|
||||
hash = "sha256-BJCik8TxNzOsehD1fBNQO8Kvmb6ZaqEy4oEVmtIhwp0=";
|
||||
};
|
||||
|
||||
# Secondary source is git for tests
|
||||
@ -287,7 +287,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-KTmMA8P0MhYAiwp073Q3s60budFKHrsBnAJSqYC7zis=";
|
||||
hash = "sha256-iwRjyOgQNTs54mnL3mlL9O3wVD5SWZIl+Hhxir6F+3o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2023.3.2";
|
||||
version = "2023.3.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tgXjACNGD3QTrsgYtcTinW4HflwGSoCR6k6SrawQz6A=";
|
||||
hash = "sha256-uNwh1IYn3rDwj+FB8h9SwbFaju7cnCWl7HjX0mdw/UA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -57,13 +57,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zoneminder";
|
||||
version = "1.36.28";
|
||||
version = "1.36.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZoneMinder";
|
||||
repo = "zoneminder";
|
||||
rev = version;
|
||||
sha256 = "sha256-x00u7AWMNS+wAO/tdWi7GYbMZZM7XnszCO57ZDlm0J0=";
|
||||
sha256 = "sha256-8iRoGpkpZVOOr0wSY9iey2x4gPfKTfUNtt5TCHCCRIQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -12,27 +12,16 @@ let
|
||||
python = ((if stdenv.isDarwin then python3 else python3Minimal).override {
|
||||
self = python;
|
||||
includeSiteCustomize = true;
|
||||
});
|
||||
|
||||
# TODO add our own small test suite, maybe add tests for these deps to channels?
|
||||
markdown-it-py-no-tests = python.pkgs.markdown-it-py.override {
|
||||
disableTests = true;
|
||||
}).override {
|
||||
packageOverrides = final: prev: {
|
||||
markdown-it-py = prev.markdown-it-py.overridePythonAttrs (_: {
|
||||
doCheck = false;
|
||||
});
|
||||
mdit-py-plugins = prev.mdit-py-plugins.overridePythonAttrs (_: {
|
||||
doCheck = false;
|
||||
});
|
||||
};
|
||||
};
|
||||
mdit-py-plugins-no-tests = python.pkgs.mdit-py-plugins.override {
|
||||
markdown-it-py = markdown-it-py-no-tests;
|
||||
disableTests = true;
|
||||
};
|
||||
|
||||
makeDeps = pkgs: small:
|
||||
if small
|
||||
then [
|
||||
markdown-it-py-no-tests
|
||||
mdit-py-plugins-no-tests
|
||||
]
|
||||
else [
|
||||
pkgs.markdown-it-py
|
||||
pkgs.mdit-py-plugins
|
||||
];
|
||||
in
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
@ -54,12 +43,15 @@ python.pkgs.buildPythonApplication rec {
|
||||
src = ./src;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python.pkgs.setuptools
|
||||
python.pkgs.pytestCheckHook
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
setuptools
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = makeDeps python.pkgs true;
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
markdown-it-py
|
||||
mdit-py-plugins
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "-vvrP" "tests/" ];
|
||||
|
||||
@ -67,7 +59,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
# build closures small. mypy has an unreasonably large build closure for docs builds.
|
||||
passthru.tests.typing = runCommand "${pname}-mypy" {
|
||||
nativeBuildInputs = [
|
||||
(python3.withPackages (p: [ p.mypy p.pytest ] ++ makeDeps p false))
|
||||
(python3.withPackages (ps: with ps; [ mypy pytest markdown-it-py mdit-py-plugins ]))
|
||||
];
|
||||
} ''
|
||||
mypy --strict ${src}
|
||||
|
||||
@ -1,37 +1,34 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, autoconf, bison, libpaper, gperf, file, perl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoconf
|
||||
, bison
|
||||
, file
|
||||
, perl
|
||||
, pkg-config
|
||||
, boehmgc
|
||||
, gperf
|
||||
, libpaper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "a2ps";
|
||||
version = "4.14";
|
||||
version = "4.15.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/a2ps/a2ps-${version}.tar.gz";
|
||||
sha256 = "195k78m1h03m961qn7jr120z815iyb93gwi159p1p9348lyqvbpk";
|
||||
hash = "sha256-l5dwi6AoBa/DtbkeBsuOrJe4WEOpDmbP3mp8Y8oEKyo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.net/data/main/a/a2ps/1:4.14-1.3/debian/patches/09_CVE-2001-1593.diff";
|
||||
sha256 = "1hrfmvb21zlklmg2fqikgywhqgc4qnvbhx517w87faafrhzhlnh0";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.net/data/main/a/a2ps/1:4.14-1.3/debian/patches/CVE-2014-0466.diff";
|
||||
sha256 = "0grqqsc3m45niac56m19m5gx7gc0m8zvia5iman1l4rlq31shf8s";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2015-8107.patch";
|
||||
url = "https://sources.debian.net/data/main/a/a2ps/1:4.14-1.3/debian/patches/fix-format-security.diff";
|
||||
sha256 = "0pq7zl41gf2kc6ahwyjnzn93vbxb4jc2c5g8j20isp4vw6dqrnwv";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace afm/make_fonts_map.sh --replace "/bin/rm" "rm"
|
||||
substituteInPlace tests/defs.in --replace "/bin/rm" "rm"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoconf file bison perl ];
|
||||
buildInputs = [ libpaper gperf ];
|
||||
nativeBuildInputs = [ autoconf bison file perl pkg-config ];
|
||||
buildInputs = [ boehmgc gperf libpaper ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An Anything to PostScript converter and pretty-printer";
|
||||
@ -44,7 +41,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.gnu.org/software/a2ps/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.bennofs ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -24201,6 +24201,8 @@ with pkgs;
|
||||
|
||||
zita-resampler = callPackage ../development/libraries/audio/zita-resampler { };
|
||||
|
||||
zix = callPackage ../development/libraries/audio/zix { };
|
||||
|
||||
zz = callPackage ../development/compilers/zz { };
|
||||
|
||||
zziplib = callPackage ../development/libraries/zziplib { };
|
||||
@ -38846,6 +38848,8 @@ with pkgs;
|
||||
|
||||
unixcw = libsForQt5.callPackage ../applications/radio/unixcw { };
|
||||
|
||||
valent = callPackage ../applications/misc/valent { };
|
||||
|
||||
vault = callPackage ../tools/security/vault { };
|
||||
|
||||
vault-medusa = callPackage ../tools/security/vault-medusa { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user