mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-19 02:44:17 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
8077f060f3
@ -13,10 +13,10 @@ let
|
||||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "11zj9b8zhgfyh3m78ihg1k78m3v1khwa742mmsxji6ryxqkhvnr4";
|
||||
x86_64-darwin = "19jk8rry11dvyfprq8i2j9r9aj17kfxqx5hl069mlkz0ca18kxmc";
|
||||
aarch64-linux = "01slccwqhh6njd8q278svbfxph5lajx77ns03yrj9iva8w48gixy";
|
||||
armv7l-linux = "1g7zq6y99b5sg8g10hq50qr15m99n0cmydm6rl9dkyca2038ihbi";
|
||||
x86_64-linux = "072wdzl8gp4ygprgza4cfg46fvrd13zx9za5fa8s6vsd9w1l95l7";
|
||||
x86_64-darwin = "083sipxp9r7g6p6la15jjlib52l8xjbfxn2cb05scigq3zsyffy7";
|
||||
aarch64-linux = "1s82f6ba57r7bnjhbanmih5g7wa001sf6php1402w06cxxy7dz00";
|
||||
armv7l-linux = "113nk1rqw07giqq8pnc11dymzxdhj3nn3q2p0fppnm3lpccaq9hs";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = {
|
||||
@ -31,7 +31,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.60.2";
|
||||
version = "1.61.0";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@ -13,12 +13,12 @@
|
||||
let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "koreader";
|
||||
version = "2021.03";
|
||||
version = "2021.09";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
|
||||
sha256 = "sha256-XdCyx+SdcV1QitDVkOl9EZCHpU8Qiwu0qhcXkU6b+9o=";
|
||||
sha256 = "1q2mbmczx2y5ylriq4k3lbjlpw4pwfq2vvcx06ymax31fsrvix84";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, autoPatchelfHook
|
||||
, fetchurl
|
||||
, glibc
|
||||
@ -24,11 +25,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.54.2";
|
||||
version = "0.55.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
sha256 = "sha256-fKUKVeR0q8oylpwF4d3jnkON4vbQ80Fc9WYWStb67ek=";
|
||||
sha256 = "0s7qb7z2wiypiahw1y1lz9pbhxcacj5myzy0qcqjrpnaq7ymvs05";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -16,12 +16,12 @@ with lib;
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "gitea";
|
||||
version = "1.15.3";
|
||||
version = "1.15.4";
|
||||
|
||||
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
||||
src = fetchurl {
|
||||
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
|
||||
sha256 = "sha256-r8FP9jEIChg4XDb0AF9riQBpNCVmffrVI0yzI83qwA0=";
|
||||
sha256 = "sha256-UsaTA6bI5pr3vbvO3jFn8A8qVRi385fbiJQD09Ut/X0=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, fetchzip }:
|
||||
let
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
in
|
||||
fetchzip {
|
||||
name = "3270font-${version}";
|
||||
|
||||
url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_fd00815.zip";
|
||||
url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_3b8f2fb.zip";
|
||||
|
||||
sha256 = "0ny2jcsfa1kfzkm979dfzqv756ijm5xirm02ln7a4kwhxxsm5xr1";
|
||||
sha256 = "06n87ydn2ayfhpg8318chmnwmdk3d4mmy65fcgf8frbiv2kpqncs";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
|
||||
66
pkgs/development/interpreters/dzaima-apl/default.nix
Normal file
66
pkgs/development/interpreters/dzaima-apl/default.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, jdk
|
||||
, makeWrapper
|
||||
, buildNativeImage ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dapl" + lib.optionalString buildNativeImage "-native";
|
||||
version = "0.2.0+unstable=2021-06-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dzaima";
|
||||
repo = "APL";
|
||||
rev = "28b3667beb23c6472266bb2b6eb701708fa421c6";
|
||||
hash = "sha256-2kM9XDMclxJNOZngwLvoDQG23UZQQ6ePK/j215UumCg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
jdk
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
patchShebangs --build ./build
|
||||
./build
|
||||
'' + lib.optionalString buildNativeImage ''
|
||||
native-image --report-unsupported-elements-at-runtime \
|
||||
-H:CLibraryPath=${lib.getLib jdk}/lib -jar APL.jar dapl
|
||||
'' + ''
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
'' + (if buildNativeImage then ''
|
||||
mv dapl $out/bin
|
||||
'' else ''
|
||||
mkdir -p $out/share/${pname}
|
||||
mv APL.jar $out/share/${pname}/
|
||||
|
||||
makeWrapper "${lib.getBin jdk}/bin/java" "$out/bin/dapl" \
|
||||
--add-flags "-jar $out/share/${pname}/APL.jar"
|
||||
'') + ''
|
||||
ln -s $out/bin/dapl $out/bin/apl
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/dzaima/APL";
|
||||
description = "An APL implementation in Java" + lib.optionalString buildNativeImage ", compiled as a native image";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
inherit (jdk.meta) platforms;
|
||||
};
|
||||
}
|
||||
# TODO: Processing app
|
||||
# TODO: minimalistic JDK
|
||||
@ -57,7 +57,12 @@ stdenv.mkDerivation rec {
|
||||
"-DgRPC_ABSL_PROVIDER=package"
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||
"-DCMAKE_CXX_STANDARD=17"
|
||||
# Needs to be compiled with -std=c++11 for clang < 11. Interestingly this is
|
||||
# only an issue with the useLLVM stdenv, not the darwin stdenv…
|
||||
# https://github.com/grpc/grpc/issues/26473#issuecomment-860885484
|
||||
(if (stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0"
|
||||
then "-DCMAKE_CXX_STANDARD=11"
|
||||
else "-DCMAKE_CXX_STANDARD=17")
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc"
|
||||
];
|
||||
@ -68,7 +73,12 @@ stdenv.mkDerivation rec {
|
||||
rm -vf BUILD
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
# When natively compiling, grpc_cpp_plugin is executed from the build directory,
|
||||
# needing to load dynamic libraries from the build directory, so we set
|
||||
# LD_LIBRARY_PATH to enable this. When cross compiling we need to avoid this,
|
||||
# since it can cause the grpc_cpp_plugin executable from buildPackages to
|
||||
# crash if build and host architecture are compatible (e. g. pkgsLLVM).
|
||||
preBuild = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
|
||||
'';
|
||||
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "async-upnp-client";
|
||||
version = "0.22.5";
|
||||
version = "0.22.8";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenLooman";
|
||||
repo = "async_upnp_client";
|
||||
rev = version;
|
||||
sha256 = "sha256-/GELV94m75jSIFR4Ua3Sr+L9iGmzRQxPMIK2yfDiX9E=";
|
||||
sha256 = "sha256-0McLH5iNiA6aIyk6OaN57JAs97R+/4M7xaUDmh+xV6c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hap-python";
|
||||
version = "4.1.0";
|
||||
version = "4.3.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikalchev";
|
||||
repo = "HAP-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vUbcsG6mKPgH+IF5i/BYSIkfIizSZzMWz0Kq0yfuKxE=";
|
||||
sha256 = "sha256-G4KL6iMeVn/tmvFtFL8vyqHGNfqk6j8iG4tDK9VpCyM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-didl-lite";
|
||||
version = "1.2.6";
|
||||
version = "1.3.0";
|
||||
disabled = pythonOlder "3.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenLooman";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-1rr26dnV5As15HeFLWEDBDYPiRDHkGfYOYFhSJi7iyU=";
|
||||
sha256 = "sha256-NsZ/VQlKEp4p3JRSNQKTGvzLrKgDCkkT81NzgS3UHos=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -119,6 +119,7 @@ let
|
||||
wrappedRuby = stdenv.mkDerivation {
|
||||
name = "wrapped-ruby-${pname'}";
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
inherit (ruby) gemPath meta;
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
for i in ${ruby}/bin/*; do
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "actionlint";
|
||||
version = "1.6.4";
|
||||
version = "1.6.5";
|
||||
|
||||
subPackages = [ "cmd/actionlint" ];
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoModule rec {
|
||||
owner = "rhysd";
|
||||
repo = "actionlint";
|
||||
rev = "v${version}";
|
||||
sha256 = "1516892wikz3zda0la57s8nbm6459pf4vd123rv09s4nivznbmcx";
|
||||
sha256 = "12s9ijfvnmfbcvf5lxi2jm3j7vrn7rfkas2lib5jdih77hf9270k";
|
||||
};
|
||||
|
||||
vendorSha256 = "1i7442n621jmc974b73pfz1gyqw74ilpg1zz16yxqpfh5c958m7n";
|
||||
@ -30,5 +30,6 @@ buildGoModule rec {
|
||||
changelog = "https://github.com/rhysd/actionlint/raw/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
mainProgram = "actionlint";
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ let
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "16.10.0";
|
||||
sha256 = "04krpy0r8msv64rcf0vy2l2yzf0a401km8p5p7h12j9b4g51mp4p";
|
||||
version = "16.11.0";
|
||||
sha256 = "1bk5f47hm409129w437h8qdvmqjdr11awblvnhkfsp911nyk3xnk";
|
||||
patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2021.10.0";
|
||||
version = "2021.10.2";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
@ -216,7 +216,7 @@
|
||||
"edimax" = ps: with ps; [ pyedimax ];
|
||||
"edl21" = ps: with ps; [ pysml ];
|
||||
"ee_brightbox" = ps: with ps; [ eebrightbox ];
|
||||
"efergy" = ps: with ps; [ ]; # missing inputs: pyefergy
|
||||
"efergy" = ps: with ps; [ pyefergy ];
|
||||
"egardia" = ps: with ps; [ pythonegardia ];
|
||||
"eight_sleep" = ps: with ps; [ pyeight ];
|
||||
"elgato" = ps: with ps; [ elgato ];
|
||||
|
||||
@ -114,7 +114,7 @@ let
|
||||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2021.10.0";
|
||||
hassVersion = "2021.10.2";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -131,7 +131,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
sha256 = "0m54ynx0i4a6wljg6d9i6xa79c15cqah5cgaswgrbaxhjw5q78iv";
|
||||
sha256 = "0nds4491v8wy4d8w842asjpjj7xhqghlq0h61i7z6wp8jln7m418";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
||||
@ -4,11 +4,11 @@ buildPythonPackage rec {
|
||||
# the frontend version corresponding to a specific home-assistant version can be found here
|
||||
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||
pname = "home-assistant-frontend";
|
||||
version = "20211006.0";
|
||||
version = "20211007.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-rlscTHqa1TMsIVW7kWFGR/feak0XewDRkybpo8dPXj0=";
|
||||
sha256 = "sha256-GchSCqdVPk8RVe4iNEVvrsIgrV9/CHE5bQwyaT+ErvU=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From db38a11228eceea10dc97ecc87023b4919caa918 Mon Sep 17 00:00:00 2001
|
||||
From 8823e48b055b7e574c08069048ba21ffa4393699 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Fullmer <danielrf12@gmail.com>
|
||||
Date: Fri, 21 Feb 2020 21:52:00 -0500
|
||||
Subject: [PATCH] Don't use file timestamp in cache filename
|
||||
@ -14,13 +14,13 @@ unique.
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/web/includes/functions.php b/web/includes/functions.php
|
||||
index 19567a5c1..0242c09bc 100644
|
||||
index 89d2cc8ad..52cbb6f38 100644
|
||||
--- a/web/includes/functions.php
|
||||
+++ b/web/includes/functions.php
|
||||
@@ -2223,7 +2223,8 @@ function cache_bust($file) {
|
||||
@@ -1941,7 +1941,8 @@ function cache_bust($file) {
|
||||
$parts = pathinfo($file);
|
||||
global $css;
|
||||
$dirname = preg_replace('/\//', '_', $parts['dirname']);
|
||||
$dirname = str_replace('/', '_', $parts['dirname']);
|
||||
- $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.filemtime($file).'.'.$parts['extension'];
|
||||
+ $srcHash = '@srcHash@';
|
||||
+ $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.$srcHash.'.'.$parts['extension'];
|
||||
@ -28,5 +28,4 @@ index 19567a5c1..0242c09bc 100644
|
||||
return 'cache/'.$cacheFile;
|
||||
} else {
|
||||
--
|
||||
2.25.1
|
||||
|
||||
2.32.0
|
||||
|
||||
@ -78,13 +78,14 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zoneminder";
|
||||
version = "1.34.22";
|
||||
version = "1.36.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZoneMinder";
|
||||
repo = "zoneminder";
|
||||
rev = version;
|
||||
sha256 = "1144j9crm0q5pwxnkmy3ahw1vbkddpbk2ys2m2pxxxiqifdhll83";
|
||||
sha256 = "sha256-UUpq4CCZq+EwVNGsLCQuVWdY3yoGw977AaMk1iJ6a5U=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -130,7 +131,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \
|
||||
scripts/zmupdate.pl.in \
|
||||
src/zm_config.h.in \
|
||||
src/zm_config_data.h.in \
|
||||
web/api/app/Config/bootstrap.php.in \
|
||||
web/includes/config.php.in ; do
|
||||
substituteInPlace $f --replace @ZM_CONFIG_SUBDIR@ /etc/zoneminder
|
||||
|
||||
@ -1,25 +1,30 @@
|
||||
{ lib, stdenv, fetchFromGitHub, nixosTests
|
||||
, libnfnetlink, libnl, net-snmp, openssl
|
||||
, pkg-config, autoreconfHook }:
|
||||
, file, libmnl, libnftnl, libnl
|
||||
, net-snmp, openssl, pkg-config
|
||||
, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keepalived";
|
||||
version = "2.2.2";
|
||||
version = "2.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acassen";
|
||||
repo = "keepalived";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qugEEbOQ4bemzelIOaNFvo3piMZpKUZGjR+4XF8aLHw=";
|
||||
sha256 = "sha256-WXKu+cabMmXNHiLwXrQqS8GQHIWYkee7vPddyGURWic=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libnfnetlink
|
||||
file
|
||||
libmnl
|
||||
libnftnl
|
||||
libnl
|
||||
net-snmp
|
||||
openssl
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests.keepalived = nixosTests.keepalived;
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
@ -32,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://keepalived.org";
|
||||
description = "Routing software written in C";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -5623,6 +5623,16 @@ with pkgs;
|
||||
|
||||
gnuapl = callPackage ../development/interpreters/gnu-apl { };
|
||||
|
||||
dapl = callPackage ../development/interpreters/dzaima-apl {
|
||||
buildNativeImage = false;
|
||||
stdenv = stdenvNoCC;
|
||||
jdk = jre;
|
||||
};
|
||||
dapl-native = callPackage ../development/interpreters/dzaima-apl {
|
||||
buildNativeImage = true;
|
||||
jdk = graalvm11-ce;
|
||||
};
|
||||
|
||||
gnucap = callPackage ../applications/science/electronics/gnucap { };
|
||||
|
||||
gnu-cobol = callPackage ../development/compilers/gnu-cobol { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user