alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse source 
Conflicts:
	pkgs/tools/graphics/scrot/default.nix
This commit is contained in:
Jonathan Ringer 2022-02-06 10:36:30 -08:00
parent 46b79f9b46 df68f3a71e
commit e680c83323
No known key found for this signature in database
GPG key ID: 5C841D3CFDFEC4E0
19 changed files with 165 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
lib/sources.nix
View file

@ -20,17 +20,26 @@ let
readFile
;
# Returns the type of a path: regular (for file), symlink, or directory
pathType = p: getAttr (baseNameOf p) (readDir (dirOf p));
/*
Returns the type of a path: regular (for file), symlink, or directory.
*/
pathType = path: getAttr (baseNameOf path) (readDir (dirOf path));
# Returns true if the path exists and is a directory, false otherwise
pathIsDirectory = p: if pathExists p then (pathType p) == "directory" else false;
/*
Returns true if the path exists and is a directory, false otherwise.
*/
pathIsDirectory = path: if pathExists path then (pathType path) == "directory" else false;
# Returns true if the path exists and is a regular file, false otherwise
pathIsRegularFile = p: if pathExists p then (pathType p) == "regular" else false;
/*
Returns true if the path exists and is a regular file, false otherwise.
*/
pathIsRegularFile = path: if pathExists path then (pathType path) == "regular" else false;
# Bring in a path as a source, filtering out all Subversion and CVS
# directories, as well as backup files (*~).
/*
A basic filter for `cleanSourceWith` that removes
directories of version control system, backup files (*~)
and some generated files.
*/
cleanSourceFilter = name: type: let baseName = baseNameOf (toString name); in ! (
# Filter out version control software files/directories
(baseName == ".git" || type == "directory" && (baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) ||
@ -48,43 +57,48 @@ let
(type == "unknown")
);
# Filters a source tree removing version control files and directories using cleanSourceWith
#
# Example:
# cleanSource ./.
/*
Filters a source tree removing version control files and directories using cleanSourceFilter.
Example:
cleanSource ./.
*/
cleanSource = src: cleanSourceWith { filter = cleanSourceFilter; inherit src; };
# Like `builtins.filterSource`, except it will compose with itself,
# allowing you to chain multiple calls together without any
# intermediate copies being put in the nix store.
#
# lib.cleanSourceWith {
# filter = f;
# src = lib.cleanSourceWith {
# filter = g;
# src = ./.;
# };
# }
# # Succeeds!
#
# builtins.filterSource f (builtins.filterSource g ./.)
# # Fails!
#
# Parameters:
#
# src: A path or cleanSourceWith result to filter and/or rename.
#
# filter: A function (path -> type -> bool)
# Optional with default value: constant true (include everything)
# The function will be combined with the && operator such
# that src.filter is called lazily.
# For implementing a filter, see
# https://nixos.org/nix/manual/#builtin-filterSource
#
# name: Optional name to use as part of the store path.
# This defaults to `src.name` or otherwise `"source"`.
#
cleanSourceWith = { filter ? _path: _type: true, src, name ? null }:
/*
Like `builtins.filterSource`, except it will compose with itself,
allowing you to chain multiple calls together without any
intermediate copies being put in the nix store.
Example:
lib.cleanSourceWith {
filter = f;
src = lib.cleanSourceWith {
filter = g;
src = ./.;
};
}
# Succeeds!
builtins.filterSource f (builtins.filterSource g ./.)
# Fails!
*/
cleanSourceWith =
{
# A path or cleanSourceWith result to filter and/or rename.
src,
# Optional with default value: constant true (include everything)
# The function will be combined with the && operator such
# that src.filter is called lazily.
# For implementing a filter, see
# https://nixos.org/nix/manual/#builtin-filterSource
# Type: A function (path -> type -> bool)
filter ? _path: _type: true,
# Optional name to use as part of the store path.
# This defaults to `src.name` or otherwise `"source"`.
name ? null
}:
let
orig = toSourceAttributes src;
in fromSourceAttributes {
@ -116,9 +130,11 @@ let
satisfiesSubpathInvariant = src ? satisfiesSubpathInvariant && src.satisfiesSubpathInvariant;
};
# Filter sources by a list of regular expressions.
#
# E.g. `src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"]`
/*
Filter sources by a list of regular expressions.
Example: src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"]
*/
sourceByRegex = src: regexes:
let
isFiltered = src ? _isLibCleanSourceWith;
@ -153,8 +169,11 @@ let
pathIsGitRepo = path: (tryEval (commitIdFromGitRepo path)).success;
# Get the commit id of a git repo
# Example: commitIdFromGitRepo <nixpkgs/.git>
/*
Get the commit id of a git repo.
Example: commitIdFromGitRepo <nixpkgs/.git>
*/
commitIdFromGitRepo =
let readCommitFromFile = file: path:
let fileName = toString path + "/" + file;

10
lib/trivial.nix
View file

@ -61,11 +61,11 @@ rec {
pipe = val: functions:
let reverseApply = x: f: f x;
in builtins.foldl' reverseApply val functions;
/* note please don’t add a function like `compose = flip pipe`.
This would confuse users, because the order of the functions
in the list is not clear. With pipe, it’s obvious that it
goes first-to-last. With `compose`, not so much.
*/
# note please don’t add a function like `compose = flip pipe`.
# This would confuse users, because the order of the functions
# in the list is not clear. With pipe, it’s obvious that it
# goes first-to-last. With `compose`, not so much.
## Named versions corresponding to some builtin operators.

1
nixos/modules/services/continuous-integration/github-runner.nix
View file

@ -208,6 +208,7 @@ in
token=$(< "$STATE_DIRECTORY"/${newConfigTokenFilename})
RUNNER_ROOT="$STATE_DIRECTORY" ${cfg.package}/bin/config.sh \
--unattended \
--disableupdate \
--work "$RUNTIME_DIRECTORY" \
--url ${escapeShellArg cfg.url} \
--token "$token" \

6
pkgs/applications/audio/milkytracker/default.nix
View file

@ -12,6 +12,12 @@ stdenv.mkDerivation rec {
sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk";
};
postPatch = ''
# https://github.com/milkytracker/MilkyTracker/issues/262
substituteInPlace CMakeLists.txt \
--replace 'CMAKE_CXX_STANDARD 98' 'CMAKE_CXX_STANDARD 11'
'';
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs = [ SDL2 alsa-lib libjack2 lhasa perl rtmidi zlib zziplib ];

6
pkgs/development/compilers/hip/default.nix
View file

@ -16,7 +16,7 @@
, makeWrapper
, numactl
, perl
, python2
, python3
, rocclr
, rocm-comgr
, rocm-device-libs
@ -56,7 +56,7 @@ let
substituteInPlace bin/hip_embed_pch.sh \
--replace '$LLVM_DIR/bin/' ""
sed 's,#!/usr/bin/python,#!${python2}/bin/python,' -i hip_prof_gen.py
sed 's,#!/usr/bin/python,#!${python3.interpreter},' -i hip_prof_gen.py
sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \
-e 's,^\($DEVICE_LIB_PATH=\).*$,\1"${rocm-device-libs}/amdgcn/bitcode";,' \
@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
sha256 = "WvOuQu/EN81Kwcoc3ZtGlhb996edQJ3OWFsmPuqeNXE=";
};
nativeBuildInputs = [ cmake python2 makeWrapper perl ];
nativeBuildInputs = [ cmake python3 makeWrapper perl ];
buildInputs = [ libxml2 numactl libglvnd libX11 ];
propagatedBuildInputs = [
clang

32
pkgs/development/libraries/audio/rtmidi/default.nix
View file

@ -15,43 +15,31 @@
}:
stdenv.mkDerivation rec {
version = "4.0.0";
pname = "rtmidi";
version = "5.0.0";
src = fetchFromGitHub {
owner = "thestk";
repo = "rtmidi";
rev = version;
sha256 = "1g31p6a96djlbk9jh5r4pjly3x76lhccva9hrw6xzdma8dsjzgyq";
sha256 = "1r1sqmdi499zfh6z6kjkab6d4a7kz3il5kkcdfz9saa6ry992211";
};
patches = [
# PR #230, fix CMake problems
# Remove when https://github.com/thestk/rtmidi/pull/278 merged
(fetchpatch {
name = "RtMidi-Fix-JACK_HAS_PORT_RENAME-define.patch";
url = "https://github.com/thestk/rtmidi/pull/230/commits/768a30a61b60240b66cc2d43bc27a544ff9f1622.patch";
sha256 = "1sym4f7nb2qyyxfhi1l0xsm2hfh6gddn81y36qvfq4mcs33vvid0";
name = "0001-rtmidi-Use-posix-sched_yield-instead-of-pthread_yield.patch";
url = "https://github.com/thestk/rtmidi/pull/278/commits/cfe34c02112c256235b62b45895fc2c401fd874d.patch";
sha256 = "0yzq7zbdkl5r4i0r6vy2kq986cqdxz2cpzb7s977mvh09kdikrw1";
})
# Remove when https://github.com/thestk/rtmidi/pull/277 merged
(fetchpatch {
name = "RtMidi-Add-prefix-define-for-pkgconfig.patch";
url = "https://github.com/thestk/rtmidi/pull/230/commits/7a32e23e3f6cb43c0d2d58443ce205d438e76f44.patch";
sha256 = "06im8mb05wah6bnkadw2gpkhmilxb8p84pxqr50b205cchpq304w";
name = "0002-rtmidi-include-TargetConditionals.h-on-Apple-platforms.patch";
url = "https://github.com/thestk/rtmidi/pull/277/commits/9d863beb28f03ec53f3e4c22cc0d3c34a1e1789b.patch";
sha256 = "1hlrg23c1ycnwdvxpic8wvypiril04rlph0g820qn1naf92imfjg";
})
(fetchpatch {
name = "RtMidi-Adjust-public-header-installs-to-match-autotools.patch";
url = "https://github.com/thestk/rtmidi/pull/230/commits/892fe5492f0e787484fa4a37027b08c265ce001f.patch";
sha256 = "0ca9m42xa3gmycimzvzvl67wa266xq9pfp1b4v555rh2fp52kbcj";
})
# https://github.com/thestk/rtmidi/pull/277
./macos_include_targetconditionals.patch
];
postPatch = ''
substituteInPlace rtmidi.pc.in \
--replace 'Requires:' 'Requires.private:'
'';
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = lib.optional alsaSupport alsa-lib

12
pkgs/development/libraries/lzlib/default.nix
View file

@ -1,18 +1,18 @@
{ lib, stdenv, fetchurl, texinfo }:
{ lib, stdenv, fetchurl, texinfo, lzip }:
stdenv.mkDerivation rec {
pname = "lzlib";
version = "1.12";
version = "1.13";
outputs = [ "out" "info" ];
nativeBuildInputs = [ texinfo ];
nativeBuildInputs = [ texinfo lzip ];
src = fetchurl {
url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-jl2EJC61LPHcyY5YvZuo7xrvpQFDGr3QJzoiv0zjN7E=";
url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz";
sha256 = "sha256-3ea9WzJTXxeyjJrCS2ZgfgJQUGrBQypBEso8c/XWYsM=";
};
makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" ];
makeFlags = [ "CC:=$(CC)" ];
doCheck = true;
meta = with lib; {

17
pkgs/development/python-modules/loguru/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "loguru";
version = "0.5.3";
version = "0.6.0";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "b28e72ac7a98be3d28ad28570299a393dfcd32e5e3f6a353dec94675767b6319";
sha256 = "sha256-BmvQZ1jQpRPpg2/ZxrWnW/s/02hB9LmWvGC1R6MJ1Bw=";
};
propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [
@ -30,19 +30,6 @@ buildPythonPackage rec {
colorama
];
patches = [
# Fixes tests with pytest>=6.2.2. Will be part of the next release after 0.5.3
(fetchpatch {
url = "https://github.com/Delgan/loguru/commit/31cf758ee9d22dbfa125f38153782fe20ac9dce5.patch";
sha256 = "1lzbs8akg1s7s6xjl3samf4c4bpssqvwg5fn3mwlm4ysr7jd5y67";
})
# Fix tests with Python 3.9
(fetchpatch {
url = "https://github.com/Delgan/loguru/commit/19f518c5f1f355703ffc4ee62f0e1e397605863e.patch";
sha256 = "0yn6smik58wdffr4svqsy2n212fwdlcfcwpgqhl9hq2zlivmsdc6";
})
];
disabledTestPaths = lib.optionals stdenv.isDarwin [
"tests/test_multiprocessing.py"
];

51
pkgs/development/tools/continuous-integration/github-runner/default.nix
View file

@ -43,13 +43,13 @@ let
in
stdenv.mkDerivation rec {
pname = "github-runner";
version = "2.286.0";
version = "2.287.1";
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
rev = "v${version}";
hash = "sha256-a3Kh65NTpVlKUer59rna7NWIQSxh1edU9MwguakzydI=";
hash = "sha256-4SPrtX3j8blWTYnSkD2Z7IecZvI4xdAqHRJ1lBM0aAo=";
};
nativeBuildInputs = [
@ -77,9 +77,6 @@ stdenv.mkDerivation rec {
./patches/use-get-directory-for-diag.patch
# Don't try to install systemd service
./patches/dont-install-systemd-service.patch
# Prevent the runner from starting a self-update for new versions
# (upstream issue: https://github.com/actions/runner/issues/485)
./patches/prevent-self-update.patch
];
postPatch = ''
@ -90,7 +87,7 @@ stdenv.mkDerivation rec {
# Disable specific tests
substituteInPlace src/dir.proj \
--replace 'dotnet test Test/Test.csproj' \
"dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&amp;" disabledTests}'"
"dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&amp;" (map (x: "FullyQualifiedName!=${x}") disabledTests)}'"
# We don't use a Git checkout
substituteInPlace src/dir.proj \
@ -137,18 +134,21 @@ stdenv.mkDerivation rec {
doCheck = true;
disabledTests = [
# Self-updating is patched out, hence this test will fail
"FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync_ValidateHash"
"FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync"
"FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage"
] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
# "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64"
"FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync"
] ++ map
# Online tests
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}")
[
# Fully qualified name of disabled tests
disabledTests =
[ "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync" ]
++ map (x: "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync_${x}") [
"Cancel_CloneHashTask_WhenNotNeeded"
"CloneHash_RuntimeAndExternals"
"DownloadRetry"
"FallbackToFullPackage"
"NoUpdateOnOldVersion"
"NotUseExternalsRuntimeTrimmedPackageOnHashMismatch"
"UseExternalsRuntimeTrimmedPackage"
"UseExternalsTrimmedPackage"
"ValidateHash"
]
++ map (x: "GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") [
"CompositeActionWithActionfile_CompositeContainerNested"
"CompositeActionWithActionfile_CompositePrestepNested"
"CompositeActionWithActionfile_MaxLimit"
@ -178,11 +178,15 @@ stdenv.mkDerivation rec {
"RepositoryActionWithInvalidWrapperActionfile_Node_Legacy"
"RepositoryActionWithWrapperActionfile_PreSteps"
"RepositoryActionWithWrapperActionfile_PreSteps_Legacy"
] ++ map
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}")
[
]
++ map (x: "GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") [
"EnsureDotnetsdkBashDownloadScriptUpToDate"
"EnsureDotnetsdkPowershellDownloadScriptUpToDate"
]
++ [ "GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" ]
++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
# "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64"
"GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync"
];
checkInputs = [ git ];
@ -194,6 +198,8 @@ stdenv.mkDerivation rec {
ln -s ${nodejs-12_x} _layout/externals/node12
ln -s ${nodejs-16_x} _layout/externals/node16
printf 'Disabled tests:\n%s\n' '${lib.concatMapStringsSep "\n" (x: " - ${x}") disabledTests}'
# BUILDCONFIG needs to be "Debug"
dotnet msbuild \
-t:test \
@ -290,6 +296,9 @@ stdenv.mkDerivation rec {
name = "create-deps-file";
runtimeInputs = [ dotnetSdk nuget-to-nix ];
text = ''
# Disable telemetry data
export DOTNET_CLI_TELEMETRY_OPTOUT=1
rundir=$(pwd)
printf "\n* Setup workdir\n"

25
pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch
View file

@ -1,25 +0,0 @@
From 8b77c9c61058842e031dd176df2b9c79bc2c0e28 Mon Sep 17 00:00:00 2001
From: Vincent Haupert <mail@vincent-haupert.de>
Date: Sun, 12 Sep 2021 19:52:21 +0200
Subject: [PATCH] Use a fake version to prevent self-update
---
src/Runner.Listener/MessageListener.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Runner.Listener/MessageListener.cs b/src/Runner.Listener/MessageListener.cs
index 71e5e43..29945e0 100644
--- a/src/Runner.Listener/MessageListener.cs
+++ b/src/Runner.Listener/MessageListener.cs
@@ -65,7 +65,7 @@ namespace GitHub.Runner.Listener
{
Id = _settings.AgentId,
Name = _settings.AgentName,
- Version = BuildConstants.RunnerPackage.Version,
+ Version = "2.999.9",
OSDescription = RuntimeInformation.OSDescription,
};
string sessionName = $"{Environment.MachineName ?? "RUNNER"}";
--
2.32.0

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/MunifTanjim/tree-sitter-lua",
"rev": "2e372ad0af8c6a68ba39f107a2edc9e3fc19ecf1",
"date": "2022-01-21T16:10:07+06:00",
"path": "/nix/store/6gpfn7bvv92b6rjw40kpmgvvvzb07j26-tree-sitter-lua",
"sha256": "1vyjix2vsrxkcwm0hbcc5i81c0a552mg7x639m6zxr6wh0ca4nsm",
"rev": "547184a6cfcc900fcac4a2a56538fa8bcdb293e6",
"date": "2022-01-28T20:44:16+06:00",
"path": "/nix/store/gvq91asqk6911bci8xxx5wjbp2p3c2lk-tree-sitter-lua",
"sha256": "04z182d591r3jlw0yx29m0hhzw4b14f8m85rz2bw959p0yghs88k",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

6
pkgs/servers/mattermost/default.nix
View file

@ -10,7 +10,7 @@
, storePathAsBuildHash ? false }:
let
version = "6.3.1";
version = "6.3.2";
goPackagePath = "github.com/mattermost/mattermost-server";
@ -22,7 +22,7 @@ let
owner = "mattermost";
repo = "mattermost-server";
rev = "v${version}";
sha256 = "cUeGjKutz6Yeq/cP7nYx0zPJ87GKOQWRyNSERzq/nPw=";
sha256 = "+6bLkzqlcty8X+mbNkZnHzC8tK8EJwmWAYz3jZ/6q2w=";
};
ldflags = [
@ -65,7 +65,7 @@ let
src = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
sha256 = "lFwSZsAcQuuWTN+4wCe7GDLkhp1ASn5GE7/K5Vppr14=";
sha256 = "dxgoYFgW+KKtfNr+1pr7bA9K79gCXpKebTIWDhneuv0=";
};
installPhase = ''

1
pkgs/servers/sabnzbd/default.nix
View file

@ -20,6 +20,7 @@ let
sabyenc3
puremagic
guessit
pysocks
]);
path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
in stdenv.mkDerivation rec {

12
pkgs/servers/seafile-server/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, pkg-config, python3, autoreconfHook
, libuuid, sqlite, glib, libevent, libsearpc, openssl, fuse, libarchive, which
, vala, cmake, oniguruma }:
, vala, cmake, oniguruma, nixosTests }:
let
# seafile-server relies on a specific version of libevhtp.
@ -10,13 +10,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "seafile-server";
version = "8.0.7";
version = "8.0.8";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile-server";
rev = "27dac89bb3a81c5acc3f764ce92134eb357ea64b";
sha256 = "1h2hxvv0l5m9nbkdyjpznb7ddk8hb8hhwj8b2lx6aqbvp8gll9q7";
rev = "807867afb7a86f526a6584278914ce9f3f51d1da";
sha256 = "1nq6dw4xzifbyhxn7yn5398q2sip1p1xwqz6xbis4nzgx4jldd4g";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
@ -42,6 +42,10 @@ in stdenv.mkDerivation rec {
cp -r scripts/sql $out/share/seafile
'';
passthru.tests = {
inherit (nixosTests) seafile;
};
meta = with lib; {
description = "File syncing and sharing software with file encryption and group sharing, emphasis on reliability and high performance";
homepage = "https://github.com/haiwen/seafile-server";

15
pkgs/servers/sql/mysql/8.0.x.nix
View file

@ -1,22 +1,18 @@
{ lib, stdenv, fetchurl, bison, cmake, pkg-config
, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd
, numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools
, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd, libfido2
, numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests
}:
let
self = stdenv.mkDerivation rec {
pname = "mysql";
version = "8.0.27";
version = "8.0.28";
src = fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz";
sha256 = "sha256-Sn5y+Jnm8kvNR503jt0vMvWD5of5OiYpF3SBXVpUm5c=";
sha256 = "sha256-2Gk2nrbeTyuy2407Mbe3OWjjVuX/xDVPS5ZlirHkiyI=";
};
patches = [
./abi-check.patch
];
nativeBuildInputs = [ bison cmake pkg-config ]
++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
@ -28,7 +24,7 @@ self = stdenv.mkDerivation rec {
buildInputs = [
boost curl icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
zstd
zstd libfido2
] ++ lib.optionals stdenv.isLinux [
numactl libtirpc
] ++ lib.optionals stdenv.isDarwin [
@ -68,6 +64,7 @@ self = stdenv.mkDerivation rec {
connector-c = self;
server = self;
mysqlVersion = "8.0";
tests = nixosTests.mysql.mysql80;
};
meta = with lib; {

2
pkgs/tools/backup/percona-xtrabackup/8_0.nix
View file

@ -5,7 +5,7 @@ callPackage ./generic.nix (args // {
sha256 = "0cj0fnjimv22ykfl0yk6w29wcjvqp8y8j2g1c6gcml65qazrswyr";
extraPatches = [
./../../../servers/sql/mysql/abi-check.patch
./abi-check.patch
];
extraPostInstall = ''

0
pkgs/servers/sql/mysql/abi-check.patch → pkgs/tools/backup/percona-xtrabackup/abi-check.patch
View file

19
pkgs/tools/graphics/scrot/default.nix
View file

@ -1,14 +1,14 @@
{ lib
, stdenv
, fetchFromGitHub
, imlib2
, xlibsWrapper
, autoreconfHook
, autoconf-archive
, pkg-config
, imlib2
, libbsd
, libXcomposite
, libXfixes
, xlibsWrapper
, libXcomposite
, pkg-config
, libbsd
}:
stdenv.mkDerivation rec {
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
owner = "resurrecting-open-source-projects";
repo = pname;
rev = version;
hash = "sha256-oVmEPkEK1xDcIRUQjCp6CKf+aKnnVe3L7aRTdSsCmmY=";
sha256 = "sha256-oVmEPkEK1xDcIRUQjCp6CKf+aKnnVe3L7aRTdSsCmmY=";
};
nativeBuildInputs = [
@ -27,12 +27,13 @@ stdenv.mkDerivation rec {
autoconf-archive
pkg-config
];
buildInputs = [
imlib2
libbsd
libXcomposite
libXfixes
xlibsWrapper
libXfixes
libXcomposite
libbsd
];
meta = with lib; {

4
pkgs/tools/networking/n2n/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "n2n";
version = "2.8";
version = "3.0";
src = fetchFromGitHub {
owner = "ntop";
repo = "n2n";
rev = version;
hash = "sha256-2xJ8gYVZJZoKs6PZ/9GacgxQ+/3tmnRntT1AbPe1At4=";
hash = "sha256-OXmcc6r+fTHs/tDNF3akSsynB/bVRKB6Fl5oYxmu+E0=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];