JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-05-15 06:01:50 +00:00 committed by GitHub
commit a41870fcba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 413 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nixos/modules/services/misc/mbpfan.nix
View File

@ -31,7 +31,7 @@ in {
settings = mkOption {
default = {};
description = "The INI configuration for Mbpfan.";
description = "INI configuration for Mbpfan.";
type = types.submodule {
freeformType = settingsFormat.type;
@ -39,32 +39,26 @@ in {
type = types.nullOr types.int;
default = 2000;
description = ''
The minimum fan speed. Setting to null enables automatic detection.
Check minimum fan limits with "cat /sys/devices/platform/applesmc.768/fan*_min".
'';
};
options.general.max_fan1_speed = mkOption {
type = types.nullOr types.int;
default = 6199;
description = ''
The maximum fan speed. Setting to null enables automatic detection.
Check maximum fan limits with "cat /sys/devices/platform/applesmc.768/fan*_max".
You can check minimum and maximum fan limits with
"cat /sys/devices/platform/applesmc.768/fan*_min" and
"cat /sys/devices/platform/applesmc.768/fan*_max" respectively.
Setting to null implies using default value from applesmc.
'';
};
options.general.low_temp = mkOption {
type = types.int;
default = 55;
description = "Temperature below which fan speed will be at minimum. Try ranges 55-63.";
description = "If temperature is below this, fans will run at minimum speed.";
};
options.general.high_temp = mkOption {
type = types.int;
default = 58;
description = "Fan will increase speed when higher than this temperature. Try ranges 58-66.";
description = "If temperature is above this, fan speed will gradually increase.";
};
options.general.max_temp = mkOption {
type = types.int;
default = 86;
description = "Fan will run at full speed above this temperature. Do not set it > 90.";
description = "If temperature is above this, fans will run at maximum speed.";
};
options.general.polling_interval = mkOption {
type = types.int;

54
pkgs/applications/audio/rhvoice/default.nix
View File

@ -1,36 +1,50 @@
{ stdenv, lib, pkg-config, fetchFromGitHub, sconsPackages
, glibmm, libpulseaudio, libao }:
{ lib
, stdenv
, fetchFromGitHub
, ensureNewerSourcesForZipFilesHook
, pkg-config
, scons
, glibmm
, libpulseaudio
, libao
, speechd
}:
let
version = "unstable-2018-02-10";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "rhvoice";
inherit version;
version = "1.8.0";
src = fetchFromGitHub {
owner = "Olga-Yakovleva";
owner = "RHVoice";
repo = "RHVoice";
rev = "7a25a881b0465e47a12d8029b56f3b71a1d02312";
sha256 = "1gkrlmv7msh9qlm0gkjqpl9gswghpclfdwszr1p85v8vk6m63v0b";
rev = version;
fetchSubmodules = true;
hash = "sha256-G5886rjBaAp0AXcr07O0q7K1OXTayfIbd4zniKwDiLw=";
};
patches = [
# SConstruct patch
# Scons creates an independent environment that assumes standard POSIX paths.
# The patch is needed to push the nix environment.
# - PATH
# - PKG_CONFIG_PATH, to find available (sound) libraries
# - RPATH, to link to the newly built libraries
./honor_nix_environment.patch
];
nativeBuildInputs = [
sconsPackages.scons_3_1_2 pkg-config
ensureNewerSourcesForZipFilesHook
pkg-config
scons
];
buildInputs = [
glibmm libpulseaudio libao
glibmm
libpulseaudio
libao
speechd
];
# SConstruct patch
# Scons creates an independent environment that assumes standard POSIX paths.
# The patch is needed to push the nix environment.
# - PATH
# - PKG_CONFIG_PATH, to find available (sound) libraries
# - RPATH, to link to the newly built libraries
patches = [ ./honor_nix_environment.patch ];
meta = {
description = "A free and open source speech synthesizer for Russian language and others";
homepage = "https://github.com/Olga-Yakovleva/RHVoice/wiki";

25
pkgs/applications/audio/rhvoice/honor_nix_environment.patch
View File

@ -1,14 +1,31 @@
diff --git a/SConstruct b/SConstruct
index 2421399..ba39254 100644
index 3ad4d9a..fb02365 100644
--- a/SConstruct
+++ b/SConstruct
@@ -147,6 +147,9 @@ def create_base_env(vars):
@@ -94,11 +94,8 @@ def CheckWiX(context):
return result
def get_spd_module_dir():
- env = Environment()
- try:
- return env.ParseConfig("pkg-config speech-dispatcher --variable=modulebindir", passthru)
- except:
- return False
+ # cannot write to ${speechd}/libexec/speech-dispatcher-modules
+ return os.path.join(os.environ["out"], "libexec/speech-dispatcher-modules")
def validate_spd_version(key,val,env):
m=re.match(r"^\d+\.\d+",val)
@@ -208,9 +205,9 @@ def create_base_env(user_vars):
env_args["package_name"]="RHVoice"
env_args["CPPDEFINES"]=[("RHVOICE","1")]
env=Environment(**env_args)
- if env["dev"]:
- env["prefix"]=os.path.abspath("local")
- env["RPATH"]=env.Dir("$libdir").abspath
+ env.PrependENVPath("PATH", os.environ["PATH"])
+ env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"]
+ env["RPATH"]=env["libdir"]
+ env["RPATH"]=env.Dir("$libdir").abspath
env["package_version"]=get_version(env["release"])
env.Append(CPPDEFINES=("PACKAGE",env.subst(r'\"$package_name\"')))
env.Append(CPPDEFINES=("VERSION",env.subst(r'\"$package_version\"')))
if env["PLATFORM"]=="win32":

12
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -14,11 +14,11 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "1i76ix318y6b2dcfnisg13bp5d7nzvcx7zcpl94mkrn974db30pn";
x86_64-darwin = "1qk1vykl838vwsffyjpazx7x9ajwxczpgz5vhch16iikfz2vh1vk";
aarch64-linux = "13jifiqn2v17d6vwacq6aib1lzyp2021kjdswkp7wpx6ck5lkm21";
aarch64-darwin = "1jgmvw52hp2zfvk6z51yni4vn7wfq63gsih42mzadg5a1b2fr9rx";
armv7l-linux = "1zhriscsmfcsagsp2ds0fn316fybs5f2f2r3w5q29jwczgcnlam4";
x86_64-linux = "0hsq3b8j58xjl8pkrd5x3qh0lsl9gwbd9wgvhzlnx2h94iasr1v5";
x86_64-darwin = "04fbl8kp3af7xcicx17ay2piwy4y3yiyn9723hlmmf7s359rr1wn";
aarch64-linux = "0jljsa61zr3symfdsjx9jj4s3y1kqslxh8gc1gqx45zlm5rzr7k8";
aarch64-darwin = "1swkc0qb1xif8hj6cjp3jq1iqdfqsa681hhp7mxvrpqg0i2zppk3";
armv7l-linux = "1ssbdc4b11xmd45m7bzhdh6szx331pzah2mjpqjg7cz3ray3xvwy";
}.${system};
sourceRoot = if stdenv.isDarwin then "" else ".";
@ -28,7 +28,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.66.2";
version = "1.67.1";
pname = "vscodium";
executableName = "codium";

7
pkgs/applications/misc/logseq/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, autoPatchelfHook, electron, curl, expat, gcc, openssl, zlib }:
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, autoPatchelfHook, electron, git, curl, expat, gcc, openssl, zlib }:
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.6.6";
version = "0.6.8";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "r6IBvhA8H8XnMIBgZZodyU61xtqNA4N9kCRv/QWQc9M=";
sha256 = "QPbH7d2RC8DLze44Q3gCQ9IzHOgIq8IB+hZr9+8rTs0=";
name = "${pname}-${version}.AppImage";
};
@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--prefix PATH : ${lib.makeBinPath [ git ]} \
--add-flags $out/share/${pname}/resources/app
'';

6
pkgs/applications/networking/irc/senpai/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "senpai";
version = "unstable-2022-04-29";
version = "unstable-2022-05-10";
src = fetchFromSourcehut {
owner = "~taiite";
repo = "senpai";
rev = "859b8fdb7d433a848668c6f1a00406f107fe00e5";
sha256 = "sha256-grVv/bcUEU6Aaf+4MbkocY/75u7q6Q7r26xK0ybULUg=";
rev = "7a9fe74fdfb3f334b97434df0aa74b2b32e3582e";
sha256 = "sha256-uagdJG+YVryzsaZfkg5W2F8mQSc1bpflL77tqMHp1Ck=";
};
vendorSha256 = "sha256-hgojB1D0/SZWLEzJ48EBoT/InYYmqD/1qoTknfk/aTo=";

6
pkgs/applications/networking/termius/default.nix
View File

@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "termius";
version = "7.39.0";
version = "7.40.2";
src = fetchurl {
# find the latest version with
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r
# and the sha512 with
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_111.snap";
sha512 = "1c90f249fd1802d4ed032b85ee835ca04e84e673caff339b6ce9b35188fec65a3ccce0e2a8a9afef46354ed5886ab17c612468ad7281c660c904b180753a1729";
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_113.snap";
sha512 = "33f8f367a9fe232cf359869dfa0aa55c9be6f6c0e1ebdf7d65ae4616afe0fe2b61c57697f6d67d5e71f5dffd163eb601d8f2d2757712b01d0d32eb027018c2d3";
};
desktopItem = makeDesktopItem {

14
pkgs/desktops/arcan/arcan/003-freetype.patch
View File

@ -1,14 +0,0 @@
diff -Naur source-old/src/CMakeLists.txt source-new/src/CMakeLists.txt
--- source-old/src/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300
+++ source-new/src/CMakeLists.txt 2021-10-29 12:03:06.461399341 -0300
@@ -317,9 +317,7 @@
find_package(BZip2 REQUIRED QUIET)
pkg_check_modules(HARFBUZZ REQUIRED QUIET harfbuzz)
ExternalProject_Add(Freetype
- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/freetype"
- UPDATE_COMMAND ""
- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/freetype"
+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/freetype"
${EXTERNAL_DEFS}
${CMAKE_EXTERNAL_DEFS}
-DWITH_ZLIB=OFF

5
pkgs/desktops/arcan/arcan/default.nix
View File

@ -48,13 +48,13 @@
stdenv.mkDerivation rec {
pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal";
version = "0.6.1";
version = "0.6.1.1";
src = fetchFromGitHub {
owner = "letoram";
repo = "arcan";
rev = version;
hash = "sha256-2do4+6KB0AAcJk22mN0IA/e/bPaeGipLjI4RSTPqLBg=";
hash = "sha256-+dJaBSKGbHOwzA26/jDyh2UF9YRwGUcysJIeAM4kvfc=";
};
nativeBuildInputs = [
@ -106,7 +106,6 @@ stdenv.mkDerivation rec {
./000-openal.patch
./001-luajit.patch
./002-libuvc.patch
./003-freetype.patch
];
# Emulate external/git/clone.sh

4
pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
View File

@ -3,9 +3,9 @@
mkXfceDerivation {
category = "apps";
pname = "xfce4-terminal";
version = "1.0.2";
version = "1.0.3";
sha256 = "sha256-d69SjV7dkiYmc0R5OyU5DV5RM3h51an4idWV872QoE4=";
sha256 = "sha256-oZOnPAfvSXCreFHTIZYpJhOdtlDOHrAUMvGIjYU+TRU=";
nativeBuildInputs = [ libxslt docbook_xml_dtd_45 docbook_xsl ];

44
pkgs/development/compilers/vlang/default.nix
View File

@ -2,22 +2,36 @@
stdenv.mkDerivation rec {
pname = "vlang";
version = "weekly.2021.51";
version = "weekly.2022.19";
src = fetchFromGitHub {
owner = "vlang";
repo = "v";
rev = version;
sha256 = "1jvq3fxckl2jidiigkvclacjxbg5k38268mck7bl1ky1yspgfrnq";
sha256 = "1bl91j3ip3i84jq3wg03sflllxv38sv4dc072r302rl2g9f4dbg6";
};
# Required for bootstrap.
vc = fetchFromGitHub {
owner = "vlang";
repo = "vc";
rev = "c8ed2cd82b247e94c33217dba35c420cfc02fef3";
sha256 = "1acgx1qp480jmsv1xvqy1zf7iyy90mvg9x1m1b0zrwx09wz4y1cq";
rev = "a298ad7069f6333ef8ab59a616654fc74e04c847";
sha256 = "168cgq6451hcgsxzyd8vq11g01642bs5kkwxqh6rz3rnc86ajic0";
};
# Required for vdoc.
markdown = fetchFromGitHub {
owner = "vlang";
repo = "markdown";
rev = "bbbd324a361e404ce0682fc00666df3a7877b398";
sha256 = "0cawzizr3rjz81blpvxvxrcvcdai1adj66885ss390444qq1fnv7";
};
# vcreate_test.v requires git, so we must disable it.
patches = [
./disable_vcreate_test.patch
];
propagatedBuildInputs = [ glfw freetype openssl ]
++ lib.optional stdenv.hostPlatform.isUnix upx;
@ -26,19 +40,33 @@ stdenv.mkDerivation rec {
makeFlags = [
"local=1"
"VC=${vc}"
# vlang seems to want to write to $HOME/.vmodules , so lets give
# it a writable HOME
"HOME=$TMPDIR"
];
prePatch = ''
export HOME=$(mktemp -d)
cp cmd/tools/vcreate_test.v $HOME/vcreate_test.v
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,lib,share}
cp -r examples $out/share
cp -r {cmd,vlib,thirdparty} $out/lib
mv v $out/lib
cp v $out/lib
ln -s $out/lib/v $out/bin/v
wrapProgram $out/bin/v --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
mkdir -p $HOME/.vmodules;
ln -sf ${markdown} $HOME/.vmodules/markdown
$out/lib/v -v build-tools
$out/lib/v -v $out/lib/cmd/tools/vdoc
$out/lib/v -v $out/lib/cmd/tools/vast
$out/lib/v -v $out/lib/cmd/tools/vvet
# Return the pre-patch vcreate_test.v now that we no longer need the alteration.
cp $HOME/vcreate_test.v $out/lib/cmd/tools/vcreate_test.v
runHook postInstall
'';

133
pkgs/development/compilers/vlang/disable_vcreate_test.patch Normal file
View File

@ -0,0 +1,133 @@
diff --git a/cmd/tools/vcreate_test.v b/cmd/tools/vcreate_test.v
index 3d07f4773..de8a202df 100644
--- a/cmd/tools/vcreate_test.v
+++ b/cmd/tools/vcreate_test.v
@@ -2,127 +2,6 @@ import os
const test_path = 'vcreate_test'
-fn init_and_check() ? {
- os.execute_or_exit('${os.quoted_path(@VEXE)} init')
-
- assert os.read_file('vcreate_test.v') ? == [
- 'module main\n',
- 'fn main() {',
- " println('Hello World!')",
- '}',
- '',
- ].join_lines()
-
- assert os.read_file('v.mod') ? == [
- 'Module {',
- " name: 'vcreate_test'",
- " description: ''",
- " version: ''",
- " license: ''",
- ' dependencies: []',
- '}',
- '',
- ].join_lines()
-
- assert os.read_file('.gitignore') ? == [
- '# Binaries for programs and plugins',
- 'main',
- 'vcreate_test',
- '*.exe',
- '*.exe~',
- '*.so',
- '*.dylib',
- '*.dll',
- 'vls.log',
- '',
- ].join_lines()
-
- assert os.read_file('.gitattributes') ? == [
- '*.v linguist-language=V text=auto eol=lf',
- '*.vv linguist-language=V text=auto eol=lf',
- '*.vsh linguist-language=V text=auto eol=lf',
- '**/v.mod linguist-language=V text=auto eol=lf',
- '',
- ].join_lines()
-
- assert os.read_file('.editorconfig') ? == [
- '[*]',
- 'charset = utf-8',
- 'end_of_line = lf',
- 'insert_final_newline = true',
- 'trim_trailing_whitespace = true',
- '',
- '[*.v]',
- 'indent_style = tab',
- 'indent_size = 4',
- '',
- ].join_lines()
-}
-
fn test_v_init() ? {
- dir := os.join_path(os.temp_dir(), test_path)
- os.rmdir_all(dir) or {}
- os.mkdir(dir) or {}
- defer {
- os.rmdir_all(dir) or {}
- }
- os.chdir(dir) ?
-
- init_and_check() ?
-}
-
-fn test_v_init_in_git_dir() ? {
- dir := os.join_path(os.temp_dir(), test_path)
- os.rmdir_all(dir) or {}
- os.mkdir(dir) or {}
- defer {
- os.rmdir_all(dir) or {}
- }
- os.chdir(dir) ?
- os.execute_or_exit('git init .')
- init_and_check() ?
-}
-
-fn test_v_init_no_overwrite_gitignore() ? {
- dir := os.join_path(os.temp_dir(), test_path)
- os.rmdir_all(dir) or {}
- os.mkdir(dir) or {}
- os.write_file('$dir/.gitignore', 'blah') ?
- defer {
- os.rmdir_all(dir) or {}
- }
- os.chdir(dir) ?
-
- os.execute_or_exit('${os.quoted_path(@VEXE)} init')
-
- assert os.read_file('.gitignore') ? == 'blah'
-}
-
-fn test_v_init_no_overwrite_gitattributes_and_editorconfig() ? {
- git_attributes_content := '*.v linguist-language=V text=auto eol=lf'
- editor_config_content := '[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.v]
-indent_style = tab
-indent_size = 4
-'
-
- dir := os.join_path(os.temp_dir(), test_path)
- os.rmdir_all(dir) or {}
- os.mkdir(dir) or {}
- os.write_file('$dir/.gitattributes', git_attributes_content) ?
- os.write_file('$dir/.editorconfig', editor_config_content) ?
- defer {
- os.rmdir_all(dir) or {}
- }
- os.chdir(dir) ?
-
- os.execute_or_exit('${os.quoted_path(@VEXE)} init')
-
- assert os.read_file('.gitattributes') ? == git_attributes_content
- assert os.read_file('.editorconfig') ? == editor_config_content
+ println('vcreate_test disabled')
}

3
pkgs/development/go-modules/generic/default.nix
View File

@ -79,12 +79,11 @@ let
GO111MODULE = "on";
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
"GIT_PROXY_COMMAND" "SOCKS_SERVER"
"GIT_PROXY_COMMAND" "SOCKS_SERVER" "GOPROXY"
];
configurePhase = args.modConfigurePhase or ''
runHook preConfigure
export GOCACHE=$TMPDIR/go-cache
export GOPATH="$TMPDIR/go"
cd "${modRoot}"

4
pkgs/development/libraries/grpc/default.nix
View File

@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "grpc";
version = "1.45.2"; # N.B: if you change this, please update:
version = "1.46.1"; # N.B: if you change this, please update:
# pythonPackages.grpcio-tools
# pythonPackages.grpcio-status
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
sha256 = "sha256-l2r1NdbfwViXfLcwbfUgLueqfAVnLzI+gdEarlkIqkI=";
sha256 = "sha256-jci45jCcm2EN+tw7KCU9tOVB0jIADitQWoUlvyutRqw=";
fetchSubmodules = true;
};

8
pkgs/development/libraries/rubberband/default.nix
View File

@ -1,16 +1,16 @@
{ lib, stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw
, vamp-plugin-sdk, ladspaH }:
, vamp-plugin-sdk, ladspaH, meson, ninja }:
stdenv.mkDerivation rec {
pname = "rubberband";
version = "1.9.0";
version = "2.0.2";
src = fetchurl {
url = "https://breakfastquay.com/files/releases/${pname}-${version}.tar.bz2";
sha256 = "4f5b9509364ea876b4052fc390c079a3ad4ab63a2683aad09662fb905c2dc026";
sha256 = "sha256-uerAJ+eXeJrplhHJ6urxw6RMyAT5yKBEGg0dJvPWvfk=";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config meson ninja ];
buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ];
makeFlags = [ "AR:=$(AR)" ];

4
pkgs/development/python-modules/aiobotocore/default.nix
View File

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "aiobotocore";
version = "2.2.0";
version = "2.3.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-cTV5OcMCJnDXu5SDMZQUekTr/OJLFkPk5E/twe5zSbo=";
sha256 = "sha256-/D09YGFBC8GU0J7FReMLRGnV90dw+TespfaqReYqG/4=";
};
# relax version constraints: aiobotocore works with newer botocore versions

6
pkgs/development/python-modules/bitarray/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "bitarray";
version = "2.4.1";
version = "2.5.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-+uygP5eemSzHb3QGr365eVyxEbjYlpyJGgMr10l8h9o=";
sha256 = "sha256-jTj2B1EAgJmmWdWs+zXvQVAYPv/Vsr+mwQGZJw3fTJw=";
};
checkPhase = ''
@ -23,7 +23,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Efficient arrays of booleans";
homepage = "https://github.com/ilanschnell/bitarray";
changelog = "https://github.com/ilanschnell/bitarray/blob/master/CHANGE_LOG";
changelog = "https://github.com/ilanschnell/bitarray/raw/${version}/CHANGE_LOG";
license = licenses.psfl;
maintainers = [ maintainers.bhipple ];
};

4
pkgs/development/python-modules/genshi/default.nix
View File

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "Genshi";
version = "0.7.6";
version = "0.7.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-NKLOi4DoQ/Ygxbe35ZqqNip2zpdkpvEQMig+2UWMOlk=";
sha256 = "sha256-wQBSCGLNaQhdEO4ah+kSief1n2s9m9Yiv1iygE5rmqs=";
};
# FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase)

