mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 15:11:35 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
c12d591720
|
|
@ -4,123 +4,130 @@ set -e
|
|||
# --print: avoid dependency on environment
|
||||
optPrint=
|
||||
if [ "$1" == "--print" ]; then
|
||||
optPrint=true
|
||||
shift
|
||||
optPrint=true
|
||||
shift
|
||||
fi
|
||||
|
||||
if [ "$#" != 1 ] && [ "$#" != 2 ]; then
|
||||
cat <<-EOF
|
||||
Usage: $0 [--print] commit-spec [commit-spec]
|
||||
You need to be in a git-controlled nixpkgs tree.
|
||||
The current state of the tree will be used if the second commit is missing.
|
||||
EOF
|
||||
exit 1
|
||||
cat <<EOF
|
||||
Usage: $0 [--print] from-commit-spec [to-commit-spec]
|
||||
You need to be in a git-controlled nixpkgs tree.
|
||||
The current state of the tree will be used if the second commit is missing.
|
||||
|
||||
Examples:
|
||||
effect of latest commit:
|
||||
$ $0 HEAD^
|
||||
$ $0 --print HEAD^
|
||||
effect of the whole patch series for 'staging' branch:
|
||||
$ $0 origin/staging staging
|
||||
EOF
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# A slightly hacky way to get the config.
|
||||
parallel="$(echo 'config.rebuild-amount.parallel or false' | nix-repl . 2>/dev/null \
|
||||
| grep -v '^\(nix-repl.*\)\?$' | tail -n 1 || true)"
|
||||
| grep -v '^\(nix-repl.*\)\?$' | tail -n 1 || true)"
|
||||
|
||||
echo "Estimating rebuild amount by counting changed Hydra jobs."
|
||||
echo "Estimating rebuild amount by counting changed Hydra jobs (parallel=${parallel:-unset})."
|
||||
|
||||
toRemove=()
|
||||
|
||||
cleanup() {
|
||||
rm -rf "${toRemove[@]}"
|
||||
rm -rf "${toRemove[@]}"
|
||||
}
|
||||
trap cleanup EXIT SIGINT SIGQUIT ERR
|
||||
|
||||
MKTEMP='mktemp --tmpdir nix-rebuild-amount-XXXXXXXX'
|
||||
|
||||
nixexpr() {
|
||||
cat <<-EONIX
|
||||
let
|
||||
lib = import $1/lib;
|
||||
hydraJobs = import $1/pkgs/top-level/release.nix
|
||||
# Compromise: accuracy vs. resources needed for evaluation.
|
||||
{ supportedSystems = cfg.systems or [ "x86_64-linux" "x86_64-darwin" ]; };
|
||||
cfg = (import $1 {}).config.rebuild-amount or {};
|
||||
cat <<EONIX
|
||||
let
|
||||
lib = import $1/lib;
|
||||
hydraJobs = import $1/pkgs/top-level/release.nix
|
||||
# Compromise: accuracy vs. resources needed for evaluation.
|
||||
{ supportedSystems = cfg.systems or [ "x86_64-linux" "x86_64-darwin" ]; };
|
||||
cfg = (import $1 {}).config.rebuild-amount or {};
|
||||
|
||||
recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };
|
||||
recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };
|
||||
|
||||
# hydraJobs leaves recurseForDerivations as empty attrmaps;
|
||||
# that would break nix-env and we also need to recurse everywhere.
|
||||
tweak = lib.mapAttrs
|
||||
(name: val:
|
||||
if name == "recurseForDerivations" then true
|
||||
else if lib.isAttrs val && val.type or null != "derivation"
|
||||
then recurseIntoAttrs (tweak val)
|
||||
else val
|
||||
);
|
||||
# hydraJobs leaves recurseForDerivations as empty attrmaps;
|
||||
# that would break nix-env and we also need to recurse everywhere.
|
||||
tweak = lib.mapAttrs
|
||||
(name: val:
|
||||
if name == "recurseForDerivations" then true
|
||||
else if lib.isAttrs val && val.type or null != "derivation"
|
||||
then recurseIntoAttrs (tweak val)
|
||||
else val
|
||||
);
|
||||
|
||||
# Some of these contain explicit references to platform(s) we want to avoid;
|
||||
# some even (transitively) depend on ~/.nixpkgs/config.nix (!)
|
||||
blacklist = [
|
||||
"tarball" "metrics" "manual"
|
||||
"darwin-tested" "unstable" "stdenvBootstrapTools"
|
||||
"moduleSystem" "lib-tests" # these just confuse the output
|
||||
];
|
||||
# Some of these contain explicit references to platform(s) we want to avoid;
|
||||
# some even (transitively) depend on ~/.nixpkgs/config.nix (!)
|
||||
blacklist = [
|
||||
"tarball" "metrics" "manual"
|
||||
"darwin-tested" "unstable" "stdenvBootstrapTools"
|
||||
"moduleSystem" "lib-tests" # these just confuse the output
|
||||
];
|
||||
|
||||
in
|
||||
tweak (builtins.removeAttrs hydraJobs blacklist)
|
||||
EONIX
|
||||
in
|
||||
tweak (builtins.removeAttrs hydraJobs blacklist)
|
||||
EONIX
|
||||
}
|
||||
|
||||
# Output packages in tree $2 that weren't in $1.
|
||||
# Changing the output hash or name is taken as a change.
|
||||
# Extra nix-env parameters can be in $3
|
||||
newPkgs() {
|
||||
# We use files instead of pipes, as running multiple nix-env processes
|
||||
# could eat too much memory for a standard 4GiB machine.
|
||||
local -a list
|
||||
for i in 1 2; do
|
||||
local l="$($MKTEMP)"
|
||||
list[$i]="$l"
|
||||
toRemove+=("$l")
|
||||
# We use files instead of pipes, as running multiple nix-env processes
|
||||
# could eat too much memory for a standard 4GiB machine.
|
||||
local -a list
|
||||
for i in 1 2; do
|
||||
local l="$($MKTEMP)"
|
||||
list[$i]="$l"
|
||||
toRemove+=("$l")
|
||||
|
||||
local expr="$($MKTEMP)"
|
||||
toRemove+=("$expr")
|
||||
nixexpr "${!i}" > "$expr"
|
||||
local expr="$($MKTEMP)"
|
||||
toRemove+=("$expr")
|
||||
nixexpr "${!i}" > "$expr"
|
||||
|
||||
nix-env -f "$expr" -qaP --no-name --out-path --show-trace $3 \
|
||||
| sort > "${list[$i]}" &
|
||||
nix-env -f "$expr" -qaP --no-name --out-path --show-trace $3 \
|
||||
| sort > "${list[$i]}" &
|
||||
|
||||
if [ "$parallel" != "true" ]; then
|
||||
wait
|
||||
fi
|
||||
done
|
||||
if [ "$parallel" != "true" ]; then
|
||||
wait
|
||||
fi
|
||||
done
|
||||
|
||||
wait
|
||||
comm -13 "${list[@]}"
|
||||
wait
|
||||
comm -13 "${list[@]}"
|
||||
}
|
||||
|
||||
# Prepare nixpkgs trees.
|
||||
declare -a tree
|
||||
for i in 1 2; do
|
||||
if [ -n "${!i}" ]; then # use the given commit
|
||||
dir="$($MKTEMP -d)"
|
||||
tree[$i]="$dir"
|
||||
toRemove+=("$dir")
|
||||
if [ -n "${!i}" ]; then # use the given commit
|
||||
dir="$($MKTEMP -d)"
|
||||
tree[$i]="$dir"
|
||||
toRemove+=("$dir")
|
||||
|
||||
git clone --shared --no-checkout --quiet . "${tree[$i]}"
|
||||
(cd "${tree[$i]}" && git checkout --quiet "${!i}")
|
||||
else #use the current tree
|
||||
tree[$i]="$(pwd)"
|
||||
fi
|
||||
git clone --shared --no-checkout --quiet . "${tree[$i]}"
|
||||
(cd "${tree[$i]}" && git checkout --quiet "${!i}")
|
||||
else #use the current tree
|
||||
tree[$i]="$(pwd)"
|
||||
fi
|
||||
done
|
||||
|
||||
newlist="$($MKTEMP)"
|
||||
toRemove+=("$newlist")
|
||||
# Notes:
|
||||
# - the evaluation is done on x86_64-linux, like on Hydra.
|
||||
# - using $newlist file so that newPkgs() isn't in a sub-shell (because of toRemove)
|
||||
# - the evaluation is done on x86_64-linux, like on Hydra.
|
||||
# - using $newlist file so that newPkgs() isn't in a sub-shell (because of toRemove)
|
||||
newPkgs "${tree[1]}" "${tree[2]}" '--argstr system "x86_64-linux"' > "$newlist"
|
||||
|
||||
# Hacky: keep only the last word of each attribute path and sort.
|
||||
sed -n 's/\([^. ]*\.\)*\([^. ]*\) .*$/\2/p' < "$newlist" \
|
||||
| sort | uniq -c
|
||||
| sort | uniq -c
|
||||
|
||||
if [ -n "$optPrint" ]; then
|
||||
echo
|
||||
cat "$newlist"
|
||||
echo
|
||||
cat "$newlist"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ mkDerivation rec {
|
|||
{ description = "Set of integrated tools for the R language";
|
||||
homepage = "https://www.rstudio.com/";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ ehmry changlinli ciil ];
|
||||
maintainers = with maintainers; [ changlinli ciil ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gomuks";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tulir";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0g0aa6h6bm00mdgkb38wm66rcrhqfvs2xj9rl04bwprsa05q5lca";
|
||||
sha256 = "bTOfnEmJHTuniewH//SugNNDuKIFMQb1Safs0UVKH1c=";
|
||||
};
|
||||
|
||||
vendorSha256 = "14ya5advpv4q5il235h5dxy8c2ap2yzrvqs0sjqgw0v1vm6vpwdx";
|
||||
vendorSha256 = "PuNROoxL7UmcuYDgfnsMUsGk9i1jnQyWtaUmT7vXdKE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
diff --git a/lib/notification/notify_linux.go b/lib/notification/notify_linux.go
|
||||
index f93a95f..da6a61d 100644
|
||||
--- a/lib/notification/notify_linux.go
|
||||
+++ b/lib/notification/notify_linux.go
|
||||
@@ -32,7 +32,7 @@ func Send(title, text string, critical, sound bool) error {
|
||||
if critical {
|
||||
soundName = "complete"
|
||||
}
|
||||
- exec.Command("paplay", "/usr/share/sounds/freedesktop/stereo/"+soundName+".oga").Run()
|
||||
+ exec.Command("paplay", "@soundTheme@/share/sounds/freedesktop/stereo/"+soundName+".oga").Run()
|
||||
}
|
||||
return exec.Command("notify-send", args...).Run()
|
||||
}
|
||||
diff --git a/lib/notification/notify_xdg.go b/lib/notification/notify_xdg.go
|
||||
index 7f102b8..996c15f 100644
|
||||
--- a/lib/notification/notify_xdg.go
|
||||
+++ b/lib/notification/notify_xdg.go
|
||||
@@ -26,8 +26,8 @@ import (
|
||||
var notifySendPath string
|
||||
var audioCommand string
|
||||
var tryAudioCommands = []string{"ogg123", "paplay"}
|
||||
-var soundNormal = "/usr/share/sounds/freedesktop/stereo/message-new-instant.oga"
|
||||
-var soundCritical = "/usr/share/sounds/freedesktop/stereo/complete.oga"
|
||||
+var soundNormal = "@soundTheme@/share/sounds/freedesktop/stereo/message-new-instant.oga"
|
||||
+var soundCritical = "@soundTheme@/share/sounds/freedesktop/stereo/complete.oga"
|
||||
|
||||
func getSoundPath(env, defaultPath string) string {
|
||||
if path, ok := os.LookupEnv(env); ok {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "libquotient";
|
||||
version = "0.6.8";
|
||||
version = "0.6.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quotient-im";
|
||||
repo = "libQuotient";
|
||||
rev = version;
|
||||
sha256 = "sha256-CrAK0yq1upB1+C2z6mqKkSArCmzI+TDEEHTIBWB29Go=";
|
||||
sha256 = "sha256-1YiS2b4lYknNSB+8LKB/s6AcF0yQVsakrkp6/Sjkczo=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qtmultimedia ];
|
||||
|
|
|
|||
32
pkgs/development/python-modules/adjusttext/default.nix
Normal file
32
pkgs/development/python-modules/adjusttext/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ buildPythonPackage
|
||||
, numpy
|
||||
, matplotlib
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adjusttext";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Phlya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02apaznnnmwmrn342f22dj5dldn56gdl9v5qix07ah6kgp9503yw";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ matplotlib numpy ];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "adjustText" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Iteratively adjust text position in matplotlib plots to minimize overlaps";
|
||||
homepage = "https://github.com/Phlya/adjustText";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitlist";
|
||||
version = "0.4.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-IL1tpP/F6O3BvJab6aC6r6PhRgKFpLp9aXmOK1rQXaU=";
|
||||
sha256 = "sha256-bX/Z5FBm21gX4ax/HfqD2bNotZyNFX7dHCEN5uZzQJQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "censys";
|
||||
version = "2.0.7";
|
||||
version = "2.0.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "censys";
|
||||
repo = "censys-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "0s9y9956awl26rnrp5l78rbrjcwliqdijnmm7k6xm4hh7iak4q6z";
|
||||
sha256 = "sha256-2qMUQ+MRrPzXlH+WUJ8DSXtrgaZp4OD36X8cX7cNIks=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fountains";
|
||||
version = "0.2.1";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0jk5y099g6ggaq5lwp0jlg4asyhcdxnl3him3ibmzc1k9nnknp30";
|
||||
sha256 = "sha256-e4WCO/CS7LBYUziKPuCQIOHEHUlnKE5vDbOsqC8SrA8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -19,6 +19,7 @@ buildPythonPackage rec {
|
|||
|
||||
# Project has no test
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "fountains" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "HiYaPyCo";
|
||||
pname = "hiyapyco";
|
||||
version = "0.4.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -16,17 +16,29 @@ buildPythonPackage rec {
|
|||
sha256 = "1ams9dp05yhgbg6255wrjgchl2mqg0s34d8b8prvql9lsh59s1fj";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyyaml jinja2 ];
|
||||
propagatedBuildInputs = [
|
||||
pyyaml
|
||||
jinja2
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Should no longer be needed with the next release
|
||||
# https://github.com/zerwes/hiyapyco/pull/42
|
||||
substituteInPlace setup.py \
|
||||
--replace "Jinja2>1,<3" "Jinja2>1"
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
set -e
|
||||
find test -name 'test_*.py' -exec python {} \;
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "hiyapyco" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple python lib allowing hierarchical overlay of config files in YAML syntax, offering different merge methods and variable interpolation based on jinja2.";
|
||||
description = "Python library allowing hierarchical overlay of config files in YAML syntax";
|
||||
homepage = "https://github.com/zerwes/hiyapyco";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ veehaitch ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hvac";
|
||||
version = "0.11.0";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9d5504e35388e665db5086edf75d2425831573c6569bb0bf3c2c6eaff30e034e";
|
||||
sha256 = "f905c59d32d88d3f67571fe5a8a78de4659e04798ad809de439f667247d13626";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,32 +1,43 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, marshmallow
|
||||
# Check Inputs
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "marshmallow-polyfield";
|
||||
version = "5.9";
|
||||
version = "5.10";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bachmann1234";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "15yx8ib5yx1xx6kq8wnfdmv9zm43k7y33c6zpq5rba6a30v4lcnd";
|
||||
sha256 = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
marshmallow
|
||||
];
|
||||
|
||||
# setuptools check can run, but won't find tests
|
||||
checkInputs = [ pytestCheckHook pytest-cov ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov=marshmallow_polyfield" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"marshmallow"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An unofficial extension to Marshmallow to allow for polymorphic fields";
|
||||
description = "Extension to Marshmallow to allow for polymorphic fields";
|
||||
homepage = "https://github.com/Bachmann1234/marshmallow-polyfield";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ drewrisinger ];
|
||||
|
|
|
|||
|
|
@ -9,26 +9,27 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "marshmallow";
|
||||
version = "3.11.1";
|
||||
disabled = pythonOlder "3.5";
|
||||
version = "3.13.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marshmallow-code";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ypm142y3giaqydc7fkigm9r057yp2sd1ng5zr2x3w3wbbj5yfm6";
|
||||
sha256 = "sha256-tP/RKo2Hzxz2bT7ybRs9wGzq7TpsmzmOPi3BGuSLDA0=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"marshmallow"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytz
|
||||
simplejson
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"marshmallow"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
A lightweight library for converting complex objects to and from
|
||||
|
|
@ -38,5 +39,4 @@ buildPythonPackage rec {
|
|||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cript0nauta ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.18.46";
|
||||
version = "1.18.47";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4061100ba506866c3ac530733bdefd302acbd67add17daeb22ca02ce3105fcf0";
|
||||
sha256 = "0687354a1970a157f293ff57f8b38379497b606643633912cc28f76e0333b301";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "parts";
|
||||
version = "1.1.0";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Xtcu/0ZO+6L7RiVfq/Jog4f7LOtZo4QUD1qi7UdPO7g=";
|
||||
sha256 = "2212129476f6d285c3aaab309b80b83664d13dca5a42c5ca3500bd32130af7ec";
|
||||
};
|
||||
|
||||
# Project has no tests
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pefile";
|
||||
version = "2021.9.2";
|
||||
version = "2021.9.3";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erocarrera";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1pgsw84i9r6ydkfzqifgl5lvcz3cf3xz5c2543kl3q8mgb21wxaz";
|
||||
sha256 = "0sr17rmqpr874m8rpkp8xdz8kjshhimbfgq13qy4lscaiznmlf0d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysyncobj";
|
||||
version = "0.3.8";
|
||||
version = "0.3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bakwc";
|
||||
repo = "PySyncObj";
|
||||
rev = version;
|
||||
sha256 = "sha256-T7ecy5/1eF0pYaOv74SBEp6V6Z23E2b9lo5Q/gig3Cw=";
|
||||
sha256 = "sha256-tcoG0KZewPRYPwDSV7aqrAGw3NF4yj/Ukc+I7HHI9+I=";
|
||||
};
|
||||
|
||||
# Tests require network features
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python_http_client";
|
||||
version = "3.3.2";
|
||||
version = "3.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sendgrid";
|
||||
repo = "python-http-client";
|
||||
rev = version;
|
||||
sha256 = "0z7nvfq9wdcprwh88xn9p3vm15gb3ijdc8pxn0a133ini9hxxlpx";
|
||||
sha256 = "sha256-cZqyu67xP0UIKYbhYYTNL5kLiPjjMjayde75sqkHZhg=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "scp";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ddbdb3ef8c068aa1fd37a5fa65a122a80673c9fd73fdc5668a4604f99ccf5943";
|
||||
sha256 = "b776bd6ce8c8385aa9a025b64a9815b5d798f12d4ef0d712d569503f62aece8b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tinydb";
|
||||
version = "4.5.1";
|
||||
version = "4.5.2";
|
||||
disabled = pythonOlder "3.5";
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "msiemens";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1p0whrljjh7cpigr1glszssxsi6adi4cj7y3976q8sj9z47bdx8a";
|
||||
sha256 = "0gyc9rk1adw4gynwnv4kfas0hxv1cql0sm5b3fsms39088ha894l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "toonapi";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frenck";
|
||||
repo = "python-toonapi";
|
||||
rev = "v${version}";
|
||||
sha256 = "1d4n615vlcgkvmchrfjw4h3ndav3ljmcfydxr2b41zn83mzizqdf";
|
||||
sha256 = "10jh6p0ww51cb9f8amd9jq3lmvby6n2k08qwcr2n8ijbbgyp0ibf";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,17 +1,15 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }:
|
||||
{ lib, rustPlatform, fetchCrate, stdenv, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-supply-chain";
|
||||
version = "0.0.2";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-secure-code";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0kpm842p7l0vwbfa99zq3w3nsasy5sp1b99si7brjjvq99bad9gr";
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-zjDZJOUjnEQ03rmo5CdSY1emE6YohOPlf7SKuvNLuV0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Mn5s6pfTHoFXtHqn6ii8PtAIBz/RJaR0zO5U5jS3UDU=";
|
||||
cargoSha256 = "sha256-xSJ5rx8k+my0NeGYHZyvDzbM7uMdbViT7Ou9a9JACfs=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, nixosTests, systemd }:
|
||||
{ lib, fetchFromGitHub, fetchpatch, elk6Version, buildGoPackage, libpcap, nixosTests, systemd }:
|
||||
|
||||
let beat = package : extraArgs : buildGoPackage (rec {
|
||||
name = "${package}-${version}";
|
||||
|
|
@ -15,6 +15,14 @@ let beat = package : extraArgs : buildGoPackage (rec {
|
|||
|
||||
subPackages = [ package ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Build fix for aarch64, possibly other systems, merged in beats 7.x https://github.com/elastic/beats/pull/9493
|
||||
url = "https://github.com/elastic/beats/commit/5d796571de1aa2a299393d2045dacc2efac41a04.diff";
|
||||
sha256 = "sha256:0b79fljbi5xd3h8iiv1m38ad0zhmj09f187asc0m9rxlqrz2l9r2";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.elastic.co/products/beats";
|
||||
license = licenses.asl20;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iotop-c";
|
||||
version = "1.18";
|
||||
version = "1.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tomas-M";
|
||||
repo = "iotop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5RbxryvRKWJvjuJJwDK6GYnwdtHGfW7XEc75q4omxIA=";
|
||||
sha256 = "sha256-CuZwOIhjl6fpEvfw/4CTjKQkxazLL/NGujmNcx1Jrbc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -11,12 +11,13 @@ iproute2.overrideAttrs (oa: rec {
|
|||
sha256 = "07fihvwlaj0ng8s8sxqhd0a9h1narcnp4ibk88km9cpsd32xv4q3";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
# Don't try to create /var/lib/arpd:
|
||||
sed -e '/ARPDDIR/d' -i Makefile
|
||||
preConfigure = oa.preConfigure + ''
|
||||
patchShebangs configure
|
||||
'';
|
||||
|
||||
# We override "patches" to never apply any iproute2 patches:
|
||||
patches = [ ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/multipath-tcp/iproute-mptcp";
|
||||
description = "IP-Route extensions for MultiPath TCP";
|
||||
|
|
|
|||
|
|
@ -37,6 +37,11 @@ stdenv.mkDerivation rec {
|
|||
url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch";
|
||||
sha256 = "0lg4l9phvy2n8gy17qsn6zn0qq52vm8g01pgq5kqpr8sd3fb21c2";
|
||||
})
|
||||
(fetchpatch {
|
||||
# upstream build fix against -fno-common compilers like >=gcc-10
|
||||
url = "https://github.com/telmich/gpm/commit/f04f24dd5ca5c1c13608b144ab66e2ccd47f106a.patch";
|
||||
sha256 = "1q5hl5m61pci2f0x7r5in99rmqh328v1k0zj2693wdlafk9dabks";
|
||||
})
|
||||
];
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
|
|
|
|||
|
|
@ -1,22 +1,36 @@
|
|||
{ lib, stdenv, fetchFromBitbucket, ocaml, zlib, db, perl, camlp4 }:
|
||||
{ lib, stdenv, fetchFromGitHub, ocamlPackages, perl
|
||||
, zlib, db
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (ocamlPackages)
|
||||
ocaml
|
||||
findlib
|
||||
cryptokit
|
||||
num
|
||||
;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sks";
|
||||
version = "1.1.6";
|
||||
version = "unstable-2021-02-04";
|
||||
|
||||
src = fetchFromBitbucket {
|
||||
owner = "skskeyserver";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SKS-Keyserver";
|
||||
repo = "sks-keyserver";
|
||||
rev = version;
|
||||
sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm";
|
||||
rev = "c3ba6d5abb525dcb84745245631c410c11c07ec1";
|
||||
sha256 = "0fql07sc69hv6jy7x5svb19977cdsz0p1j8wv53k045a6v7rw1jw";
|
||||
};
|
||||
|
||||
# pkgs.db provides db_stat, not db$major.$minor_stat
|
||||
patches = [ ./adapt-to-nixos.patch ];
|
||||
patches = [
|
||||
./adapt-to-nixos.patch
|
||||
];
|
||||
|
||||
outputs = [ "out" "webSamples" ];
|
||||
|
||||
buildInputs = [ ocaml zlib db perl camlp4 ];
|
||||
nativeBuildInputs = [ ocaml findlib perl ];
|
||||
buildInputs = [ zlib db cryptokit num ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ];
|
||||
preConfigure = ''
|
||||
|
|
@ -44,9 +58,9 @@ stdenv.mkDerivation rec {
|
|||
spotty connectivity, can fully synchronize with rest of the system.
|
||||
'';
|
||||
inherit (src.meta) homepage;
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ primeos fpletz globin ];
|
||||
maintainers = with maintainers; [ fpletz globin ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -103,7 +103,9 @@ core = stdenv.mkDerivation rec {
|
|||
installTargets = [ "install" "texlinks" ];
|
||||
|
||||
# TODO: perhaps improve texmf.cnf search locations
|
||||
postInstall = /* a few texmf-dist files are useful; take the rest from pkgs */ ''
|
||||
postInstall = /* links format -> engine will be regenerated in texlive.combine */ ''
|
||||
PATH="$out/bin:$PATH" ${texlinks} --cnffile "$out/share/texmf-dist/web2c/fmtutil.cnf" --unlink "$out/bin"
|
||||
'' + /* a few texmf-dist files are useful; take the rest from pkgs */ ''
|
||||
mv "$out/share/texmf-dist/web2c/texmf.cnf" .
|
||||
rm -r "$out/share/texmf-dist"
|
||||
mkdir -p "$out"/share/texmf-dist/{web2c,scripts/texlive/TeXLive}
|
||||
|
|
|
|||
|
|
@ -9122,7 +9122,7 @@ with pkgs;
|
|||
|
||||
skippy-xd = callPackage ../tools/X11/skippy-xd {};
|
||||
|
||||
sks = callPackage ../servers/sks { inherit (ocaml-ng.ocamlPackages_4_02) ocaml camlp4; };
|
||||
sks = callPackage ../servers/sks { };
|
||||
|
||||
skydns = callPackage ../servers/skydns { };
|
||||
|
||||
|
|
|
|||
|
|
@ -209,6 +209,8 @@ in {
|
|||
|
||||
adguardhome = callPackage ../development/python-modules/adguardhome { };
|
||||
|
||||
adjusttext = callPackage ../development/python-modules/adjusttext { };
|
||||
|
||||
advantage-air = callPackage ../development/python-modules/advantage-air { };
|
||||
|
||||
aemet-opendata = callPackage ../development/python-modules/aemet-opendata { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue