Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -11346,6 +11346,12 @@
|
||||
githubId = 585424;
|
||||
name = "Massimo Gengarelli";
|
||||
};
|
||||
matdibu = {
|
||||
email = "contact@mateidibu.dev";
|
||||
github = "matdibu";
|
||||
githubId = 24750154;
|
||||
name = "Matei Dibu";
|
||||
};
|
||||
matejc = {
|
||||
email = "cotman.matej@gmail.com";
|
||||
github = "matejc";
|
||||
|
||||
@@ -95,6 +95,7 @@ mediator_lua,,,,,,
|
||||
middleclass,,,,,,
|
||||
mpack,,,,,,
|
||||
moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn
|
||||
nlua,,,,,,teto
|
||||
nui.nvim,,,,,,mrcjkb
|
||||
nvim-cmp,https://github.com/hrsh7th/nvim-cmp,,,,,
|
||||
penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque
|
||||
|
||||
|
@@ -35,6 +35,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
- The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS.
|
||||
|
||||
- `k9s` was updated to v0.29. There have been breaking changes in the config file format, check out the [changelog](https://github.com/derailed/k9s/releases/tag/v0.29.0) for details.
|
||||
|
||||
- `mkosi` was updated to v19. Parts of the user interface have changed. Consult the
|
||||
[release notes](https://github.com/systemd/mkosi/releases/tag/v19) for a list of changes.
|
||||
|
||||
|
||||
@@ -8,8 +8,6 @@ let
|
||||
cfg = config.hardware.pulseaudio;
|
||||
alsaCfg = config.sound;
|
||||
|
||||
systemWide = cfg.enable && cfg.systemWide;
|
||||
nonSystemWide = cfg.enable && !cfg.systemWide;
|
||||
hasZeroconf = let z = cfg.zeroconf; in z.publish.enable || z.discovery.enable;
|
||||
|
||||
overriddenPackage = cfg.package.override
|
||||
@@ -217,16 +215,10 @@ in {
|
||||
};
|
||||
|
||||
|
||||
config = mkMerge [
|
||||
config = lib.mkIf cfg.enable (mkMerge [
|
||||
{
|
||||
environment.etc = {
|
||||
"pulse/client.conf".source = clientConf;
|
||||
};
|
||||
environment.etc."pulse/client.conf".source = clientConf;
|
||||
|
||||
hardware.pulseaudio.configFile = mkDefault "${getBin overriddenPackage}/etc/pulse/default.pa";
|
||||
}
|
||||
|
||||
(mkIf cfg.enable {
|
||||
environment.systemPackages = [ overriddenPackage ];
|
||||
|
||||
sound.enable = true;
|
||||
@@ -242,6 +234,8 @@ in {
|
||||
"libao.conf".source = writeText "libao.conf" "default_driver=pulse";
|
||||
};
|
||||
|
||||
hardware.pulseaudio.configFile = mkDefault "${getBin overriddenPackage}/etc/pulse/default.pa";
|
||||
|
||||
# Disable flat volumes to enable relative ones
|
||||
hardware.pulseaudio.daemon.config.flat-volumes = mkDefault "no";
|
||||
|
||||
@@ -255,7 +249,7 @@ in {
|
||||
|
||||
# PulseAudio is packaged with udev rules to handle various audio device quirks
|
||||
services.udev.packages = [ overriddenPackage ];
|
||||
})
|
||||
}
|
||||
|
||||
(mkIf (cfg.extraModules != []) {
|
||||
hardware.pulseaudio.daemon.config.dl-search-path = let
|
||||
@@ -277,7 +271,7 @@ in {
|
||||
services.avahi.publish.userServices = true;
|
||||
})
|
||||
|
||||
(mkIf nonSystemWide {
|
||||
(mkIf (!cfg.systemWide) {
|
||||
environment.etc = {
|
||||
"pulse/default.pa".source = myConfigFile;
|
||||
};
|
||||
@@ -297,7 +291,7 @@ in {
|
||||
};
|
||||
})
|
||||
|
||||
(mkIf systemWide {
|
||||
(mkIf cfg.systemWide {
|
||||
users.users.pulse = {
|
||||
# For some reason, PulseAudio wants UID == GID.
|
||||
uid = assert uid == gid; uid;
|
||||
@@ -328,6 +322,6 @@ in {
|
||||
|
||||
environment.variables.PULSE_COOKIE = "${stateDir}/.config/pulse/cookie";
|
||||
})
|
||||
];
|
||||
]);
|
||||
|
||||
}
|
||||
|
||||
@@ -143,7 +143,7 @@ in
|
||||
RuntimeDirectory = "keyd";
|
||||
|
||||
# Hardening
|
||||
CapabilityBoundingSet = "";
|
||||
CapabilityBoundingSet = [ "CAP_SYS_NICE" ];
|
||||
DeviceAllow = [
|
||||
"char-input rw"
|
||||
"/dev/uinput rw"
|
||||
@@ -152,7 +152,7 @@ in
|
||||
PrivateNetwork = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
PrivateUsers = true;
|
||||
PrivateUsers = false;
|
||||
PrivateMounts = true;
|
||||
PrivateTmp = true;
|
||||
RestrictNamespaces = true;
|
||||
@@ -165,9 +165,9 @@ in
|
||||
LockPersonality = true;
|
||||
ProtectProc = "invisible";
|
||||
SystemCallFilter = [
|
||||
"nice"
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
"~@resources"
|
||||
];
|
||||
RestrictAddressFamilies = [ "AF_UNIX" ];
|
||||
RestrictSUIDSGID = true;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
@@ -27,18 +28,24 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "muse-sequencer";
|
||||
version = "4.1.0";
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "muse-sequencer";
|
||||
repo = "muse";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-JPvoximDL4oKO8reXW7alMegwUyUTSAcdq3ueXeUMMY=";
|
||||
hash = "sha256-LxibuqopMHuKEfTWXSEXc1g3wTm2F3NQRiV71FHvaY0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
pkg-config
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "orbiton";
|
||||
version = "2.65.6";
|
||||
version = "2.65.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xyproto";
|
||||
repo = "orbiton";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HJ1smXLycxcII6FjvXCvxipm7G+2SVweOMPwJ3aJxMg=";
|
||||
hash = "sha256-1g2D79yUHeFz9jpmz1N5qDmpe1DA8xV82t78ZUVOhBE=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -74,5 +74,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/sxyazi/yazi";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ xyenon matthiasbeyer ];
|
||||
mainProgram = "yazi";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,40 +7,31 @@
|
||||
, wrapQtAppsHook
|
||||
, exiv2
|
||||
, graphicsmagick
|
||||
, kimageformats
|
||||
, libarchive
|
||||
, libraw
|
||||
, mpv
|
||||
, poppler
|
||||
, pugixml
|
||||
, qtbase
|
||||
, qtcharts
|
||||
, qtdeclarative
|
||||
, qtgraphicaleffects
|
||||
, qtimageformats
|
||||
, qtlocation
|
||||
, qtmultimedia
|
||||
, qtquickcontrols
|
||||
, qtquickcontrols2
|
||||
, qtpositioning
|
||||
, qtsvg
|
||||
, qtwayland
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "photoqt";
|
||||
version = "3.4";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
|
||||
hash = "sha256-kVf9+zI9rtEMmS0N4qrN673T/1fnqfcV3hQPnMXMLas=";
|
||||
hash = "sha256-nmEipzatselwtBR//ayajqgmhaUnAMKW7JBLKdzutHg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# exiv2 0.28.1
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "exiv2lib" "exiv2"
|
||||
''
|
||||
# error: no member named 'setlocale' in namespace 'std'; did you mean simply 'setlocale'?
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace cplusplus/main.cpp \
|
||||
--replace "std::setlocale" "setlocale"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
@@ -51,18 +42,21 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
exiv2
|
||||
graphicsmagick
|
||||
kimageformats
|
||||
libarchive
|
||||
libraw
|
||||
mpv
|
||||
poppler
|
||||
pugixml
|
||||
qtbase
|
||||
qtcharts
|
||||
qtdeclarative
|
||||
qtgraphicaleffects
|
||||
qtimageformats
|
||||
qtlocation
|
||||
qtmultimedia
|
||||
qtquickcontrols
|
||||
qtquickcontrols2
|
||||
qtpositioning
|
||||
qtsvg
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
qtwayland
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
@@ -76,6 +70,12 @@ stdenv.mkDerivation rec {
|
||||
export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv $out/bin/photoqt.app $out/Applications
|
||||
makeWrapper $out/{Applications/photoqt.app/Contents/MacOS,bin}/photoqt
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Simple, yet powerful and good looking image viewer";
|
||||
homepage = "https://photoqt.org/";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery-dl";
|
||||
version = "1.26.3";
|
||||
version = "1.26.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "gallery_dl";
|
||||
sha256 = "sha256-M8EP0YbyJhOUPrghYA2jDQ/CpyD98d27l94uEj4YEpM=";
|
||||
sha256 = "sha256-qoNWH7fomOQEdOz0+sEXtfhXItPofSMbDvQCmHcOPXo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mainsail";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip";
|
||||
hash = "sha256-YNI4WkWLnB1w8I0ETflDsWNkB6QGO5QrASajKpcmGcU=";
|
||||
hash = "sha256-7GnPdnBoK0lErUgnG3dw644ASb0/1pwGqqvxfn/81T0=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "navi";
|
||||
version = "2.22.1";
|
||||
version = "2.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denisidoro";
|
||||
repo = "navi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dlK7R9T1AezNr3+5Or8XYAMRlnnXejIs9jXAjwTuvd8=";
|
||||
sha256 = "sha256-pqBTrHBvsuosyQqCnSiI3+pOe2J6XeIQ8dai+kTVFjc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nastb6dsBGM8zIQ/WCfQy3Y50kH3J1dM/vnkOe/q95A=";
|
||||
cargoHash = "sha256-dx13p+kEyqhyaF8ejJLWsgW3IpEvS9nlIHhjxOpp4d8=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "otpclient";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paolostivanin";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3ypEP5HQYXOyB2euvDDpKjpbCD67oE19wkmzQbyKxiI=";
|
||||
hash = "sha256-R4vxggZ9bUSPar/QLRc172RGgPXuf9jUwK19kBKpT2w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k9s";
|
||||
version = "0.28.2";
|
||||
version = "0.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3ij77aBNufSEP3wf8wtQ/aBehE45fwrgofCmyXxuyPM=";
|
||||
sha256 = "sha256-agGayZ20RMAcGOx+owwDbUUDsjF3FZajhwDZ5wtE93k=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -20,7 +20,7 @@ buildGoModule rec {
|
||||
|
||||
tags = [ "netgo" ];
|
||||
|
||||
vendorHash = "sha256-kgi5ZfbjkSiJ/uZkfpeMhonSt/4sO3RKARpoww1FsTo=";
|
||||
vendorHash = "sha256-Wn/9vIyw99BudhhTnoN81Np70VInV6uo7Sru64nhPgk=";
|
||||
|
||||
# TODO investigate why some config tests are failing
|
||||
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
|
||||
|
||||
@@ -117,6 +117,11 @@ rustPlatform.buildRustPackage rec {
|
||||
--replace '"/usr/local/bin/espanso"' '"${placeholder "out"}/bin/espanso"'
|
||||
'';
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
# Work around https://github.com/NixOS/nixpkgs/issues/166205.
|
||||
NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
|
||||
};
|
||||
|
||||
# Some tests require networking
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "quisk";
|
||||
version = "4.2.24";
|
||||
version = "4.2.27";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-myxWcx1/a9sMv+sfa0Gwjx72t0rGoxn5USEfFgfKEro=";
|
||||
sha256 = "sha256-7pI9K7VOksQREbDFa02w48tcvanehBQ+5d/XYUD/gSo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -32,21 +32,21 @@
|
||||
assert withMPI -> trilinos.withMPI;
|
||||
|
||||
let
|
||||
version = "7.6.0";
|
||||
version = "7.7.0";
|
||||
|
||||
# useing fetchurl or fetchFromGitHub doesn't include the manuals
|
||||
# due to .gitattributes files
|
||||
xyce_src = fetchgit {
|
||||
url = "https://github.com/Xyce/Xyce.git";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "sha256-HYIzmODMWXBuVRZhcC7LntTysuyXN5A9lb2DeCQQtVw=";
|
||||
sha256 = "sha256-F0kO86eliD1AfUUjeVllxJ231ZElXkfBfGJ3jhT0s9w=";
|
||||
};
|
||||
|
||||
regression_src = fetchFromGitHub {
|
||||
owner = "Xyce";
|
||||
repo = "Xyce_Regression";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "sha256-uEoiKpYyHmdK7LZ1UNm2d3Jk8+sCwBwB0TCoHilIh74=";
|
||||
sha256 = "sha256-iDxm0Vcn3JuuREciCt3/b7q94E8GhXoIUD/BCx0mW6Q=";
|
||||
};
|
||||
in
|
||||
|
||||
@@ -154,8 +154,11 @@ stdenv.mkDerivation rec {
|
||||
"doc/Reference_Guide/Xyce_RG"
|
||||
"doc/Release_Notes/Release_Notes_${lib.versions.majorMinor version}/Release_Notes_${lib.versions.majorMinor version}")
|
||||
|
||||
# Release notes refer to an image not in the repo.
|
||||
sed -i -E 's/\\includegraphics\[height=(0.5in)\]\{snllineblubrd\}/\\mbox\{\\rule\{0mm\}\{\1\}\}/' ''${docFiles[2]}.tex
|
||||
# SANDIA LaTeX class and some organization logos are not publicly available see
|
||||
# https://groups.google.com/g/xyce-users/c/MxeViRo8CT4/m/ppCY7ePLEAAJ
|
||||
for img in "snllineblubrd" "snllineblk" "DOEbwlogo" "NNSA_logo"; do
|
||||
sed -i -E "s/\\includegraphics\[height=(0.[1-9]in)\]\{$img\}/\\mbox\{\\rule\{0mm\}\{\1\}\}/" ''${docFiles[2]}.tex
|
||||
done
|
||||
|
||||
install -d $doc/share/doc/${pname}-${version}/
|
||||
for d in ''${docFiles[@]}; do
|
||||
|
||||
@@ -20,6 +20,9 @@ stdenv.mkDerivation {
|
||||
cp -v ../build/MakePAR Makefile
|
||||
'';
|
||||
|
||||
# https://gitlab.com/DL_POLY_Classic/dl_poly/-/blob/master/README
|
||||
env.NIX_CFLAGS_COMPILE = "-fallow-argument-mismatch";
|
||||
|
||||
buildPhase = ''
|
||||
make dlpoly
|
||||
'';
|
||||
@@ -33,7 +36,7 @@ stdenv.mkDerivation {
|
||||
homepage = "https://www.ccp5.ac.uk/DL_POLY_C";
|
||||
description = "DL_POLY Classic is a general purpose molecular dynamics simulation package";
|
||||
license = licenses.bsdOriginal;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, imagemagick
|
||||
, autoreconfHook
|
||||
, libdvdread
|
||||
, libxml2
|
||||
, freetype
|
||||
@@ -15,20 +15,18 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dvdauthor";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/dvdauthor/dvdauthor-${version}.tar.gz";
|
||||
sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh";
|
||||
hash = "sha256-MCCpLen3jrNvSLbyLVoAHEcQeCZjSnhaYt/NCA9hLrc=";
|
||||
};
|
||||
|
||||
buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi flex bison ];
|
||||
|
||||
patches = [
|
||||
./dvdauthor-0.7.1-automake-1.13.patch
|
||||
./dvdauthor-0.7.1-mga-strndup.patch
|
||||
./dvdauthor-imagemagick-0.7.0.patch
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
--- dvdauthor/configure.ac~ 2013-01-04 08:27:40.713197029 +0800
|
||||
+++ dvdauthor/configure.ac 2013-01-04 08:27:53.273525273 +0800
|
||||
@@ -1,6 +1,6 @@
|
||||
AC_INIT(DVDAuthor,0.7.1,dvdauthor-users@lists.sourceforge.net)
|
||||
|
||||
-AM_CONFIG_HEADER(src/config.h)
|
||||
+AC_CONFIG_HEADERS(src/config.h)
|
||||
AC_CONFIG_AUX_DIR(autotools)
|
||||
|
||||
AM_INIT_AUTOMAKE
|
||||
@@ -1,24 +0,0 @@
|
||||
Index: dvdauthor/src/dvdvml.l
|
||||
===================================================================
|
||||
--- dvdauthor/src/dvdvml.l
|
||||
+++ dvdauthor/src/dvdvml.l 2014-09-14 19:36:05.098847465 +0000
|
||||
@@ -19,6 +19,7 @@
|
||||
* USA
|
||||
*/
|
||||
|
||||
+#include "config.h"
|
||||
#include "compat.h" /* needed for bool */
|
||||
#include "dvdvm.h"
|
||||
#include "dvdvmy.h"
|
||||
Index: dvdauthor/src/dvdvmy.y
|
||||
===================================================================
|
||||
--- dvdauthor/src/dvdvmy.y
|
||||
+++ dvdauthor/src/dvdvmy.y 2014-09-14 19:36:28.251618378 +0000
|
||||
@@ -19,6 +19,7 @@
|
||||
* USA
|
||||
*/
|
||||
|
||||
+#include "config.h"
|
||||
#include "compat.h" /* needed for bool */
|
||||
#include "dvdvm.h"
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- dvdauthor/configure.ac.orig 2010-10-23 04:26:49.000000000 +0200
|
||||
+++ dvdauthor/configure.ac 2010-10-24 14:37:45.489064778 +0200
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
usemagick=0
|
||||
|
||||
-AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config])
|
||||
+AC_CHECK_PROGS(MAGICKCONFIG, [MagickCore-config])
|
||||
if test -n "$MAGICKCONFIG"; then
|
||||
ac_save_CPPFLAGS="$CPPFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ast-grep";
|
||||
version = "0.13.1";
|
||||
version = "0.14.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
rev = version;
|
||||
hash = "sha256-Wee+npgL0+7pv9ph3S93fIXr8z/FWp/TBthJhVSx3zI=";
|
||||
hash = "sha256-TEuQ6Ng9DO2ueIvZkXKIE/gQ/v1wSyzQQRFT2Srxuxo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-OFNqBkPAKaSqDQUWisupj6FlDbm3kw0xq5nbvj04H5U=";
|
||||
cargoHash = "sha256-zg2N8yw9qviHd4EVzGakFpBzkKyzVfM/8FRXu24zL64=";
|
||||
|
||||
# Work around https://github.com/NixOS/nixpkgs/issues/166205.
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gcli";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "herrhotzenplotz";
|
||||
repo = "gcli";
|
||||
rev = version;
|
||||
hash = "sha256-ry+T39gFVPfHazAbv97UFpMIH1Dbbw6tZwsn9V4uRec=";
|
||||
hash = "sha256-JZL0AcbrGYBceQ6ctspgnbzlVD4pg95deg9BWUFQCv8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config byacc flex ];
|
||||
|
||||
@@ -18,7 +18,6 @@ python3Packages.buildPythonApplication {
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
poetry-core
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
@@ -27,11 +26,11 @@ python3Packages.buildPythonApplication {
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
hypothesis
|
||||
pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "-v" ];
|
||||
pythonImportChecks = [ "memtree" ];
|
||||
pythonImportsCheck = [ "memtree" ];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "msolve";
|
||||
version = "0.6.1";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "algebraic-solving";
|
||||
repo = "msolve";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-mcq98zMWQcmlTZt9eIJJg+IW5UBMcKR+8TzuabpOBwE=";
|
||||
hash = "sha256-hdrNqZjTGhGFrshswJGPVgBjOUfHh93aQUfBKLlk5Es=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgmoneta";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgmoneta";
|
||||
repo = "pgmoneta";
|
||||
rev = version;
|
||||
hash = "sha256-F3bQ3UytEunXf0w2Eo1vx3u0Q40usYhbCmCVuL9X9lI=";
|
||||
hash = "sha256-4jysBL6fwX2ns+N+ldhTCXZ7L/IuXjbAwou18Ur5+JU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Generated
+3093
File diff suppressed because it is too large
Load Diff
@@ -2,16 +2,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rqbit";
|
||||
version = "4.0.1";
|
||||
version = "5.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikatson";
|
||||
repo = "rqbit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qjjKS5UaBIGemw3lipTYNn+kmDlF7Yr+uwICw1cnxuE=";
|
||||
hash = "sha256-sZb3DYk2gycANRZGtSQAo3G+fo7dxGF48PwC8kJOfio=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LhVzubfiOq/u46tKFYaxzty5WnLHTP4bnObuNOYRt5A=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"network-interface-1.1.1" = "sha256-9fWdR5nr73oFP9FzHhDsbA4ifQf3LkzBygspxI9/ufs=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
@@ -23,6 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "A bittorrent client in Rust";
|
||||
homepage = "https://github.com/ikatson/rqbit";
|
||||
changelog = "https://github.com/ikatson/rqbit/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
mainProgram = "rqbit";
|
||||
|
||||
@@ -22,6 +22,7 @@ let
|
||||
u1db-qt = callPackage ./development/u1db-qt { };
|
||||
|
||||
#### QML / QML-related
|
||||
lomiri-action-api = callPackage ./qml/lomiri-action-api { };
|
||||
lomiri-settings-components = callPackage ./qml/lomiri-settings-components { };
|
||||
lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { };
|
||||
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, gitUpdater
|
||||
, testers
|
||||
, cmake
|
||||
, dbus
|
||||
, dbus-test-runner
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, qtdeclarative
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lomiri-action-api";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/lomiri-action-api";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-FOHjZ5F4IkjSn/SpZEz25CbTR/gaK4D7BRxDVSDuAl8=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Drop deprecated qt5_use_modules usage
|
||||
# Remove when https://gitlab.com/ubports/development/core/lomiri-action-api/-/merge_requests/4 merged & in release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/OPNA2608/lomiri-action-api/-/commit/ff1d7f7eb127f6a00a99e8b278c963899d0303f0.patch";
|
||||
hash = "sha256-nLUoRl260hMbtEPjOQJI/3w54xgFxjcxerAqNN5FU/0=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Queries QMake for broken Qt variable: '/build/qtbase-<commit>/$(out)/$(qtQmlPrefix)'
|
||||
substituteInPlace qml/Lomiri/Action/CMakeLists.txt \
|
||||
--replace "\''${QT_IMPORTS_DIR}/Lomiri" '${qtbase.qtQmlPrefix}/Lomiri'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
dbus
|
||||
dbus-test-runner
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_TESTING=${lib.boolToString finalAttrs.finalPackage.doCheck}"
|
||||
"-Duse_libhud2=OFF" # Use vendored libhud2, TODO package libhud2 separately?
|
||||
"-DGENERATE_DOCUMENTATION=OFF" # QML docs need qdoc, https://github.com/NixOS/nixpkgs/pull/245379
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
preCheck = ''
|
||||
export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
|
||||
export QML2_IMPORT_PATH=${lib.getBin qtdeclarative}/${qtbase.qtQmlPrefix}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Allow applications to export actions in various forms to the Lomiri Shell";
|
||||
homepage = "https://gitlab.com/ubports/development/core/lomiri-action-api";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = teams.lomiri.members;
|
||||
platforms = platforms.linux;
|
||||
pkgConfigModules = [
|
||||
"lomiri-action-qt-1"
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -1,22 +1,53 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, tzdata
|
||||
, autoreconfHook
|
||||
, openssl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.2.1";
|
||||
pname = "cxxtools";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc";
|
||||
src = fetchFromGitHub {
|
||||
owner = "maekitalo";
|
||||
repo = "cxxtools";
|
||||
rev = "V${version}";
|
||||
hash = "sha256-AiMVmtvI20nyv/nuHHxGH4xFnlc9AagVkKlnRlaYCPM=";
|
||||
};
|
||||
|
||||
configureFlags = lib.optional stdenv.isAarch64 "--with-atomictype=pthread";
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/maekitalo/cxxtools/commit/b773c01fc13d2ae67abc0839888e383be23562fd.patch";
|
||||
hash = "sha256-9yRkD+vMRhc4n/Xh6SKtmllBrmfDx3IBVOtHQV6s7Tw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/maekitalo/cxxtools/commit/6e1439a108ce3892428e95f341f2d23ae32a590e.patch";
|
||||
hash = "sha256-ZnlbdWBjL9lEtNLEF/ZPa0IzvJ7i4xWI4GbY8KeA6A4=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/tz.cpp \
|
||||
--replace '::getenv("TZDIR")' '"${tzdata}/share/zoneinfo"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.tntnet.org/cxxtools.html";
|
||||
description = "Comprehensive C++ class library for Unix and Linux";
|
||||
platforms = lib.platforms.linux ;
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = [ lib.maintainers.juliendehos ];
|
||||
};
|
||||
|
||||
@@ -2,24 +2,26 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libspectre";
|
||||
version = "0.2.7";
|
||||
version = "0.2.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://libspectre.freedesktop.org/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8";
|
||||
hash = "sha256-VadRfNNXK9JWXfDPRQlEoE1Sc7J567NpqJU5GVfw+WA=";
|
||||
};
|
||||
|
||||
patches = [ ./libspectre-0.2.7-gs918.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
# Need `libgs.so'.
|
||||
ghostscript cairo /*for tests*/
|
||||
ghostscript
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = [
|
||||
cairo
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "http://libspectre.freedesktop.org/";
|
||||
description = "PostScript rendering library";
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
Fixed error namespace for >=ghostscript-gpl-9.18
|
||||
|
||||
https://bugs.gentoo.org/563540
|
||||
|
||||
--- libspectre-0.2.7/libspectre/spectre-gs.c
|
||||
+++ libspectre-0.2.7/libspectre/spectre-gs.c
|
||||
@@ -43,12 +43,12 @@
|
||||
|
||||
if (code <= -100) {
|
||||
switch (code) {
|
||||
- case e_Fatal:
|
||||
+ case gs_error_Fatal:
|
||||
fprintf (stderr, "fatal internal error %d", code);
|
||||
return TRUE;
|
||||
break;
|
||||
|
||||
- case e_ExecStackUnderflow:
|
||||
+ case gs_error_ExecStackUnderflow:
|
||||
fprintf (stderr, "stack overflow %d", code);
|
||||
return TRUE;
|
||||
break;
|
||||
@@ -109,9 +109,9 @@
|
||||
set = _spectre_strdup_printf ("%d %d translate\n", -x, -y);
|
||||
error = gsapi_run_string_continue (ghostscript_instance, set, strlen (set),
|
||||
0, &exit_code);
|
||||
- error = error == e_NeedInput ? 0 : error;
|
||||
+ error = error == gs_error_NeedInput ? 0 : error;
|
||||
free (set);
|
||||
- if (error != e_NeedInput && critic_error_code (error)) {
|
||||
+ if (error != gs_error_NeedInput && critic_error_code (error)) {
|
||||
fclose (fd);
|
||||
return FALSE;
|
||||
}
|
||||
@@ -126,7 +126,7 @@
|
||||
read = fread (buf, sizeof (char), to_read, fd);
|
||||
error = gsapi_run_string_continue (ghostscript_instance,
|
||||
buf, read, 0, &exit_code);
|
||||
- error = error == e_NeedInput ? 0 : error;
|
||||
+ error = error == gs_error_NeedInput ? 0 : error;
|
||||
left -= read;
|
||||
}
|
||||
|
||||
@@ -1,22 +1,45 @@
|
||||
{ lib, stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, cxxtools
|
||||
, postgresql
|
||||
, libmysqlclient
|
||||
, sqlite
|
||||
, zlib
|
||||
, openssl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tntdb";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "maekitalo";
|
||||
repo = "tntdb";
|
||||
rev = "V${version}";
|
||||
hash = "sha256-ciqHv077sXnvCx+TJjdY1uPrlCP7/s972koXjGLgWhU=";
|
||||
};
|
||||
|
||||
buildInputs = [ cxxtools postgresql libmysqlclient sqlite zlib openssl ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cxxtools
|
||||
postgresql
|
||||
libmysqlclient
|
||||
sqlite
|
||||
zlib
|
||||
openssl
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.tntnet.org/tntdb.html";
|
||||
description = "C++ library which makes accessing SQL databases easy and robust";
|
||||
platforms = platforms.linux ;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.lgpl21;
|
||||
maintainers = [ maintainers.juliendehos ];
|
||||
};
|
||||
|
||||
@@ -1,22 +1,49 @@
|
||||
{ lib, stdenv, fetchurl, cxxtools, zlib, openssl, zip }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, cxxtools
|
||||
, zlib
|
||||
, openssl
|
||||
, zip
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tntnet";
|
||||
version = "2.2.1";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "08bmak9mpbamwwl3h9p8x5qzwqlm9g3jh70y0ml5hk7hiv870cf8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "maekitalo";
|
||||
repo = "tntnet";
|
||||
rev = "V${version}";
|
||||
hash = "sha256-ujVPOreCGCFlYHa19yCIiZ0ed+p0jnS14DHDwKYvtc0=";
|
||||
};
|
||||
|
||||
buildInputs = [ cxxtools zlib openssl zip ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/maekitalo/tntnet/commit/69adfc8ee351a0e82990c1ffa7af6dab726e1e49.patch";
|
||||
hash = "sha256-4UdUXKQiIa9CPlGg8XmfKQ8NTWb2A3AiuPthzEthlf8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cxxtools
|
||||
zlib
|
||||
openssl
|
||||
zip
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.tntnet.org/tntnet.html";
|
||||
description = "Web server which allows users to develop web applications using C++";
|
||||
platforms = platforms.linux ;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.lgpl21;
|
||||
maintainers = [ maintainers.juliendehos ];
|
||||
};
|
||||
|
||||
@@ -2724,6 +2724,29 @@ buildLuarocksPackage {
|
||||
};
|
||||
}) {};
|
||||
|
||||
nlua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "nlua";
|
||||
version = "0.1.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/nlua-0.1.0-1.rockspec";
|
||||
sha256 = "14ynhy85m2prawym1ap1kplkbicafbczpggzgdnji00frwqa1zvv";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mfussenegger/nlua/archive/v0.1.0.zip";
|
||||
sha256 = "1x3pbv5ngbk0sjgwfpjsv3x49wzq4x29d9rm0hgyyb2g2mwag3jc";
|
||||
};
|
||||
|
||||
disabled = (luaOlder "5.1");
|
||||
propagatedBuildInputs = [ lua ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/mfussenegger/nlua";
|
||||
description = "Neovim as Lua interpreter";
|
||||
license.fullName = "GPL-3.0";
|
||||
};
|
||||
}) {};
|
||||
|
||||
nui-nvim = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }:
|
||||
buildLuarocksPackage {
|
||||
pname = "nui.nvim";
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
[flake8]
|
||||
# E111 => 4 spaces tabs
|
||||
# don't let spaces else it is not recognized
|
||||
# E123 buggy
|
||||
ignore =
|
||||
E501,E265,E402
|
||||
@@ -6,10 +6,24 @@
|
||||
# , nix-prefetch-git
|
||||
, nix-prefetch-scripts
|
||||
, luarocks-nix
|
||||
, lua5_1
|
||||
, lua5_2
|
||||
, lua5_3
|
||||
, lua5_4
|
||||
}:
|
||||
let
|
||||
|
||||
path = lib.makeBinPath [ nix nix-prefetch-scripts luarocks-nix ];
|
||||
path = lib.makeBinPath [
|
||||
nix nix-prefetch-scripts luarocks-nix
|
||||
];
|
||||
|
||||
luaversions = [
|
||||
lua5_1
|
||||
lua5_2
|
||||
lua5_3
|
||||
lua5_4
|
||||
];
|
||||
|
||||
in
|
||||
buildPythonApplication {
|
||||
pname = "luarocks-packages-updater";
|
||||
@@ -34,7 +48,12 @@ buildPythonApplication {
|
||||
cp ${../../../../maintainers/scripts/pluginupdate.py} $out/lib/pluginupdate.py
|
||||
|
||||
# wrap python scripts
|
||||
makeWrapperArgs+=( --prefix PATH : "${path}" --prefix PYTHONPATH : "$out/lib" )
|
||||
makeWrapperArgs+=( --prefix PATH : "${path}" --prefix PYTHONPATH : "$out/lib" \
|
||||
--set LUA_51 ${lua5_1} \
|
||||
--set LUA_52 ${lua5_2} \
|
||||
--set LUA_53 ${lua5_3} \
|
||||
--set LUA_54 ${lua5_4}
|
||||
)
|
||||
wrapPythonProgramsIn "$out"
|
||||
'';
|
||||
|
||||
|
||||
@@ -16,6 +16,8 @@ import csv
|
||||
import logging
|
||||
import textwrap
|
||||
from multiprocessing.dummy import Pool
|
||||
import pluginupdate
|
||||
from pluginupdate import update_plugins, FetchConfig
|
||||
|
||||
from typing import List, Tuple, Optional
|
||||
from pathlib import Path
|
||||
@@ -24,8 +26,6 @@ log = logging.getLogger()
|
||||
log.addHandler(logging.StreamHandler())
|
||||
|
||||
ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore
|
||||
import pluginupdate
|
||||
from pluginupdate import update_plugins, FetchConfig, CleanEnvironment
|
||||
|
||||
PKG_LIST = "maintainers/scripts/luarocks-packages.csv"
|
||||
TMP_FILE = "$(mktemp)"
|
||||
@@ -171,7 +171,6 @@ def generate_pkg_nix(plug: LuaPlugin):
|
||||
if plug.maintainers:
|
||||
cmd.append(f"--maintainers={plug.maintainers}")
|
||||
|
||||
# if plug.server == "src":
|
||||
if plug.src != "":
|
||||
if plug.src is None:
|
||||
msg = (
|
||||
@@ -193,6 +192,9 @@ def generate_pkg_nix(plug: LuaPlugin):
|
||||
|
||||
if plug.luaversion:
|
||||
cmd.append(f"--lua-version={plug.luaversion}")
|
||||
luaver = plug.luaversion.replace('.', '')
|
||||
if luaver := os.getenv(f"LUA_{luaver}"):
|
||||
cmd.append(f"--lua-dir={luaver}")
|
||||
|
||||
log.debug("running %s", " ".join(cmd))
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "click-aliases";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "click-contrib";
|
||||
repo = "click-aliases";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HTjo6ID27W7D4MZjeAJMSy5yVd6oKg0Ed9/kDtQZ7Vw=";
|
||||
hash = "sha256-3/O5odibSjo5inlLCvUlotphhMVLBdaND/M2f40pMyM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -80,5 +80,6 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/executablebooks/markdown-it-py/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bhipple ];
|
||||
mainProgram = "markdown-it";
|
||||
};
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -364,12 +364,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-aiobotocore";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-s6F2fipCzJKd4jn2flSircKuDBn2OsEEi0nX8aSxbnY=";
|
||||
hash = "sha256-QSZDFXiVEXFHTE7FrLZVUeLOOyPTG96PIMg9lziiwDc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,379 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
source_file=pkgs/development/python-modules/types-aiobotocore-packages/default.nix
|
||||
|
||||
version="2.9.0"
|
||||
|
||||
nix-update python311Packages.types-aiobotocore --commit --build
|
||||
|
||||
packages=(
|
||||
types-aiobotocore-alexaforbusiness
|
||||
types-aiobotocore-amp
|
||||
types-aiobotocore-amplify
|
||||
types-aiobotocore-amplifybackend
|
||||
types-aiobotocore-amplifyuibuilder
|
||||
types-aiobotocore-apigateway
|
||||
types-aiobotocore-apigatewaymanagementapi
|
||||
types-aiobotocore-apigatewayv2
|
||||
types-aiobotocore-appconfig
|
||||
types-aiobotocore-appconfigdata
|
||||
types-aiobotocore-appfabric
|
||||
types-aiobotocore-appflow
|
||||
types-aiobotocore-appintegrations
|
||||
types-aiobotocore-application-autoscaling
|
||||
types-aiobotocore-application-insights
|
||||
types-aiobotocore-applicationcostprofiler
|
||||
types-aiobotocore-appmesh
|
||||
types-aiobotocore-apprunner
|
||||
types-aiobotocore-appstream
|
||||
types-aiobotocore-appsync
|
||||
types-aiobotocore-arc-zonal-shift
|
||||
types-aiobotocore-athena
|
||||
types-aiobotocore-auditmanager
|
||||
types-aiobotocore-autoscaling
|
||||
types-aiobotocore-autoscaling-plans
|
||||
types-aiobotocore-backup
|
||||
types-aiobotocore-backup-gateway
|
||||
types-aiobotocore-backupstorage
|
||||
types-aiobotocore-batch
|
||||
types-aiobotocore-billingconductor
|
||||
types-aiobotocore-braket
|
||||
types-aiobotocore-budgets
|
||||
types-aiobotocore-ce
|
||||
types-aiobotocore-chime
|
||||
types-aiobotocore-chime-sdk-identity
|
||||
types-aiobotocore-chime-sdk-media-pipelines
|
||||
types-aiobotocore-chime-sdk-meetings
|
||||
types-aiobotocore-chime-sdk-messaging
|
||||
types-aiobotocore-chime-sdk-voice
|
||||
types-aiobotocore-cleanrooms
|
||||
types-aiobotocore-cloud9
|
||||
types-aiobotocore-cloudcontrol
|
||||
types-aiobotocore-clouddirectory
|
||||
types-aiobotocore-cloudformation
|
||||
types-aiobotocore-cloudfront
|
||||
types-aiobotocore-cloudhsm
|
||||
types-aiobotocore-cloudhsmv2
|
||||
types-aiobotocore-cloudsearch
|
||||
types-aiobotocore-cloudsearchdomain
|
||||
types-aiobotocore-cloudtrail
|
||||
types-aiobotocore-cloudtrail-data
|
||||
types-aiobotocore-cloudwatch
|
||||
types-aiobotocore-codeartifact
|
||||
types-aiobotocore-codebuild
|
||||
types-aiobotocore-codecatalyst
|
||||
types-aiobotocore-codecommit
|
||||
types-aiobotocore-codedeploy
|
||||
types-aiobotocore-codeguru-reviewer
|
||||
types-aiobotocore-codeguru-security
|
||||
types-aiobotocore-codeguruprofiler
|
||||
types-aiobotocore-codepipeline
|
||||
types-aiobotocore-codestar
|
||||
types-aiobotocore-codestar-connections
|
||||
types-aiobotocore-codestar-notifications
|
||||
types-aiobotocore-cognito-identity
|
||||
types-aiobotocore-cognito-idp
|
||||
types-aiobotocore-cognito-sync
|
||||
types-aiobotocore-comprehend
|
||||
types-aiobotocore-comprehendmedical
|
||||
types-aiobotocore-compute-optimizer
|
||||
types-aiobotocore-config
|
||||
types-aiobotocore-connect
|
||||
types-aiobotocore-connect-contact-lens
|
||||
types-aiobotocore-connectcampaigns
|
||||
types-aiobotocore-connectcases
|
||||
types-aiobotocore-connectparticipant
|
||||
types-aiobotocore-controltower
|
||||
types-aiobotocore-cur
|
||||
types-aiobotocore-customer-profiles
|
||||
types-aiobotocore-databrew
|
||||
types-aiobotocore-dataexchange
|
||||
types-aiobotocore-datapipeline
|
||||
types-aiobotocore-datasync
|
||||
types-aiobotocore-dax
|
||||
types-aiobotocore-detective
|
||||
types-aiobotocore-devicefarm
|
||||
types-aiobotocore-devops-guru
|
||||
types-aiobotocore-directconnect
|
||||
types-aiobotocore-discovery
|
||||
types-aiobotocore-dlm
|
||||
types-aiobotocore-dms
|
||||
types-aiobotocore-docdb
|
||||
types-aiobotocore-docdb-elastic
|
||||
types-aiobotocore-drs
|
||||
types-aiobotocore-ds
|
||||
types-aiobotocore-dynamodb
|
||||
types-aiobotocore-dynamodbstreams
|
||||
types-aiobotocore-ebs
|
||||
types-aiobotocore-ec2
|
||||
types-aiobotocore-ec2-instance-connect
|
||||
types-aiobotocore-ecr
|
||||
types-aiobotocore-ecr-public
|
||||
types-aiobotocore-ecs
|
||||
types-aiobotocore-efs
|
||||
types-aiobotocore-eks
|
||||
types-aiobotocore-elastic-inference
|
||||
types-aiobotocore-elasticache
|
||||
types-aiobotocore-elasticbeanstalk
|
||||
types-aiobotocore-elastictranscoder
|
||||
types-aiobotocore-elb
|
||||
types-aiobotocore-elbv2
|
||||
types-aiobotocore-emr
|
||||
types-aiobotocore-emr-containers
|
||||
types-aiobotocore-emr-serverless
|
||||
types-aiobotocore-entityresolution
|
||||
types-aiobotocore-es
|
||||
types-aiobotocore-events
|
||||
types-aiobotocore-evidently
|
||||
types-aiobotocore-finspace
|
||||
types-aiobotocore-finspace-data
|
||||
types-aiobotocore-firehose
|
||||
types-aiobotocore-fis
|
||||
types-aiobotocore-fms
|
||||
types-aiobotocore-forecast
|
||||
types-aiobotocore-forecastquery
|
||||
types-aiobotocore-frauddetector
|
||||
types-aiobotocore-fsx
|
||||
types-aiobotocore-gamelift
|
||||
types-aiobotocore-glacier
|
||||
types-aiobotocore-globalaccelerator
|
||||
types-aiobotocore-glue
|
||||
types-aiobotocore-grafana
|
||||
types-aiobotocore-greengrass
|
||||
types-aiobotocore-greengrassv2
|
||||
types-aiobotocore-groundstation
|
||||
types-aiobotocore-guardduty
|
||||
types-aiobotocore-health
|
||||
types-aiobotocore-healthlake
|
||||
types-aiobotocore-honeycode
|
||||
types-aiobotocore-iam
|
||||
types-aiobotocore-identitystore
|
||||
types-aiobotocore-imagebuilder
|
||||
types-aiobotocore-importexport
|
||||
types-aiobotocore-inspector
|
||||
types-aiobotocore-inspector2
|
||||
types-aiobotocore-internetmonitor
|
||||
types-aiobotocore-iot
|
||||
types-aiobotocore-iot-data
|
||||
types-aiobotocore-iot-jobs-data
|
||||
types-aiobotocore-iot-roborunner
|
||||
types-aiobotocore-iot1click-devices
|
||||
types-aiobotocore-iot1click-projects
|
||||
types-aiobotocore-iotanalytics
|
||||
types-aiobotocore-iotdeviceadvisor
|
||||
types-aiobotocore-iotevents
|
||||
types-aiobotocore-iotevents-data
|
||||
types-aiobotocore-iotfleethub
|
||||
types-aiobotocore-iotfleetwise
|
||||
types-aiobotocore-iotsecuretunneling
|
||||
types-aiobotocore-iotsitewise
|
||||
types-aiobotocore-iotthingsgraph
|
||||
types-aiobotocore-iottwinmaker
|
||||
types-aiobotocore-iotwireless
|
||||
types-aiobotocore-ivs
|
||||
types-aiobotocore-ivs-realtime
|
||||
types-aiobotocore-ivschat
|
||||
types-aiobotocore-kafka
|
||||
types-aiobotocore-kafkaconnect
|
||||
types-aiobotocore-kendra
|
||||
types-aiobotocore-kendra-ranking
|
||||
types-aiobotocore-keyspaces
|
||||
types-aiobotocore-kinesis
|
||||
types-aiobotocore-kinesis-video-archived-media
|
||||
types-aiobotocore-kinesis-video-media
|
||||
types-aiobotocore-kinesis-video-signaling
|
||||
types-aiobotocore-kinesis-video-webrtc-storage
|
||||
types-aiobotocore-kinesisanalytics
|
||||
types-aiobotocore-kinesisanalyticsv2
|
||||
types-aiobotocore-kinesisvideo
|
||||
types-aiobotocore-kms
|
||||
types-aiobotocore-lakeformation
|
||||
types-aiobotocore-lambda
|
||||
types-aiobotocore-lex-models
|
||||
types-aiobotocore-lex-runtime
|
||||
types-aiobotocore-lexv2-models
|
||||
types-aiobotocore-lexv2-runtime
|
||||
types-aiobotocore-license-manager
|
||||
types-aiobotocore-license-manager-linux-subscriptions
|
||||
types-aiobotocore-license-manager-user-subscriptions
|
||||
types-aiobotocore-lightsail
|
||||
types-aiobotocore-location
|
||||
types-aiobotocore-logs
|
||||
types-aiobotocore-lookoutequipment
|
||||
types-aiobotocore-lookoutmetrics
|
||||
types-aiobotocore-lookoutvision
|
||||
types-aiobotocore-m2
|
||||
types-aiobotocore-machinelearning
|
||||
types-aiobotocore-macie2
|
||||
types-aiobotocore-managedblockchain
|
||||
types-aiobotocore-managedblockchain-query
|
||||
types-aiobotocore-marketplace-catalog
|
||||
types-aiobotocore-marketplace-entitlement
|
||||
types-aiobotocore-marketplacecommerceanalytics
|
||||
types-aiobotocore-mediaconnect
|
||||
types-aiobotocore-mediaconvert
|
||||
types-aiobotocore-medialive
|
||||
types-aiobotocore-mediapackage
|
||||
types-aiobotocore-mediapackage-vod
|
||||
types-aiobotocore-mediapackagev2
|
||||
types-aiobotocore-mediastore
|
||||
types-aiobotocore-mediastore-data
|
||||
types-aiobotocore-mediatailor
|
||||
types-aiobotocore-medical-imaging
|
||||
types-aiobotocore-memorydb
|
||||
types-aiobotocore-meteringmarketplace
|
||||
types-aiobotocore-mgh
|
||||
types-aiobotocore-mgn
|
||||
types-aiobotocore-migration-hub-refactor-spaces
|
||||
types-aiobotocore-migrationhub-config
|
||||
types-aiobotocore-migrationhuborchestrator
|
||||
types-aiobotocore-migrationhubstrategy
|
||||
types-aiobotocore-mobile
|
||||
types-aiobotocore-mq
|
||||
types-aiobotocore-mturk
|
||||
types-aiobotocore-mwaa
|
||||
types-aiobotocore-neptune
|
||||
types-aiobotocore-network-firewall
|
||||
types-aiobotocore-networkmanager
|
||||
types-aiobotocore-nimble
|
||||
types-aiobotocore-oam
|
||||
types-aiobotocore-omics
|
||||
types-aiobotocore-opensearch
|
||||
types-aiobotocore-opensearchserverless
|
||||
types-aiobotocore-opsworks
|
||||
types-aiobotocore-opsworkscm
|
||||
types-aiobotocore-organizations
|
||||
types-aiobotocore-osis
|
||||
types-aiobotocore-outposts
|
||||
types-aiobotocore-panorama
|
||||
types-aiobotocore-payment-cryptography
|
||||
types-aiobotocore-payment-cryptography-data
|
||||
types-aiobotocore-personalize
|
||||
types-aiobotocore-personalize-events
|
||||
types-aiobotocore-personalize-runtime
|
||||
types-aiobotocore-pi
|
||||
types-aiobotocore-pinpoint
|
||||
types-aiobotocore-pinpoint-email
|
||||
types-aiobotocore-pinpoint-sms-voice
|
||||
types-aiobotocore-pinpoint-sms-voice-v2
|
||||
types-aiobotocore-pipes
|
||||
types-aiobotocore-polly
|
||||
types-aiobotocore-pricing
|
||||
types-aiobotocore-privatenetworks
|
||||
types-aiobotocore-proton
|
||||
types-aiobotocore-qldb
|
||||
types-aiobotocore-qldb-session
|
||||
types-aiobotocore-quicksight
|
||||
types-aiobotocore-ram
|
||||
types-aiobotocore-rbin
|
||||
types-aiobotocore-rds
|
||||
types-aiobotocore-rds-data
|
||||
types-aiobotocore-redshift
|
||||
types-aiobotocore-redshift-data
|
||||
types-aiobotocore-redshift-serverless
|
||||
types-aiobotocore-rekognition
|
||||
types-aiobotocore-resiliencehub
|
||||
types-aiobotocore-resource-explorer-2
|
||||
types-aiobotocore-resource-groups
|
||||
types-aiobotocore-resourcegroupstaggingapi
|
||||
types-aiobotocore-robomaker
|
||||
types-aiobotocore-rolesanywhere
|
||||
types-aiobotocore-route53
|
||||
types-aiobotocore-route53-recovery-cluster
|
||||
types-aiobotocore-route53-recovery-control-config
|
||||
types-aiobotocore-route53-recovery-readiness
|
||||
types-aiobotocore-route53domains
|
||||
types-aiobotocore-route53resolver
|
||||
types-aiobotocore-rum
|
||||
types-aiobotocore-s3
|
||||
types-aiobotocore-s3control
|
||||
types-aiobotocore-s3outposts
|
||||
types-aiobotocore-sagemaker
|
||||
types-aiobotocore-sagemaker-a2i-runtime
|
||||
types-aiobotocore-sagemaker-edge
|
||||
types-aiobotocore-sagemaker-featurestore-runtime
|
||||
types-aiobotocore-sagemaker-geospatial
|
||||
types-aiobotocore-sagemaker-metrics
|
||||
types-aiobotocore-sagemaker-runtime
|
||||
types-aiobotocore-savingsplans
|
||||
types-aiobotocore-scheduler
|
||||
types-aiobotocore-schemas
|
||||
types-aiobotocore-sdb
|
||||
types-aiobotocore-secretsmanager
|
||||
types-aiobotocore-securityhub
|
||||
types-aiobotocore-securitylake
|
||||
types-aiobotocore-serverlessrepo
|
||||
types-aiobotocore-service-quotas
|
||||
types-aiobotocore-servicecatalog
|
||||
types-aiobotocore-servicecatalog-appregistry
|
||||
types-aiobotocore-servicediscovery
|
||||
types-aiobotocore-ses
|
||||
types-aiobotocore-sesv2
|
||||
types-aiobotocore-shield
|
||||
types-aiobotocore-signer
|
||||
types-aiobotocore-simspaceweaver
|
||||
types-aiobotocore-sms
|
||||
types-aiobotocore-sms-voice
|
||||
types-aiobotocore-snow-device-management
|
||||
types-aiobotocore-snowball
|
||||
types-aiobotocore-sns
|
||||
types-aiobotocore-sqs
|
||||
types-aiobotocore-ssm
|
||||
types-aiobotocore-ssm-contacts
|
||||
types-aiobotocore-ssm-incidents
|
||||
types-aiobotocore-ssm-sap
|
||||
types-aiobotocore-sso
|
||||
types-aiobotocore-sso-admin
|
||||
types-aiobotocore-sso-oidc
|
||||
types-aiobotocore-stepfunctions
|
||||
types-aiobotocore-storagegateway
|
||||
types-aiobotocore-sts
|
||||
types-aiobotocore-support
|
||||
types-aiobotocore-support-app
|
||||
types-aiobotocore-swf
|
||||
types-aiobotocore-synthetics
|
||||
types-aiobotocore-textract
|
||||
types-aiobotocore-timestream-query
|
||||
types-aiobotocore-timestream-write
|
||||
types-aiobotocore-tnb
|
||||
types-aiobotocore-transcribe
|
||||
types-aiobotocore-transfer
|
||||
types-aiobotocore-translate
|
||||
types-aiobotocore-verifiedpermissions
|
||||
types-aiobotocore-voice-id
|
||||
types-aiobotocore-vpc-lattice
|
||||
types-aiobotocore-waf
|
||||
types-aiobotocore-waf-regional
|
||||
types-aiobotocore-wafv2
|
||||
types-aiobotocore-wellarchitected
|
||||
types-aiobotocore-wisdom
|
||||
types-aiobotocore-workdocs
|
||||
types-aiobotocore-worklink
|
||||
types-aiobotocore-workmail
|
||||
types-aiobotocore-workmailmessageflow
|
||||
types-aiobotocore-workspaces
|
||||
types-aiobotocore-workspaces-web
|
||||
types-aiobotocore-xray
|
||||
)
|
||||
|
||||
for package in "${packages[@]}"; do
|
||||
echo "Updating ${package}"
|
||||
|
||||
url="https://pypi.io/packages/source/t/${package}/${package}-${version}.tar.gz"
|
||||
hash=$(nix-prefetch-url --type sha256 $url)
|
||||
sri_hash="$(nix hash to-sri --type sha256 $hash)"
|
||||
|
||||
awk -i inplace -v package="$package" -v new_version="$version" -v new_sha256="$sri_hash" '
|
||||
$1 == package {
|
||||
$5 = "\"" new_version "\"";
|
||||
$6 = "\"" new_sha256 "\";";
|
||||
}
|
||||
{print}
|
||||
' $source_file
|
||||
|
||||
done
|
||||
|
||||
nixpkgs-fmt ${source_file}
|
||||
@@ -8,6 +8,8 @@
|
||||
, makeWrapper
|
||||
, callPackage
|
||||
, jre
|
||||
, testers
|
||||
, scala-cli
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -77,4 +79,9 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
passthru.updateScript = callPackage ./update.nix { } { inherit platforms pname version; };
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = scala-cli;
|
||||
command = "scala-cli version --offline";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "1.0.5",
|
||||
"version": "1.1.0",
|
||||
"assets": {
|
||||
"aarch64-darwin": {
|
||||
"asset": "scala-cli-aarch64-apple-darwin.gz",
|
||||
"sha256": "1p2ibii71digdz7qqqyahvdmmxyx19crwgn4bmas0hahl6mz553x"
|
||||
"sha256": "1w8vxfyn1h5x5jxh4w133w0l566ly3chhkff06jy1gik4hszd97y"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"asset": "scala-cli-aarch64-pc-linux.gz",
|
||||
"sha256": "1y9ghb829jz9yg4l7bgwnbl3cm7z7c20cyfc71v9iz8bq5ns9akr"
|
||||
"sha256": "0k3nsn2zzfqbkibrd5hzrsbg35x08ss4l2f7nwwa59grj5jgpm0f"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"asset": "scala-cli-x86_64-apple-darwin.gz",
|
||||
"sha256": "12qjrm979pfbr0j7s59dyn7xkk585av7l0qxf77rz71009kvql0a"
|
||||
"sha256": "016mdi5bp1x0r2hak4c3j26y8zrhvhsl1w7gvzsbybpbfd5p45hv"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"asset": "scala-cli-x86_64-pc-linux.gz",
|
||||
"sha256": "17x4nv5f8g1kx8l4n8ncxf60zwhwpqg8fh5cl8qy9s5h9h81n0rz"
|
||||
"sha256": "0q2aqwjldsdbir8s8mix2wqkhiwb4q5d3ljf9gzxqqxgc9h4v78j"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}";
|
||||
version = "2.20.0";
|
||||
version = "2.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "harness";
|
||||
repo = "drone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YiKULnLSP5wgrYob1t4HssGS9ubSR5dHECIwnAicg8M=";
|
||||
sha256 = "sha256-ywKRibJxOVYQ7SNef38eUk1QkVnCoFbIMIGPCw2Woek=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3GPe76zcyKItYWedmnAnmN4c1AorQePxxWXkRk0vNpk=";
|
||||
vendorHash = "sha256-nryEdqRKXyum9Vrna3aqhhYekjvNIvct8gqbKEBR9iE=";
|
||||
|
||||
tags = lib.optionals (!enableUnfree) [ "oss" "nolimit" ];
|
||||
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jenkins";
|
||||
version = "2.426.1";
|
||||
version = "2.426.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
|
||||
hash = "sha256-jYTzzdZDDAmNH084dAlX4/LQrCYbL5xoy/nDBjY/0cg=";
|
||||
hash = "sha256-NzG59Elz+78+U1+YqAwhqtlxnLTuqKHlnpdMEf6EaEg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k6";
|
||||
version = "0.47.0";
|
||||
version = "0.48.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-90r6dyesYfa/eC/joUDPDfGU8r8qbPzzhwf0EwnGee0=";
|
||||
hash = "sha256-6EiHLm69mBhv0ujFPdXUk1wPZwKk9TS250QHrdXfQD8=";
|
||||
};
|
||||
|
||||
subPackages = [ "./" ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, cmake, makeWrapper
|
||||
{ lib, stdenv, fetchurl, fetchpatch, cmake, makeWrapper
|
||||
, llvm, libclang
|
||||
, flex
|
||||
, zlib
|
||||
@@ -15,6 +15,35 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "2xwPEjln8k1iCwQM69UwAb89zwPkAPeFVqL/LhH+oGM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Port to LLVM 15
|
||||
(fetchpatch {
|
||||
url = "https://github.com/csmith-project/creduce/commit/e507cca4ccb32585c5692d49b8d907c1051c826c.patch";
|
||||
hash = "sha256-jO5E85AvHcjlErbUhzuQDXwQkhQsXklcTMQfWBd09OU=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/csmith-project/creduce/commit/8d56bee3e1d2577fc8afd2ecc03b1323d6873404.patch";
|
||||
hash = "sha256-dRaBaJAYkvMyxKvfriOcg4D+4i6+6orZ85zws1AFx/s=";
|
||||
})
|
||||
# Port to LLVM 16
|
||||
(fetchpatch {
|
||||
url = "https://github.com/csmith-project/creduce/commit/8ab9a69caf13ce24172737e8bfd09de51a1ecb6a.patch";
|
||||
hash = "sha256-gPNXxYHnsyUvXmC0CGtsulH2Fu/EMnDE4GdOYc0UbiQ=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "-std=c++11" "-std=c++17"
|
||||
''
|
||||
# On Linux, c-reduce's preferred way to reason about
|
||||
# the cpu architecture/topology is to use 'lscpu',
|
||||
# so let's make sure it knows where to find it:
|
||||
+ lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace creduce/creduce_utils.pm --replace \
|
||||
lscpu ${util-linux}/bin/lscpu
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper llvm.dev ];
|
||||
buildInputs = [
|
||||
# Ensure stdenv's CC is on PATH before clang-unwrapped
|
||||
@@ -24,14 +53,6 @@ stdenv.mkDerivation rec {
|
||||
flex zlib
|
||||
] ++ (with perlPackages; [ perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey ]);
|
||||
|
||||
# On Linux, c-reduce's preferred way to reason about
|
||||
# the cpu architecture/topology is to use 'lscpu',
|
||||
# so let's make sure it knows where to find it:
|
||||
postPatch = lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace creduce/creduce_utils.pm --replace \
|
||||
lscpu ${util-linux}/bin/lscpu
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/creduce --prefix PERL5LIB : "$PERL5LIB"
|
||||
'';
|
||||
|
||||
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ jansson ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=strict-prototypes";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/keenerd/jshon/pull/62
|
||||
|
||||
@@ -4,16 +4,16 @@ let
|
||||
# comments with variant added for update script
|
||||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "6.6.6"; #zen
|
||||
version = "6.6.7"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "13lxj1841mykfmbd8pwshr8jjxpxw1d8dyzkzq4ks6nviivnqfsn"; #zen
|
||||
sha256 = "1fl8kfrxp9gnj7ngva1fq6sxmbpih6arl3ql0av775zi46kw0z7m"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "6.6.6"; #lqx
|
||||
version = "6.6.7"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "0p3ilsikd0v2k6d40n5s3smipww817yw2y47ayi1xj8m44rlp8gg"; #lqx
|
||||
sha256 = "0qf5azv399cysrr2a98jmz5f3125kg96z3ckmdh0gh680sxi9jf1"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
|
||||
@@ -9,11 +9,11 @@ let
|
||||
owner = "superseriousbusiness";
|
||||
repo = "gotosocial";
|
||||
|
||||
version = "0.12.2";
|
||||
version = "0.13.0";
|
||||
|
||||
web-assets = fetchurl {
|
||||
url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz";
|
||||
hash = "sha256-vEjL9pZFBSt32ZqWZGvG112HA5nqkwY6uOQY3hBUWN4=";
|
||||
hash = "sha256-aPxjfe+0f4hUBfwBH67LsR1/Kv/42sPhlHwmVmDfp30=";
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
@@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ufxedg3SSHqYf5g1GXXSWA0pmb305kpjkjyjwCX126A=";
|
||||
hash = "sha256-+/x3CAGF/cjK1/7fHgC8EzlGR/Xmq3aFL5Ogc/QZCpA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -41,14 +41,14 @@ let
|
||||
in
|
||||
with py.pkgs; buildPythonApplication rec {
|
||||
pname = "awscli2";
|
||||
version = "2.14.2"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
version = "2.15.0"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-cli";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ECP22D4lQzJ/13/oXkOgn97EhRRuXv4vW0FtlwugrNs=";
|
||||
hash = "sha256-02KGaYMVlNFPhWBhRIgwhm7FcwT7cBxKv6HDXjqpn5s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ fuse perl ];
|
||||
|
||||
makeFlags = [ "CXXFLAGS=-std=c++03" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "FUSE Compressed ROM filesystem with lzma";
|
||||
homepage = "https://bisqwit.iki.fi/source/cromfs.html";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.4.2";
|
||||
version = "2.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rvaiya";
|
||||
repo = "keyd";
|
||||
rev = "v" + version;
|
||||
hash = "sha256-QWr+xog16MmybhQlEWbskYa/dypb9Ld54MOdobTbyMo=";
|
||||
hash = "sha256-NhZnFIdK0yHgFR+rJm4cW+uEhuQkOpCSLwlXNQy6jas=";
|
||||
};
|
||||
|
||||
pypkgs = python3.pkgs;
|
||||
@@ -47,13 +47,14 @@ stdenv.mkDerivation {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace DESTDIR= DESTDIR=${placeholder "out"} \
|
||||
--replace /usr ""
|
||||
|
||||
substituteInPlace keyd.service \
|
||||
--replace /usr/bin $out/bin
|
||||
'';
|
||||
|
||||
installFlags = [ "DESTDIR=${placeholder "out"}" ];
|
||||
|
||||
buildInputs = [ systemd ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -11,6 +11,11 @@ stdenv.mkDerivation {
|
||||
hash = "sha256-Li/c5uf9rfpuU+hduuSm7EmhVwIIkS72dqzmN+0cE3A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace contacts.m \
|
||||
--replace "int peopleSort" "long peopleSort"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ xcbuildHook ];
|
||||
buildInputs = [ Foundation AddressBook ];
|
||||
|
||||
|
||||
@@ -23,6 +23,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [ openmp ];
|
||||
|
||||
buildFlags = [ (lib.optional (openmp == null) "NO_OPENMP=1") ];
|
||||
|
||||
# clang builds require at least C99 or the build fails with:
|
||||
# error: unknown type name 'inline'
|
||||
env.NIX_CFLAGS_COMPILE = "-std=c99";
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
rustPlatform,
|
||||
llvmPackages,
|
||||
xen-light,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xen-guest-agent";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "xen-project";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Csio24ofj+p0j/R0av/28P/KCNXhmcF+r8xGJEfoHjQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XWDDzSu88zCIwMuvkFjCb98DzXHvW2IP9u3EbpAMIgw=";
|
||||
|
||||
env = {
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
BINDGEN_EXTRA_CLANG_ARGS = "-isystem ${xen-light}/include";
|
||||
RUSTFLAGS = "-L ${xen-light}/lib";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [llvmPackages.clang xen-light];
|
||||
|
||||
postFixup = ''
|
||||
patchelf $out/bin/xen-guest-agent --add-rpath ${xen-light}/lib
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Xen agent running in Linux/BSDs (POSIX) VMs";
|
||||
homepage = "https://gitlab.com/xen-project/xen-guest-agent";
|
||||
license = licenses.agpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [matdibu];
|
||||
};
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchurl
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, pkg-config
|
||||
@@ -14,14 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xwaylandvideobridge";
|
||||
version = "0.2";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "system";
|
||||
repo = "xwaylandvideobridge";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-79Z4BH7C85ZF+1Zivs3bTey7IdUnaDKhvZxzL6sDqUs=";
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/xwaylandvideobridge/xwaylandvideobridge-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-+Npuj+DsO9XqeXr4qtj+Haqzb8PHfi02u3RDgyzfz/o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -42,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Utility to allow streaming Wayland windows to X applications";
|
||||
homepage = "https://invent.kde.org/system/xwaylandvideobridge";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
license = with lib.licenses; [ bsd3 cc0 gpl2Plus ];
|
||||
maintainers = with lib.maintainers; [ stepbrobd ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "xwaylandvideobridge";
|
||||
|
||||
@@ -1027,6 +1027,8 @@ mapAliases ({
|
||||
### X ###
|
||||
|
||||
xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # Added 2021-11-19
|
||||
xcbuild6Hook = throw "'xcbuild6Hook has been renamed to/replaced by 'xcbuildHook'"; # Added 2023-12-10
|
||||
xcodebuild6 = throw "'xcodebuild6' has been renamed to/replaced by 'xcodebuild'"; # Added 2023-12-10
|
||||
xdg_utils = xdg-utils; # Added 2021-02-01
|
||||
xineLib = xine-lib; # Added 2021-04-27
|
||||
xineUI = xine-ui; # Added 2021-04-27
|
||||
|
||||
@@ -4922,7 +4922,6 @@ with pkgs;
|
||||
|
||||
contacts = callPackage ../tools/misc/contacts {
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation AddressBook;
|
||||
xcbuildHook = xcbuild6Hook;
|
||||
};
|
||||
|
||||
colorls = callPackage ../tools/system/colorls { };
|
||||
@@ -7300,9 +7299,7 @@ with pkgs;
|
||||
|
||||
cringify = callPackage ../tools/text/cringify { };
|
||||
|
||||
cromfs = callPackage ../tools/archivers/cromfs {
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
cromfs = callPackage ../tools/archivers/cromfs { };
|
||||
|
||||
cron = callPackage ../tools/system/cron { };
|
||||
|
||||
@@ -15055,6 +15052,8 @@ with pkgs;
|
||||
|
||||
xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { };
|
||||
|
||||
xen-guest-agent = callPackage ../tools/virtualization/xen-guest-agent { };
|
||||
|
||||
xflux = callPackage ../tools/misc/xflux { };
|
||||
xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { };
|
||||
|
||||
@@ -18924,7 +18923,7 @@ with pkgs;
|
||||
credstash = with python3Packages; toPythonApplication credstash;
|
||||
|
||||
creduce = callPackage ../development/tools/misc/creduce {
|
||||
inherit (llvmPackages_8) llvm libclang;
|
||||
inherit (llvmPackages_16) llvm libclang;
|
||||
};
|
||||
|
||||
cscope = callPackage ../development/tools/misc/cscope { };
|
||||
@@ -20389,19 +20388,12 @@ with pkgs;
|
||||
xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;
|
||||
};
|
||||
xcodebuild6 = xcodebuild.override { stdenv = llvmPackages_6.stdenv; };
|
||||
xcbuild = xcodebuild;
|
||||
xcbuildHook = makeSetupHook {
|
||||
name = "xcbuild-hook";
|
||||
propagatedBuildInputs = [ xcbuild ];
|
||||
} ../development/tools/xcbuild/setup-hook.sh ;
|
||||
|
||||
# xcbuild with llvm 6
|
||||
xcbuild6Hook = makeSetupHook {
|
||||
name = "xcbuild6-hook";
|
||||
propagatedBuildInputs = [ xcodebuild6 ];
|
||||
} ../development/tools/xcbuild/setup-hook.sh ;
|
||||
|
||||
xcpretty = callPackage ../development/tools/xcpretty { };
|
||||
|
||||
xeus = callPackage ../development/libraries/xeus { };
|
||||
@@ -20981,7 +20973,7 @@ with pkgs;
|
||||
|
||||
cutee = callPackage ../development/libraries/cutee { };
|
||||
|
||||
cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; };
|
||||
cxxtools = callPackage ../development/libraries/cxxtools { };
|
||||
|
||||
cwiid = callPackage ../development/libraries/cwiid { };
|
||||
|
||||
@@ -34677,7 +34669,7 @@ with pkgs;
|
||||
|
||||
phantomsocks = callPackage ../tools/networking/phantomsocks { };
|
||||
|
||||
photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { };
|
||||
photoqt = qt6Packages.callPackage ../applications/graphics/photoqt { };
|
||||
|
||||
photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { };
|
||||
|
||||
@@ -39376,7 +39368,7 @@ with pkgs;
|
||||
|
||||
### SCIENCE/MOLECULAR-DYNAMICS
|
||||
|
||||
dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { stdenv = gcc10StdenvCompat; };
|
||||
dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { };
|
||||
|
||||
lammps = callPackage ../applications/science/molecular-dynamics/lammps {
|
||||
fftw = fftw;
|
||||
|
||||
Reference in New Issue
Block a user