4
pkgs/development/python-modules/grpcio-status/default.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "grpcio-status";
version = "1.45.0";
version = "1.46.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-S6rY6Ow8RHiOA4wk49fccCWeBroJ9ApbgXhThWO6Plo=";
sha256 = "700ad7bdc2da6b1d873ae9abffd957b3df6b74c8ca4b34c50bf1b062ae10a620";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/grpcio-tools/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "grpcio-tools";
version = "1.45.0";
version = "1.46.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-oBbPwh4NkbOwNtPU+WjR/eqGXfoDUkyx++yoRxn9RaI=";
sha256 = "d54d80a4cfd7da002893711af613c9c9358dddfdd27feea44eb902c495b09105";
};
outputs = [ "out" "dev" ];

38
pkgs/development/tools/cue/default.nix
View File

@ -1,35 +1,51 @@
{ buildGoModule, fetchFromGitHub, lib }:
{ buildGoModule, fetchFromGitHub, lib, installShellFiles, testers, cue }:
buildGoModule rec {
pname = "cue";
version = "0.4.2";
version = "0.4.3";
src = fetchFromGitHub {
owner = "cue-lang";
repo = "cue";
rev = "v${version}";
sha256 = "sha256-6HD3wcBo21Dep4ckx+oDWAC4nuTvCzlp0bwQxZox2b4=";
sha256 = "sha256-v9MYrijnbtJpTgRZ4hmkaekisOyujldGewCRNbkVzWw=";
};
vendorSha256 = "sha256-tY9iwQW6cB1FgLAmkDNMrvIxR+i4aGYhNs4tepI654o=";
postPatch = ''
# Disable script tests
rm -f cmd/cue/cmd/script_test.go
'';
checkPhase = "go test ./...";
vendorSha256 = "sha256-jTfV8DJlr5LxS3HjOEBkVzBvZKiySrmINumXSUIq2mI=";
subPackages = [ "cmd/cue" ];
excludedPackages = [ "internal/ci/updatetxtar" "internal/cmd/embedpkg" "internal/cmd/qgo" "pkg/gen" ];
ldflags = [
"-s" "-w" "-X cuelang.org/go/cmd/cue/cmd.version=${version}"
];
nativeBuildInputs = [ installShellFiles ];
ldflags = [ "-s" "-w" "-X cuelang.org/go/cmd/cue/cmd.version=${version}" ];
postInstall = ''
# Completions
installShellCompletion --cmd cue \
--bash <($out/bin/cue completion bash) \
--fish <($out/bin/cue completion fish) \
--zsh <($out/bin/cue completion zsh)
'';
doInstallCheck = true;
installCheckPhase = ''
$out/bin/cue eval - <<<'a: "all good"' > /dev/null
'';
meta = {
passthru.tests.version = testers.testVersion {
package = cue;
command = "cue version";
};
meta = with lib; {
description = "A data constraint language which aims to simplify tasks involving defining and using data";
homepage = "https://cuelang.org/";
maintainers = [];
license = lib.licenses.asl20;
maintainers = with maintainers; [ aaronjheng ];
};
}

22
pkgs/development/tools/jmespath/default.nix
View File

@ -1,18 +1,24 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "jmespath";
version = "0.2.2";
rev = version;
goPackagePath = "github.com/jmespath/go-jmespath";
version = "0.4.0";
src = fetchFromGitHub {
inherit rev;
owner = "jmespath";
repo = "go-jmespath";
sha256 = "0f4j0m44limnjd6q5fk152g6jq2a5cshcdms4p3a1br8pl9wp5fb";
rev = "v${version}";
sha256 = "sha256-djA/7TCmAqCsht28b1itoiWd8Mtdsn/5uLxyT23K/qM=";
};
vendorSha256 = "sha256-Q12muprcKB7fCxemESb4sGPyYIdmgOt3YXVUln7oabw=";
excludedPackages = [
"./internal/testify"
];
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "A JMESPath implementation in Go";
homepage = "https://github.com/jmespath/go-jmespath";

16
pkgs/servers/monitoring/prometheus/openldap-exporter.nix
View File

@ -1,27 +1,29 @@
{ buildGoPackage, lib, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "openldap_exporter";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "tomcz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+lrLA9CbGNzvvbwn79ili/kFRCr6vMKDtkvyfnL9n9k=";
sha256 = "sha256-ok2fTYz1oQiNdTPsssPb/VuFqny1i8nKTngSpKgCpC4=";
};
vendorSha256 = null;
ldflags = [
"-s" "-w"
"-s"
"-w"
"-X github.com/tomcz/openldap_exporter.tag=v${version}"
"-X github.com/tomcz/openldap_exporter.commit=unknown"
];
goPackagePath = "github.com/tomcz/openldap_exporter";
meta = with lib; {
homepage = "https://github.com/tomcz/openldap_exporter";
description = " Simple service that scrapes metrics from OpenLDAP and exports them via HTTP for Prometheus consumption";
description = "Simple service that scrapes metrics from OpenLDAP and exports them via HTTP for Prometheus consumption";
license = licenses.mit;
maintainers = with maintainers; [ ma27 ];
};

52
pkgs/tools/audio/dsp/default.nix Normal file
View File

@ -0,0 +1,52 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, fftw
, zita-convolver
, fftwFloat
, libsndfile
, ffmpeg
, alsa-lib
, libao
, libmad
, ladspaH
, libtool
, libpulseaudio
}:
stdenv.mkDerivation rec {
pname = "dsp";
version = "1.8";
src = fetchFromGitHub {
owner = "bmc0";
repo = "dsp";
rev = "v${version}";
sha256 = "sha256-LTgjpzAGi3oL8l5NcJj1ortKFd3vWDfXHr8YyedAxEE=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
fftw
zita-convolver
fftwFloat
libsndfile
ffmpeg
alsa-lib
libao
libmad
ladspaH
libtool
libpulseaudio
];
meta = with lib; {
homepage = "https://github.com/bmc0/dsp";
description = "An audio processing program with an interactive mode";
license = licenses.isc;
maintainers = with maintainers; [ aaronjheng ];
platforms = platforms.linux ++ platforms.darwin;
};
}

