Merge master into staging-next
This commit is contained in:
commit
a8835232ec
@ -238,7 +238,7 @@ The `staging` branch is a development branch where mass-rebuilds go. It should o
|
||||
|
||||
### Staging-next branch {#submitting-changes-staging-next-branch}
|
||||
|
||||
The `staging-next` branch is for stabilizing mass-rebuilds submitted to the `staging` branch prior to merging them into `master`. Mass-rebuilds should go via the `staging` branch. It should only see non-breaking commits that are fixing issues blocking it from being merged into the `master ` branch.
|
||||
The `staging-next` branch is for stabilizing mass-rebuilds submitted to the `staging` branch prior to merging them into `master`. Mass-rebuilds must go via the `staging` branch. It must only see non-breaking commits that are fixing issues blocking it from being merged into the `master ` branch.
|
||||
|
||||
If the branch is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days and then merge into master.
|
||||
|
||||
|
@ -9513,6 +9513,12 @@
|
||||
githubId = 1699155;
|
||||
name = "Steve Elliott";
|
||||
};
|
||||
stelcodes = {
|
||||
email = "stel@stel.codes";
|
||||
github = "stelcodes";
|
||||
githubId = 22163194;
|
||||
name = "Stel Abrego";
|
||||
};
|
||||
stephank = {
|
||||
email = "nix@stephank.nl";
|
||||
github = "stephank";
|
||||
|
@ -11,9 +11,10 @@ let
|
||||
auth_unix_rw = "polkit"
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
ovmfFilePrefix = if pkgs.stdenv.isAarch64 then "AAVMF" else "OVMF";
|
||||
qemuConfigFile = pkgs.writeText "qemu.conf" ''
|
||||
${optionalString cfg.qemuOvmf ''
|
||||
nvram = ["/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd"]
|
||||
nvram = [ "/run/libvirt/nix-ovmf/${ovmfFilePrefix}_CODE.fd:/run/libvirt/nix-ovmf/${ovmfFilePrefix}_VARS.fd" ]
|
||||
''}
|
||||
${optionalString (!cfg.qemuRunAsRoot) ''
|
||||
user = "qemu-libvirtd"
|
||||
@ -206,8 +207,8 @@ in {
|
||||
done
|
||||
|
||||
${optionalString cfg.qemuOvmf ''
|
||||
ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_CODE.fd /run/${dirName}/nix-ovmf/
|
||||
ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_VARS.fd /run/${dirName}/nix-ovmf/
|
||||
ln -s --force ${pkgs.OVMF.fd}/FV/${ovmfFilePrefix}_CODE.fd /run/${dirName}/nix-ovmf/
|
||||
ln -s --force ${pkgs.OVMF.fd}/FV/${ovmfFilePrefix}_VARS.fd /run/${dirName}/nix-ovmf/
|
||||
''}
|
||||
'';
|
||||
|
||||
|
@ -9,16 +9,16 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qvge";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArsMasiuk";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0qy73dngl1xm6mr2306ddzbbrzk6yszp3y15phs861bfxynzkqjz";
|
||||
sha256 = "sha256-rtbUAp3l0VZsu+D9HCHM3q0UkDLflw50rYRq/LP4Wu4=";
|
||||
};
|
||||
|
||||
prePatch = "cd src";
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
patches = (substituteAll {
|
||||
src = ./set-graphviz-path.patch;
|
||||
|
@ -11,13 +11,13 @@ assert x11Support -> xorg != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bemenu";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cloudef";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-yhUc1r7HulOUQvH7fLXaoJa0mKxJwyC3y59pnJcHUpk=";
|
||||
sha256 = "sha256-UdsfIXlKfXmsrFwrerX1wfne4mdtd69WXnXu3EmxCBY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config pcre ];
|
||||
|
@ -40,11 +40,15 @@ in buildEnv {
|
||||
cd $out
|
||||
fi
|
||||
|
||||
# Remove symlinks to the input tarballs, they aren't needed.
|
||||
rm $out/*.tar.gz
|
||||
# Remove symlinks to the input tarballs, they aren't needed, use -f so it
|
||||
# will not fail if no .tar.gz symlinks are there - for example if
|
||||
# sommething which is not a tarball used as a package
|
||||
rm -f $out/*.tar.gz
|
||||
|
||||
createOctavePackagesPath $out ${octave}
|
||||
|
||||
# Create the file even if the loop afterwards has no packages to run over
|
||||
touch $out/.octave_packages
|
||||
for path in ${lib.concatStringsSep " " packages}; do
|
||||
if [ -e $path/*.tar.gz ]; then
|
||||
$out/bin/octave-cli --eval "pkg local_list $out/.octave_packages; \
|
||||
|
@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "http://www.jedrea.com/chmlib";
|
||||
license = lib.licenses.lgpl2;
|
||||
license = licenses.lgpl2;
|
||||
description = "A library for dealing with Microsoft ITSS/CHM format files";
|
||||
platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
@ -8,12 +8,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymazda";
|
||||
version = "0.1.1";
|
||||
version = "0.1.5";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Z0sRfLkOxYmPDZiSKqqbd68dcTDU+x8QhPe/Oo43KEA=";
|
||||
sha256 = "sha256-vV7Morza6ov/rN44+7Rvo9p7DoE6jQtDk00TdrD0zBo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymsteams";
|
||||
version = "0.1.14";
|
||||
version = "0.1.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rveachkc";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "19gnsjzf3kwcwp2rwa30zpqjqgxb9plgcsx7fqbmxnrxgw99fyqx";
|
||||
sha256 = "sha256-PBh6AmKqdiD3WJQnVqUj4DUVv9I0ZZJ6E0McfWQIiwQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
49
pkgs/development/tools/zprint/default.nix
Normal file
49
pkgs/development/tools/zprint/default.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ stdenv, lib, fetchurl, graalvm11-ce, glibcLocales }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zprint";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}";
|
||||
sha256 = "1wh8jyj7alfa6h0cycfwffki83wqb5d5x0p7kvgdkhl7jx7isrwj";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
nativeBuildInputs = [ graalvm11-ce glibcLocales ];
|
||||
|
||||
buildPhase = ''
|
||||
native-image \
|
||||
--no-server \
|
||||
-J-Xmx7G \
|
||||
-J-Xms4G \
|
||||
-jar ${src} \
|
||||
-H:Name=${pname} \
|
||||
-H:EnableURLProtocols=https,http \
|
||||
-H:+ReportExceptionStackTraces \
|
||||
--report-unsupported-elements-at-runtime \
|
||||
--initialize-at-build-time \
|
||||
--no-fallback
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
install ${pname} $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Clojure/EDN source code formatter and pretty printer";
|
||||
longDescription = ''
|
||||
Library and command line tool providing a variety of pretty printing capabilities
|
||||
for both Clojure code and Clojure/EDN structures. It can meet almost anyone's needs.
|
||||
As such, it supports a number of major source code formatting approaches
|
||||
'';
|
||||
homepage = "https://github.com/kkinnear/zprint";
|
||||
license = licenses.mit;
|
||||
platforms = graalvm11-ce.meta.platforms;
|
||||
maintainers = with maintainers; [ stelcodes ];
|
||||
};
|
||||
}
|
@ -5,20 +5,22 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "redis";
|
||||
version = "6.2.1";
|
||||
version = "6.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.redis.io/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-zSIlBQEsziCyVoL8qTHsk70hrpLLSr/nQs97dqqQdSA=";
|
||||
sha256 = "sha256-mO19UytelnH13wglu3Hw83SDoWVGNkBJOExj24dkUSs=";
|
||||
};
|
||||
|
||||
# Cross-compiling fixes
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
# This fixes hiredis, which has the AR awkwardly coded.
|
||||
# Probably a good candidate for a patch upstream.
|
||||
makeFlagsArray+=('STLIB_MAKE_CMD=${stdenv.cc.targetPrefix}ar rcs $(STLIBNAME)')
|
||||
''}
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
@ -55,7 +55,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://www.nushell.sh/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Br1ght0ne johntitor marsam ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ];
|
||||
mainProgram = "nu";
|
||||
};
|
||||
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goreleaser";
|
||||
version = "0.164.0";
|
||||
version = "0.165.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DGiA9Ww/8sHNRgZ7nOx60YVZaxYBH5GJf6KqilwRKrE=";
|
||||
sha256 = "sha256-xffxpEOEWnh3FtK5JYX38kMkKWQHWrdAXShbVDrW+lE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-y7GesJU2kDtC5S6rnduDX9gcXakNIR8MdLuPW2m1QWs=";
|
||||
vendorSha256 = "sha256-9CO5dHp/RHygp4YXCJM/XPvFcNQGHu1Gx3bhxlQ0Quk=";
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags="
|
||||
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Optimized OpenType builder and inspector";
|
||||
homepage = "https://github.com/caryll/otfcc";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "aarch64-linux" "i686-linux" "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ jfrankenau ttuegel ];
|
||||
};
|
||||
|
||||
|
@ -45,5 +45,6 @@ in stdenv.mkDerivation rec {
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.makefu ];
|
||||
mainProgram = "msfconsole";
|
||||
};
|
||||
}
|
||||
|
@ -9960,6 +9960,8 @@ in
|
||||
|
||||
yj = callPackage ../development/tools/yj { };
|
||||
|
||||
zprint = callPackage ../development/tools/zprint { };
|
||||
|
||||
yle-dl = callPackage ../tools/misc/yle-dl {};
|
||||
|
||||
you-get = python3Packages.callPackage ../tools/misc/you-get { };
|
||||
|
Loading…
Reference in New Issue
Block a user