Merge master into staging-next
This commit is contained in:
commit
79667a59e7
@ -26,7 +26,7 @@ in
|
|||||||
shopt -s nullglob
|
shopt -s nullglob
|
||||||
for p in $NIX_PROFILES; do
|
for p in $NIX_PROFILES; do
|
||||||
for m in "$p/etc/bash_completion.d/"*; do
|
for m in "$p/etc/bash_completion.d/"*; do
|
||||||
. $m
|
. "$m"
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
eval "$nullglobStatus"
|
eval "$nullglobStatus"
|
||||||
|
@ -78,10 +78,10 @@ in
|
|||||||
promptInit = mkOption {
|
promptInit = mkOption {
|
||||||
default = ''
|
default = ''
|
||||||
# Provide a nice prompt if the terminal supports it.
|
# Provide a nice prompt if the terminal supports it.
|
||||||
if [ "$TERM" != "dumb" -o -n "$INSIDE_EMACS" ]; then
|
if [ "$TERM" != "dumb" ] || [ -n "$INSIDE_EMACS" ]; then
|
||||||
PROMPT_COLOR="1;31m"
|
PROMPT_COLOR="1;31m"
|
||||||
let $UID && PROMPT_COLOR="1;32m"
|
((UID)) && PROMPT_COLOR="1;32m"
|
||||||
if [ -n "$INSIDE_EMACS" -o "$TERM" == "eterm" -o "$TERM" == "eterm-color" ]; then
|
if [ -n "$INSIDE_EMACS" ] || [ "$TERM" = "eterm" ] || [ "$TERM" = "eterm-color" ]; then
|
||||||
# Emacs term mode doesn't support xterm title escape sequence (\e]0;)
|
# Emacs term mode doesn't support xterm title escape sequence (\e]0;)
|
||||||
PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
|
PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
|
||||||
else
|
else
|
||||||
@ -173,7 +173,7 @@ in
|
|||||||
# /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.
|
# /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.
|
||||||
|
|
||||||
# Only execute this file once per shell.
|
# Only execute this file once per shell.
|
||||||
if [ -n "$__ETC_BASHRC_SOURCED" -o -n "$NOSYSBASHRC" ]; then return; fi
|
if [ -n "$__ETC_BASHRC_SOURCED" ] || [ -n "$NOSYSBASHRC" ]; then return; fi
|
||||||
__ETC_BASHRC_SOURCED=1
|
__ETC_BASHRC_SOURCED=1
|
||||||
|
|
||||||
# If the profile was not loaded in a parent process, source
|
# If the profile was not loaded in a parent process, source
|
||||||
|
@ -49,10 +49,10 @@ in
|
|||||||
''
|
''
|
||||||
# This function is called whenever a command is not found.
|
# This function is called whenever a command is not found.
|
||||||
command_not_found_handle() {
|
command_not_found_handle() {
|
||||||
local p=${commandNotFound}/bin/command-not-found
|
local p='${commandNotFound}/bin/command-not-found'
|
||||||
if [ -x $p -a -f ${cfg.dbPath} ]; then
|
if [ -x "$p" ] && [ -f '${cfg.dbPath}' ]; then
|
||||||
# Run the helper program.
|
# Run the helper program.
|
||||||
$p "$@"
|
"$p" "$@"
|
||||||
# Retry the command if we just installed it.
|
# Retry the command if we just installed it.
|
||||||
if [ $? = 126 ]; then
|
if [ $? = 126 ]; then
|
||||||
"$@"
|
"$@"
|
||||||
@ -70,10 +70,10 @@ in
|
|||||||
''
|
''
|
||||||
# This function is called whenever a command is not found.
|
# This function is called whenever a command is not found.
|
||||||
command_not_found_handler() {
|
command_not_found_handler() {
|
||||||
local p=${commandNotFound}/bin/command-not-found
|
local p='${commandNotFound}/bin/command-not-found'
|
||||||
if [ -x $p -a -f ${cfg.dbPath} ]; then
|
if [ -x "$p" ] && [ -f '${cfg.dbPath}' ]; then
|
||||||
# Run the helper program.
|
# Run the helper program.
|
||||||
$p "$@"
|
"$p" "$@"
|
||||||
|
|
||||||
# Retry the command if we just installed it.
|
# Retry the command if we just installed it.
|
||||||
if [ $? = 126 ]; then
|
if [ $? = 126 ]; then
|
||||||
|
@ -0,0 +1,27 @@
|
|||||||
|
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "git-cliff";
|
||||||
|
version = "0.2.6";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "orhun";
|
||||||
|
repo = "git-cliff";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-oQ23jvKR4HGIMnW56FVE0XlBpO4pnMBbRXVoc6OuiHo=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoSha256 = "sha256-49RHGOhTaYrg+JKYZMWcgSL7dxe6H50G6n9tJyGaLMQ=";
|
||||||
|
|
||||||
|
# attempts to run the program on .git in src which is not deterministic
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A highly customizable Changelog Generator that follows Conventional Commit specifications";
|
||||||
|
homepage = "https://github.com/orhun/git-cliff";
|
||||||
|
license = licenses.gpl3Only;
|
||||||
|
maintainers = with maintainers; [ siraben ];
|
||||||
|
};
|
||||||
|
}
|
@ -23,14 +23,14 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bamf";
|
pname = "bamf";
|
||||||
version = "0.5.4";
|
version = "0.5.5";
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
outputs = [ "out" "dev" "devdoc" ];
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://git.launchpad.net/~unity-team/bamf";
|
url = "https://git.launchpad.net/~unity-team/bamf";
|
||||||
rev = version;
|
rev = "${version}+21.10.20210710-0ubuntu1";
|
||||||
sha256 = "1klvij1wyhdj5d8sr3b16pfixc1yk8ihglpjykg7zrr1f50jfgsz";
|
sha256 = "0iwz5z5cz9r56pmfjvjd2kcjlk416dw6g38svs33ynssjgsqbdm0";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@ -57,11 +57,6 @@ stdenv.mkDerivation rec {
|
|||||||
libwnck
|
libwnck
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Port tests and checks to python3 lxml.
|
|
||||||
./gtester2xunit-python3.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
# Fix hard-coded path
|
# Fix hard-coded path
|
||||||
# https://bugs.launchpad.net/bamf/+bug/1780557
|
# https://bugs.launchpad.net/bamf/+bug/1780557
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -1,53 +0,0 @@
|
|||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 41cb7db..93ef0ec 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -115,9 +115,9 @@ GTK_DOC_CHECK(1.0)
|
|
||||||
|
|
||||||
AC_PATH_PROG([PYTHON],[python])
|
|
||||||
AC_MSG_CHECKING(for gtester2xunit dependencies)
|
|
||||||
-if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null); then
|
|
||||||
+if !($PYTHON -c "import lxml" 2> /dev/null); then
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
- AC_MSG_ERROR([You need to install python-libxslt1 and python-libxml2]);
|
|
||||||
+ AC_MSG_ERROR([You need to install python-lxml]);
|
|
||||||
fi
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
|
|
||||||
@@ -189,6 +189,6 @@ ${PACKAGE}-${VERSION}
|
|
||||||
Introspection: ${enable_introspection}
|
|
||||||
Headless tests: ${enable_headless_tests}
|
|
||||||
Coverage Reporting: ${use_gcov}
|
|
||||||
- Export actions menus: ${enable_export_actions_menu}
|
|
||||||
+ Export actions menus: ${enable_export_actions_menu}
|
|
||||||
|
|
||||||
EOF
|
|
||||||
diff --git a/tests/gtester2xunit.py b/tests/gtester2xunit.py
|
|
||||||
index fbe3c66..861d541 100755
|
|
||||||
--- a/tests/gtester2xunit.py
|
|
||||||
+++ b/tests/gtester2xunit.py
|
|
||||||
@@ -1,18 +1,17 @@
|
|
||||||
#! /usr/bin/python
|
|
||||||
from argparse import ArgumentParser
|
|
||||||
-import libxslt
|
|
||||||
-import libxml2
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
+from lxml import etree
|
|
||||||
|
|
||||||
XSL_TRANSFORM='/usr/share/gtester2xunit/gtester.xsl'
|
|
||||||
|
|
||||||
def transform_file(input_filename, output_filename, xsl_file):
|
|
||||||
- gtester = libxml2.parseFile(xsl_file)
|
|
||||||
- style = libxslt.parseStylesheetDoc(gtester)
|
|
||||||
- doc = libxml2.parseFile(input_filename)
|
|
||||||
- result = style.applyStylesheet(doc, None)
|
|
||||||
- result.saveFormatFile(filename=output_filename, format=True)
|
|
||||||
+ gtester = etree.parse(xsl_file)
|
|
||||||
+ style = etree.XSLT(gtester)
|
|
||||||
+ doc = etree.parse(input_filename)
|
|
||||||
+ result = style(doc)
|
|
||||||
+ result.write(filename=output_filename, format=True)
|
|
||||||
|
|
||||||
|
|
||||||
def get_output_filename(input_filename):
|
|
@ -1,4 +1,13 @@
|
|||||||
{ lib, buildPythonPackage, fetchPypi, cython, numpy, nine, pytest, pytest-runner, python-utils, enum34 }:
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, cython
|
||||||
|
, enum34
|
||||||
|
, fetchPypi
|
||||||
|
, nine
|
||||||
|
, numpy
|
||||||
|
, pytestCheckHook
|
||||||
|
, python-utils
|
||||||
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "numpy-stl";
|
pname = "numpy-stl";
|
||||||
@ -9,15 +18,24 @@ buildPythonPackage rec {
|
|||||||
sha256 = "3e635b6fb6112a3c5e00e9e20eedab93b9b0c45ff1cc34eb7bdc0b3e922e2d77";
|
sha256 = "3e635b6fb6112a3c5e00e9e20eedab93b9b0c45ff1cc34eb7bdc0b3e922e2d77";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytest pytest-runner ];
|
propagatedBuildInputs = [
|
||||||
|
cython
|
||||||
|
enum34
|
||||||
|
nine
|
||||||
|
numpy
|
||||||
|
python-utils
|
||||||
|
];
|
||||||
|
|
||||||
checkPhase = "py.test";
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [ cython numpy nine python-utils enum34 ];
|
pythonImportsCheck = [ "stl" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Library to make reading, writing and modifying both binary and ascii STL files easy";
|
description = "Library to make reading, writing and modifying both binary and ascii STL files easy";
|
||||||
homepage = "https://github.com/WoLpH/numpy-stl/";
|
homepage = "https://github.com/WoLpH/numpy-stl/";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
# having the full version string here makes it easier to update
|
# having the full version string here makes it easier to update
|
||||||
modDirVersion = "5.13.13-zen1";
|
modDirVersion = "5.14.1-zen1";
|
||||||
parts = lib.splitString "-" modDirVersion;
|
parts = lib.splitString "-" modDirVersion;
|
||||||
version = lib.elemAt parts 0;
|
version = lib.elemAt parts 0;
|
||||||
suffix = lib.elemAt parts 1;
|
suffix = lib.elemAt parts 1;
|
||||||
@ -19,7 +19,7 @@ buildLinux (args // {
|
|||||||
owner = "zen-kernel";
|
owner = "zen-kernel";
|
||||||
repo = "zen-kernel";
|
repo = "zen-kernel";
|
||||||
rev = "v${modDirVersion}";
|
rev = "v${modDirVersion}";
|
||||||
sha256 = "sha256-aTTbhXy0wsDDCSbX1k27l9g3FliqwE6TbRq2zkI3mnw=";
|
sha256 = "sha256-InfDIs+eELLJE5aw7mD8Jo7SlrpeI/ZuD3z4TyFf7/k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
structuredExtraConfig = with lib.kernel; {
|
structuredExtraConfig = with lib.kernel; {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "caddy";
|
pname = "caddy";
|
||||||
version = "2.4.4";
|
version = "2.4.5";
|
||||||
|
|
||||||
subPackages = [ "cmd/caddy" ];
|
subPackages = [ "cmd/caddy" ];
|
||||||
|
|
||||||
@ -10,10 +10,10 @@ buildGoModule rec {
|
|||||||
owner = "caddyserver";
|
owner = "caddyserver";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-POdDORICDE49BQ5LLTs4GTb1VoSXZD4K4MpRkVoj+AY=";
|
sha256 = "sha256-/DZnIXAvhCaXFl4DvYP4LSFQQytzj6HWYsmqx5T8GNM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-JAQaxEmdX0fpDahe55pEKnUW64k8JjrytkBrXpQJz3I=";
|
vendorSha256 = "sha256-ZevSZ8zTGtkrrJF0xvAtxCgP0CsxcORqD40LkMQ0aWc=";
|
||||||
|
|
||||||
passthru.tests = { inherit (nixosTests) caddy; };
|
passthru.tests = { inherit (nixosTests) caddy; };
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
|
{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
|
||||||
, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl
|
, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl
|
||||||
, autoreconfHook, nixosTests
|
, autoreconfHook, nixosTests
|
||||||
|
, fetchpatch
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -25,6 +26,11 @@ stdenv.mkDerivation rec {
|
|||||||
# They are later created from NixOS itself.
|
# They are later created from NixOS itself.
|
||||||
./dont-create-run-time-dirs.patch
|
./dont-create-run-time-dirs.patch
|
||||||
./runtime-deps.patch
|
./runtime-deps.patch
|
||||||
|
# rename task_t to worker_task_t to fix redefinition issues on (aach64-)darwin
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://gitlab.nic.cz/knot/knot-dns/-/commit/a70b718085f9b97e556970444313c37a702a60f7.diff";
|
||||||
|
sha256 = "0m776pb9iga0lj2gadk23shfrcfrsrzlyaj8800klw7xh6qq32bm";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||||
|
@ -71,5 +71,6 @@ buildGoModule rec {
|
|||||||
homepage = "https://grafana.com";
|
homepage = "https://grafana.com";
|
||||||
maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ];
|
maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ];
|
||||||
platforms = platforms.linux ++ platforms.darwin;
|
platforms = platforms.linux ++ platforms.darwin;
|
||||||
|
mainProgram = "grafana-server";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
25
pkgs/tools/text/sad/default.nix
Normal file
25
pkgs/tools/text/sad/default.nix
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
{ lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, rustPlatform
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "sad";
|
||||||
|
version = "0.4.14";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "ms-jpq";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "03b6qxkn8sqv06gs4p6wg02arz0n9llc3z92zhfd5ipz8han83fd";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoSha256 = "13nkd4354siy8pr2032bxz2z5x8b378mccq6pnm71cpl9dl6w4ad";
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "CLI tool to search and replace";
|
||||||
|
homepage = "https://github.com/ms-jpq/sad";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ fab ];
|
||||||
|
};
|
||||||
|
}
|
@ -5277,6 +5277,10 @@ with pkgs;
|
|||||||
|
|
||||||
git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { };
|
git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { };
|
||||||
|
|
||||||
|
git-cliff = callPackage ../applications/version-management/git-and-tools/git-cliff {
|
||||||
|
inherit (pkgs.darwin.apple_sdk.frameworks) Security;
|
||||||
|
};
|
||||||
|
|
||||||
git-codeowners = callPackage ../applications/version-management/git-and-tools/git-codeowners { };
|
git-codeowners = callPackage ../applications/version-management/git-and-tools/git-codeowners { };
|
||||||
|
|
||||||
git-codereview = callPackage ../applications/version-management/git-and-tools/git-codereview { };
|
git-codereview = callPackage ../applications/version-management/git-and-tools/git-codereview { };
|
||||||
@ -8767,6 +8771,8 @@ with pkgs;
|
|||||||
|
|
||||||
sacad = callPackage ../tools/misc/sacad { };
|
sacad = callPackage ../tools/misc/sacad { };
|
||||||
|
|
||||||
|
sad = callPackage ../tools/text/sad { };
|
||||||
|
|
||||||
safecopy = callPackage ../tools/system/safecopy { };
|
safecopy = callPackage ../tools/system/safecopy { };
|
||||||
|
|
||||||
sacd = callPackage ../tools/cd-dvd/sacd { };
|
sacd = callPackage ../tools/cd-dvd/sacd { };
|
||||||
|
Loading…
Reference in New Issue
Block a user