16
pkgs/tools/backup/diskrsync/default.nix
View File

@ -1,18 +1,19 @@
{ buildGoPackage, fetchFromGitHub, lib, openssh, makeWrapper }:
{ buildGoModule, fetchFromGitHub, lib, openssh, makeWrapper }:
buildGoPackage rec {
buildGoModule rec {
pname = "diskrsync";
version = "unstable-2019-01-02";
version = "1.3.0";
src = fetchFromGitHub {
owner = "dop251";
repo = pname;
rev = "e8598ef71038527a8a77d1a6cf2a73cfd96d9139";
sha256 = "1dqpmc4hp81knhdk3mrmwdr66xiibsvj5lagbm5ciajg9by45mcs";
rev = "v${version}";
sha256 = "sha256-hM70WD+M3jwze0IG84WTFf1caOUk2s9DQ7pR+KNIt1M=";
};
goPackagePath = "github.com/dop251/diskrsync";
goDeps = ./deps.nix;
vendorSha256 = "sha256-lJaM/sC5/qmmo7Zu7nGR6ZdXa1qw4SuVxawQ+d/m+Aw=";
ldflags = [ "-s" "-w" ];
nativeBuildInputs = [ makeWrapper ];
@ -26,5 +27,4 @@ buildGoPackage rec {
license = licenses.mit;
maintainers = with maintainers; [ jluttine ];
};
}

48
pkgs/tools/backup/diskrsync/deps.nix generated
View File

@ -1,48 +0,0 @@
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "github.com/dop251/spgz";
fetch = {
type = "git";
url = "https://github.com/dop251/spgz";
rev = "b86304a2b188";
sha256 = "1zss1z523qagk99plb0my8m8ng0danl372iyk1pr4i2skp2bf5z7";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "9756ffdc2472";
sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "eb5bcb51f2a3";
sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "97732733099d";
sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "v0.3.0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
]

25
pkgs/tools/filesystems/go-mtpfs/default.nix
View File

@ -1,20 +1,29 @@
{ pkg-config, libusb1, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, pkg-config, libusb1 }:
buildGoPackage rec {
buildGoModule rec {
pname = "go-mtpfs";
version = "unstable-2018-02-09";
goPackagePath = "github.com/hanwen/go-mtpfs";
version = "1.0.0";
src = fetchFromGitHub {
owner = "hanwen";
repo = "go-mtpfs";
rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb";
sha256 = "sha256-sz+ikhZGwSIAI2YBSQKURF3WXB8dHgQ/C/dbkXwrDSg=";
rev = "v${version}";
sha256 = "sha256-HVfB8/MImgZZLx4tcrlYOfQjpAdHMHshEaSsd+n758w=";
};
vendorSha256 = "sha256-OrAEvD2rF0Y0bvCD9TUv/E429lASsvC3uK3qNvbg734=";
ldflags = [ "-s" "-w" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1 ];
goDeps = ./deps.nix;
checkFlags = [ "-short" ];
meta = with lib; {
description = "A simple FUSE filesystem for mounting Android devices as a MTP device";
homepage = "https://github.com/hanwen/go-mtpfs";
license = licenses.bsd3;
maintainers = with maintainers; [ aaronjheng ];
};
}

30
pkgs/tools/filesystems/go-mtpfs/deps.nix generated
View File

@ -1,30 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "github.com/hanwen/go-fuse";
fetch = {
type = "git";
url = "https://github.com/hanwen/go-fuse";
rev = "d1c826d19ad0c8d0c7e5b4eb34ee0f2ae09f6cef";
sha256 = "0hn2iqsb6rip2b05fvcngyh0sazln2h3fx18khq4fv41n1iy11dc";
};
}
{
goPackagePath = "github.com/hanwen/usb";
fetch = {
type = "git";
url = "https://github.com/hanwen/usb";
rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1";
sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "48ac38b7c8cbedd50b1613c0fccacfc7d88dfcdf";
sha256 = "037vs8sdvq310j3b6z9k62zlby1mzmsr9ha01rcy98dv5v8bkhin";
};
}
]

26
pkgs/tools/graphics/amber/default.nix
View File

@ -10,48 +10,48 @@ let
glslang = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "3ee5f2f1d3316e228916788b300d786bb574d337";
sha256 = "1l5h9d92mzd35pgs0wibqfg7vbl771lwnvdlcsyhf6999khn5dzv";
rev = "81cc10a498b25a90147cccd6e8939493c1e9e20e";
hash = "sha256-jTOxZ1nU7kvtdWjPzyIp/5ZeKw3JtYyqhlFeIE7CyX8=";
};
lodepng = fetchFromGitHub {
owner = "lvandeve";
repo = "lodepng";
rev = "34628e89e80cd007179b25b0b2695e6af0f57fac";
sha256 = "10yaf218xnmhv7rsq6dysqrps43r30cgrs1z63h47z40x43ikia0";
rev = "5601b8272a6850b7c5d693dd0c0e16da50be8d8d";
hash = "sha256-dD8QoyOoGov6VENFNTXWRmen4nYYleoZ8+4TpICNSpo=";
};
shaderc = fetchFromGitHub {
owner = "google";
repo = "shaderc";
rev = "ba92b11e1fcaf4c38a64f84d643d6429175bf650";
sha256 = "041hip43siy2sr7h6habk9sxdmd45ag4kqgi8jk0vm1b8pqzkhqn";
rev = "e72186b66bb90ed06aaf15cbdc9a053581a0616b";
hash = "sha256-hd1IGsWksgAfB8Mq5yZOzSyNGxXsCJxb350pD/Gcskk=";
};
spirv-headers = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Headers";
rev = "3fdabd0da2932c276b25b9b4a988ba134eba1aa6";
sha256 = "17h5cn4dyw8ixp1cpw8vf1z90m0fn1hhlvh0iycmknccbb1z34q7";
rev = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78";
hash = "sha256-ks9JCj5rj+Xu++7z5RiHDkU3/sFXhcScw8dATfB/ot0=";
};
spirv-tools = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "fd3cabd8b5fc43ce83884ac06486c283b9902b4f";
sha256 = "1h3smicw5gzpa17syb30085zccydzs4f41fl30bcmiipdn2xfpjr";
rev = "a73e724359a274d7cf4f4248eba5be1e7764fbfd";
hash = "sha256-vooJHtgVRlBNkQG4hulYOxIgHH4GMhXw7N4OEbkKJvU=";
};
in
stdenv.mkDerivation rec {
pname = "amber";
version = "unstable-2020-09-23";
version = "unstable-2022-04-21";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "0eee2d45d053dfc566baa58442a9b1b708e4f2a7";
sha256 = "1rrbvmn9hvhj7xj89yqvy9mx0vg1qapdm5fkca8mkd3516d9f5pw";
rev = "8b145a6c89dcdb4ec28173339dd176fb7b6f43ed";
hash = "sha256-+xFYlUs13khT6r475eJJ+XS875h2sb+YbJ8ZN4MOSAA=";
};
buildInputs = [

4
pkgs/top-level/all-packages.nix
View File

@ -5176,6 +5176,8 @@ with pkgs;
inherit (python2Packages) mutagen python wrapPython;
};
dsp = callPackage ../tools/audio/dsp { };
dirdiff = callPackage ../tools/text/dirdiff {
tcl = tcl-8_5;
tk = tk-8_5;
@ -17550,7 +17552,7 @@ with pkgs;
grpc = callPackage ../development/libraries/grpc {
# grpc builds with c++14 so abseil must also be built that way
abseil-cpp = abseil-cpp.override {
abseil-cpp = abseil-cpp_202111.override {
cxxStandard = "14";
};
};