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] 2021-02-14 06:16:32 +00:00 committed by GitHub
commit 4581c55d85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 429 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
.github/workflows/rebase-staging.yml vendored
View File

@ -1,60 +0,0 @@
on:
issue_comment:
types:
- created
# This action allows people with write access to the repo to rebase a PRs base branch from
# master to staging by commenting `/rebase-staging` on the PR while avoiding CODEOWNER notifications.
jobs:
rebase:
runs-on: ubuntu-latest
if: github.repository_owner == 'NixOS' && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase-staging')
steps:
- uses: peter-evans/create-or-update-comment@v1
with:
comment-id: ${{ github.event.comment.id }}
reactions: eyes
- uses: scherermichael-oss/action-has-permission@1.0.6
id: check-write-access
with:
required-permission: write
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: check base branch is master
if: steps.check-write-access.outputs.has-permission
run: |
if [ "$(curl https://api.github.com/repos/NixOS/nixpkgs/pulls/${{ github.event.issue.number }} | jq -r '.base.ref')" != "master" ]; then
echo "This action only works when the current base branch is master."
exit 1
fi
- uses: actions/checkout@v2
with:
fetch-depth: 0
if: steps.check-write-access.outputs.has-permission
- name: rebase pull request
if: steps.check-write-access.outputs.has-permission
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PULL_REQUEST: ${{ github.event.issue.number }}
run: |
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
git fetch origin
gh pr checkout "$PULL_REQUEST"
git rebase \
--onto="$(git merge-base origin/master origin/staging)" \
"HEAD~$(git rev-list --count HEAD ^master)"
git push --force
curl \
-X POST \
-H "Accept: application/vnd.github.v3+json" \
-H "Authorization: token $GITHUB_TOKEN" \
-d '{ "base": "staging" }' \
"https://api.github.com/repos/NixOS/nixpkgs/pulls/$PULL_REQUEST"
- uses: peter-evans/create-or-update-comment@v1
if: ${{ failure() }}
with:
issue-number: ${{ github.event.issue.number }}
body: |
[Failed to rebase on `staging`](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }})

134
.github/workflows/rebase.yml vendored Normal file
View File

@ -0,0 +1,134 @@
on:
issue_comment:
types:
- created
# This action allows people with write access to the repo to rebase a PRs base branch
# by commenting `/rebase ${branch}` on the PR while avoiding CODEOWNER notifications.
jobs:
rebase:
runs-on: ubuntu-latest
if: github.repository_owner == 'NixOS' && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
steps:
- uses: peter-evans/create-or-update-comment@v1
with:
comment-id: ${{ github.event.comment.id }}
reactions: eyes
- uses: scherermichael-oss/action-has-permission@1.0.6
id: check-write-access
with:
required-permission: write
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: check permissions
run: |
echo "Commenter doesn't have write access to the repo"
exit 1
if: "! steps.check-write-access.outputs.has-permission"
- name: setup
run: |
curl "https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.issue.number }}" 2>/dev/null >pr.json
cat <<EOF >>"$GITHUB_ENV"
CAN_MODIFY=$(jq -r '.maintainer_can_modify' pr.json)
COMMITS=$(jq -r '.commits' pr.json)
CURRENT_BASE=$(jq -r '.base.ref' pr.json)
PR_BRANCH=$(jq -r '.head.ref' pr.json)
COMMENT_BRANCH=$(echo ${{ github.event.comment.body }} | awk "/^\/rebase / {print \$2}")
PULL_REQUEST=${{ github.event.issue.number }}
EOF
rm pr.json
- name: check branch
env:
PERMANENT_BRANCHES: "haskell-updates|master|nixos|nixpkgs|python-unstable|release|staging"
VALID_BRANCHES: "haskell-updates|master|python-unstable|release-20.09|staging|staging-20.09|staging-next"
run: |
message() {
cat <<EOF
Can't rebase $PR_BRANCH from $CURRENT_BASE onto $COMMENT_BRANCH (PR:$PULL_REQUEST COMMITS:$COMMITS)
EOF
}
if ! [[ "$COMMENT_BRANCH" =~ ^($VALID_BRANCHES)$ ]]; then
cat <<EOF
Check that the branch from the comment is valid:
$(message)
This action can only rebase onto these branches:
$VALID_BRANCHES
\`/rebase \${branch}\` must be at the start of the line
EOF
exit 1
fi
if [[ "$COMMENT_BRANCH" == "$CURRENT_BASE" ]]; then
cat <<EOF
Check that the branch from the comment isn't the current base branch:
$(message)
EOF
exit 1
fi
if [[ "$COMMENT_BRANCH" == "$PR_BRANCH" ]]; then
cat <<EOF
Check that the branch from the comment isn't the current branch:
$(message)
EOF
exit 1
fi
if [[ "$PR_BRANCH" =~ ^($PERMANENT_BRANCHES) ]]; then
cat <<EOF
Check that the PR branch isn't a permanent branch:
$(message)
EOF
exit 1
fi
if [[ "$CAN_MODIFY" != "true" ]]; then
cat <<EOF
Check that maintainers can edit the PR branch:
$(message)
EOF
exit 1
fi
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: rebase pull request
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
git fetch origin
gh pr checkout "$PULL_REQUEST"
git rebase \
--onto="$(git merge-base origin/"$CURRENT_BASE" origin/"$COMMENT_BRANCH")" \
"HEAD~$COMMITS"
git push --force
curl \
-X POST \
-H "Accept: application/vnd.github.v3+json" \
-H "Authorization: token $GITHUB_TOKEN" \
-d "{ \"base\": \"$COMMENT_BRANCH\" }" \
"https://api.github.com/repos/${{ github.repository }}/pulls/$PULL_REQUEST"
curl \
-X PATCH \
-H "Accept: application/vnd.github.v3+json" \
-H "Authorization: token $GITHUB_TOKEN" \
-d '{ "state": "closed" }' \
"https://api.github.com/repos/${{ github.repository }}/pulls/$PULL_REQUEST"
- uses: peter-evans/create-or-update-comment@v1
with:
issue-number: ${{ github.event.issue.number }}
body: |
Rebased, please reopen the pull request to restart CI
- uses: peter-evans/create-or-update-comment@v1
if: failure()
with:
issue-number: ${{ github.event.issue.number }}
body: |
[Failed to rebase](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})

4
pkgs/desktops/gnome-3/extensions/unite/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-unite";
version = "44";
version = "45";
src = fetchFromGitHub {
owner = "hardpixel";
repo = "unite-shell";
rev = "v${version}";
sha256 = "0nqc1q2yz4xa3fdfx45w6da1wijmdwzhdrch0mqwblgbpjr4fs9g";
sha256 = "sha256-ghmCnzlPvxHEy2ro1AL+T2yiavJVrPhRfIKbMBwMjac=";
};
uuid = "unite@hardpixel.eu";

9
pkgs/development/compilers/cudatoolkit/default.nix
View File

@ -153,5 +153,12 @@ in rec {
gcc = gcc9;
};
cudatoolkit_11 = cudatoolkit_11_1;
cudatoolkit_11_2 = common {
version = "11.2.1";
url = "https://developer.download.nvidia.com/compute/cuda/11.2.1/local_installers/cuda_11.2.1_460.32.03_linux.run";
sha256 = "sha256-HamMuJfMX1inRFpKZspPaSaGdwbLOvWKZpzc2Nw9F8g=";
gcc = gcc9;
};
cudatoolkit_11 = cudatoolkit_11_2;
}

6
pkgs/development/compilers/yosys/default.nix
View File

@ -33,13 +33,13 @@
stdenv.mkDerivation rec {
pname = "yosys";
version = "0.9+3830";
version = "0.9+3905";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
rev = "b72c29465392c8d260ddf55def169438f7fb64b2";
sha256 = "12h3pgj8bjb254q2qaafc3qxwhqdqrx0sxjhgjrfy8cmkdm92dvy";
rev = "4e741adda976260f620e5787d6db3cb28e0e35e7";
sha256 = "0ml4c7vfzmivcc289d12m6ki82qdsg5wj00f2aamcvq1y7l4062x";
};
enableParallelBuilding = true;

7
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@ -1,7 +1,6 @@
{ pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
, libxml2, libxslt, ncurses, openssl, perl, autoconf
# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731
, openjdk8 ? null # javacSupport
, openjdk11 ? null # javacSupport
, unixODBC ? null # odbcSupport
, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null
, parallelBuild ? false
@ -17,7 +16,7 @@
, enableThreads ? true
, enableSmpSupport ? true
, enableKernelPoll ? true
, javacSupport ? false, javacPackages ? [ openjdk8 ]
, javacSupport ? false, javacPackages ? [ openjdk11 ]
, odbcSupport ? false, odbcPackages ? [ unixODBC ]
, withSystemd ? stdenv.isLinux # systemd support in epmd
, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]
@ -37,7 +36,7 @@ assert wxSupport -> (if stdenv.isDarwin
else libGL != null && libGLU != null && wxGTK != null && xorg != null);
assert odbcSupport -> unixODBC != null;
assert javacSupport -> openjdk8 != null;
assert javacSupport -> openjdk11 != null;
let
inherit (lib) optional optionals optionalAttrs optionalString;

20
pkgs/development/libraries/science/math/cudnn/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0 }:
{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }:
let
generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
@ -82,11 +82,21 @@ in rec {
cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_2;
cudnn_cudatoolkit_11_0 = generic rec {
version = "8.0.2";
version = "8.1.0";
cudatoolkit = cudatoolkit_11_0;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v8.0.2.39.tgz";
sha256 = "0ib3v3bgcdxarqapkxngw1nwl0c2a7zz392ns7w9ipcficl4cbv7";
# 8.1.0 is compatible with CUDA 11.0, 11.1, and 11.2:
# https://docs.nvidia.com/deeplearning/cudnn/support-matrix/index.html#cudnn-cuda-hardware-versions
srcName = "cudnn-11.2-linux-x64-v8.1.0.77.tgz";
sha256 = "sha256-2+gvrwcdkbqbzwBIAUatM/RiSC3+5WyvRHnBuNq+Pss=";
};
cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_0;
cudnn_cudatoolkit_11_1 = cudnn_cudatoolkit_11_0.override {
cudatoolkit = cudatoolkit_11_1;
};
cudnn_cudatoolkit_11_2 = cudnn_cudatoolkit_11_0.override {
cudatoolkit = cudatoolkit_11_2;
};
cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_2;
}

40
pkgs/development/python-modules/asyncwhois/default.nix
View File

@ -1,20 +1,23 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, aiodns
, tldextract
, asynctest
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, tldextract
}:
buildPythonPackage rec {
pname = "asyncwhois";
version = "0.2.4";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "84677e90bc2d2975788e905ae9841bc91a732a452bc870991105b0a6cc3cd22f";
src = fetchFromGitHub {
owner = "pogzyb";
repo = pname;
rev = "v${version}";
sha256 = "17w007hjnpggj6jvkv8wxwllxk6mir1q2nhw0dqg7glm4lfbx8kr";
};
propagatedBuildInputs = [
@ -22,9 +25,24 @@ buildPythonPackage rec {
tldextract
];
# tests are only present at GitHub but not the released source tarballs
# https://github.com/pogzyb/asyncwhois/issues/10
doCheck = false;
checkInputs = [
asynctest
pytestCheckHook
];
# Disable tests that require network access
disabledTests = [
"test_pywhois_aio_get_hostname_from_ip"
"test_pywhois_get_hostname_from_ip"
"test_pywhois_aio_lookup_ipv4"
"test_not_found"
"test_aio_from_whois_cmd"
"test_aio_get_hostname_from_ip"
"test_from_whois_cmd"
"test_get_hostname_from_ip"
"test_whois_query_run"
];
pythonImportsCheck = [ "asyncwhois" ];
meta = with lib; {

32
pkgs/development/python-modules/auroranoaa/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "auroranoaa";
version = "0.0.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "djtimca";
repo = "aurora-api";
rev = version;
sha256 = "0bh8amixkg3xigwh3ryra22x6kzhbdassmf1iqv20lhbvzmsqjv0";
};
propagatedBuildInputs = [ aiohttp ];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "auroranoaa" ];
meta = with lib; {
description = "Python wrapper for the Aurora API";
homepage = "https://github.com/djtimca/aurora-api";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

5
pkgs/development/python-modules/google-cloud-bigquery/default.nix
View File

@ -7,7 +7,6 @@
, google-cloud-storage
, google-cloud-testutils
, google-resumable-media
, grpcio
, ipython
, mock
, pandas
@ -18,11 +17,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "2.7.0";
version = "2.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "29721972f5e539e486fbdc722ddf849ad86acd092680d16c271430dc16023544";
sha256 = "c4c43f7f440d6e5bb2895d21122af5de65b487ea2c69cea466a516bb826ab921";
};
propagatedBuildInputs = [

32
pkgs/development/python-modules/guppy3/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, tkinter
}:
buildPythonPackage rec {
pname = "guppy3";
version = "3.1.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "zhuyifei1999";
repo = pname;
rev = "v${version}";
sha256 = "0yjsn8najbic4f50nj6jzhzrhj1bw6918w0gihdkzhqynwgqi64m";
};
propagatedBuildInputs = [ tkinter ];
# Tests are starting a Tkinter GUI
doCheck = false;
pythonImportsCheck = [ "guppy" ];
meta = with lib; {
description = "Python Programming Environment & Heap analysis toolset";
homepage = "https://zhuyifei1999.github.io/guppy3/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

28
pkgs/development/python-modules/metar/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "metar";
version = "1.8.0";
src = fetchFromGitHub {
owner = "python-metar";
repo = "python-metar";
rev = "v${version}";
sha256 = "019vfq9191cdvvq1afdcdgdgbzpj7wq6pz9li8ggim71azjnv5nn";
};
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "metar" ];
meta = with lib; {
description = "Python parser for coded METAR weather reports";
homepage = "https://github.com/python-metar/python-metar";
license = with licenses; [ bsd1 ];
maintainers = with maintainers; [ fab ];
};
}

8
pkgs/development/python-modules/osmpythontools/default.nix
View File

@ -13,15 +13,17 @@
buildPythonPackage rec {
pname = "osmpythontools";
version = "0.2.9";
version = "0.3.0";
src = fetchFromGitHub {
owner = "mocnik-science";
repo = "osm-python-tools";
rev = "v${version}";
sha256 = "1qpj03fgn8rmrg9a9vk7bw32k9hdy15g5p2q3a6q52ykpb78jdz5";
sha256 = "0r72z7f7kmvvbd9zvgci8rwmfj85xj34mb3x5dj3jcv5ij5j72yh";
};
# Upstream setup.py has test dependencies in `install_requires` argument.
# Remove them, as we don't run the tests.
patches = [ ./remove-test-only-dependencies.patch ];
propagatedBuildInputs = [
@ -55,7 +57,7 @@ buildPythonPackage rec {
Nominatim, and the OpenStreetMap editing API.
'';
homepage = "https://github.com/mocnik-science/osm-python-tools";
license = licenses.gpl3;
license = licenses.gpl3Only;
maintainers = with maintainers; [ das-g ];
};
}

47
pkgs/development/python-modules/pynws/default.nix Normal file
View File

@ -0,0 +1,47 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, freezegun
, metar
, pytest-aiohttp
, pytest-asyncio
, pytest-cov
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "pynws";
version = "1.3.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "MatthewFlamm";
repo = pname;
rev = "v${version}";
sha256 = "13ipmx60kicwh8qxjazap4vk94x8i3r0lnkdsap7gffaizwgp49d";
};
propagatedBuildInputs = [
aiohttp
metar
];
checkInputs = [
freezegun
pytest-aiohttp
pytest-asyncio
pytest-cov
pytestCheckHook
];
pythonImportsCheck = [ "pynws" ];
meta = with lib; {
description = "Python library to retrieve data from NWS/NOAA";
homepage = "https://github.com/MatthewFlamm/pynws";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

40
pkgs/development/python-modules/transitions/default.nix
View File

@ -1,21 +1,39 @@
{ lib, buildPythonPackage, fetchFromGitHub
, six, pytestCheckHook, mock, dill, pycodestyle }:
{ lib
, buildPythonPackage
, fetchPypi
, six
, pygraphviz
, pytestCheckHook
, mock
, graphviz
, pycodestyle
}:
buildPythonPackage rec {
pname = "transitions";
version = "0.8.6";
version = "0.8.7";
# test_codestyle.py fails in PyPI sdist
src = fetchFromGitHub {
owner = "pytransitions";
repo = "transitions";
rev = version;
sha256 = "1d913hzzyqhdhhbkbvjw65dqkajrw50a4sxhyxk0jlg8pcs7bs7v";
src = fetchPypi {
inherit pname version;
sha256 = "8c60ec0828cd037820726283cad5d4d77a5e31514e058b51250420e9873e9bc7";
};
propagatedBuildInputs = [ six ];
propagatedBuildInputs = [
six
pygraphviz # optional
];
checkInputs = [ pytestCheckHook mock dill pycodestyle ];
checkInputs = [
pytestCheckHook
mock
graphviz
pycodestyle
];
disabledTests = [
# Fontconfig error: Cannot load default config file
"test_diagram"
];
meta = with lib; {
homepage = "https://github.com/pytransitions/transitions";

6
pkgs/development/tools/convco/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "convco";
version = "0.3.2";
version = "0.3.3";
src = fetchFromGitHub {
owner = "convco";
repo = pname;
rev = "v${version}";
sha256 = "0fqq6irbq1aikhhw08gc9kp0vbk2aminfbvwdlm58cvywyq91bn4";
sha256 = "sha256-eWe7oTWl7QfIqq3GfMILi5S8zUi03ER1Mzfr8hqUvgw=";
};
cargoSha256 = "073sfv42fbl8rjm3dih1ghs9vq75mjshp66zdzdan2dmmrnw5m9z";
cargoSha256 = "sha256-hAUg2mh4VyyjkBRBs5YWi14yeGlMXxt+cdoz5xOS+1A=";
nativeBuildInputs = [ openssl perl pkg-config ];

13
pkgs/development/tools/coursier/default.nix
View File

@ -2,7 +2,7 @@
, coreutils, git, gnused, nix, nixfmt }:
let
version = "2.0.9";
version = "2.0.11";
zshCompletion = fetchurl {
url =
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url =
"https://github.com/coursier/coursier/releases/download/v${version}/coursier";
sha256 = "sha256-jqSv9VBLotl6YVWgWNznvTThRIiMUStQ0WbN6u01b1c=";
sha256 = "sha256-jmKJPBPzO8DiXuJoHWibinkaAzneXdSK85SQfJ2nWhg=";
};
nativeBuildInputs = [ makeWrapper ];
@ -37,14 +37,7 @@ in stdenv.mkDerivation rec {
#!${stdenv.shell}
set -o errexit
PATH=${
lib.makeBinPath [
common-updater-scripts
coreutils
git
gnused
nix
nixfmt
]
lib.makeBinPath [ common-updater-scripts coreutils git gnused nix nixfmt ]
}
oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} 'v*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"

4
pkgs/development/tools/misc/clojure-lsp/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "clojure-lsp";
version = "2021.02.10-21.13.12";
version = "2021.02.13-18.04.19";
src = fetchurl {
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar";
sha256 = "sha256-kYetCpInY87l1NTaIhjzkNc2LQctMbSmcdQuI7zrFG4=";
sha256 = "sha256-v7+HH77xFxQc0LjVhcrXsdcmmZmrPiMSArxfoOaHkoI=";
};
dontUnpack = true;

10
pkgs/development/tools/packer/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
buildGoPackage rec {
pname = "packer";
version = "1.6.6";
@ -14,6 +14,14 @@ buildGoPackage rec {
sha256 = "sha256-kFDy8Zlx+D5JDyNlAmB/ICTe4K9s6KDbALP5pom5OQg=";
};
buildFlagsArray = [ "-ldflags=-s -w" ];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --zsh go/src/${goPackagePath}/contrib/zsh-completion/_packer
'';
meta = with lib; {
description = "A tool for creating identical machine images for multiple platforms from a single source configuration";
homepage = "https://www.packer.io";

18
pkgs/development/tools/rust/maturin/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "maturin";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "PyO3";
repo = "maturin";
rev = "v${version}";
hash = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs=";
hash = "sha256-0HD/wtHCbaJ0J+TC6k2xvWsCMnpdJbvivW/UM3g+Gss=";
};
cargoHash = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI=";
cargoHash = "sha256-bH9NQg7wJUe0MHkbt4DbjZEEVYZiVCwSbL4A/H+6WDs=";
nativeBuildInputs = [ pkg-config ];
@ -29,9 +29,17 @@ rustPlatform.buildRustPackage rec {
doCheck = false;
meta = with lib; {
description = "Build and publish crates with pyo3 bindings as python packages";
description = "Build and publish Rust crates Python packages";
longDescription = ''
Build and publish Rust crates with PyO3, rust-cpython, and
cffi bindings as well as Rust binaries as Python packages.
This project is meant as a zero-configuration replacement for
setuptools-rust and Milksnake. It supports building wheels for
Python and can upload them to PyPI.
'';
homepage = "https://github.com/PyO3/maturin";
license = licenses.mit;
license = licenses.asl20;
maintainers = [ maintainers.danieldk ];
};
}

6
pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
View File

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.4.84-rt47"; # updated by ./update-rt.sh
version = "5.4.93-rt51"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -14,14 +14,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "058mhczv6whjwxn7jjh1c6n5zrqjdnvbl2mp7jkfrg6frpvgr189";
sha256 = "08nmwd13z10866pc16fqbj41krnvk6hxkl4nmhdkpk346r04jx6k";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0nccxf9l9ycvb782f48zrbl59vi674qq7yjyaks97440pgyd1jg0";
sha256 = "1ffipbnzv8rnmawjlglm667jq67asdr1mwrfhsmwkvlmivm9k4x1";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

3
pkgs/os-specific/linux/kernel/update-rt.sh
View File

@ -36,7 +36,8 @@ file-version() {
latest-rt-version() {
branch="$1" # e.g. 5.4
curl -sL "$mirror/projects/rt/$branch/sha256sums.asc" |
sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/; p; q }'
sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/p}' |
tail -n 1
}
update-if-needed() {

6
pkgs/servers/home-assistant/component-packages.nix
View File

@ -57,7 +57,7 @@
"aten_pe" = ps: with ps; [ atenpdu ];
"atome" = ps: with ps; [ ]; # missing inputs: pyatome
"august" = ps: with ps; [ ]; # missing inputs: py-august
"aurora" = ps: with ps; [ ]; # missing inputs: auroranoaa
"aurora" = ps: with ps; [ auroranoaa ];
"aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy
"auth" = ps: with ps; [ aiohttp-cors ];
"automation" = ps: with ps; [ aiohttp-cors ];
@ -565,7 +565,7 @@
"numato" = ps: with ps; [ ]; # missing inputs: numato-gpio
"number" = ps: with ps; [ ];
"nut" = ps: with ps; [ ]; # missing inputs: pynut2
"nws" = ps: with ps; [ ]; # missing inputs: pynws
"nws" = ps: with ps; [ pynws ];
"nx584" = ps: with ps; [ ]; # missing inputs: pynx584
"nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi
"oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics
@ -631,7 +631,7 @@
"point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint
"poolsense" = ps: with ps; [ poolsense ];
"powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall
"profiler" = ps: with ps; [ objgraph pyprof2calltree ]; # missing inputs: guppy3
"profiler" = ps: with ps; [ guppy3 objgraph pyprof2calltree ];
"progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw
"proliphix" = ps: with ps; [ ]; # missing inputs: proliphix
"prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ];

14
pkgs/tools/misc/fzf/default.nix
View File

@ -1,28 +1,20 @@
{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl, fetchpatch }:
{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl }:
buildGoModule rec {
pname = "fzf";
version = "0.25.0";
version = "0.25.1";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
sha256 = "1j5bfxl4w8w3n89p051y8dhxg0py9l98v7r2gkr63bg4lj32faz8";
sha256 = "085apa4msw8v8f57942xh7wfw3dkavrl9d58yj6i3yr75l3vg05r";
};
vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p";
outputs = [ "out" "man" ];
patches = [
# Fix test failure on go 1.15
(fetchpatch {
url = "https://github.com/junegunn/fzf/commit/82791f7efccde5b30da0b4d44f10d214ae5c0c0d.patch";
sha256 = "1nybsz09h8cnvxjnkmx9c52g8z0x6pvrn230hw1va5a3pvmg01z1";
})
];
fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings";
buildInputs = [ ncurses ];

6
pkgs/tools/security/teler/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "teler";
version = "1.0.1";
version = "1.0.2-dev";
src = fetchFromGitHub {
owner = "kitabisa";
repo = "teler";
rev = "v${version}";
sha256 = "07pfqgms5cj4y6zm984qjmmw1c8j9yjbgrp2spi9vzk96s3k3qn3";
sha256 = "sha256-Hmoj44/rprM9oSFAsRWLszew0RvCTjdHISUSrx/4IPs=";
};
vendorSha256 = "06szi2jw3nayd7pljjlww2gsllgnfg8scnjmc6qv5xl6gf797kdz";
vendorSha256 = "sha256-L+wjurURpesCA2IK0r1sxvOUvNJT1wiRp75kpe6LH5s=";
# test require internet access
doCheck = false;

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

@ -3408,7 +3408,9 @@ in
cudatoolkit_10_1
cudatoolkit_10_2
cudatoolkit_11
cudatoolkit_11_0;
cudatoolkit_11_0
cudatoolkit_11_1
cudatoolkit_11_2;
cudatoolkit = cudatoolkit_10;
@ -3427,7 +3429,9 @@ in
cudnn_cudatoolkit_10_1
cudnn_cudatoolkit_10_2
cudnn_cudatoolkit_11
cudnn_cudatoolkit_11_0;
cudnn_cudatoolkit_11_0
cudnn_cudatoolkit_11_1
cudnn_cudatoolkit_11_2;
cudnn = cudnn_cudatoolkit_10;
@ -13098,6 +13102,8 @@ in
amrwb = callPackage ../development/libraries/amrwb { };
ansi2html = with python3.pkgs; toPythonApplication ansi2html;
anttweakbar = callPackage ../development/libraries/AntTweakBar { };
appstream = callPackage ../development/libraries/appstream { };

8
pkgs/top-level/python-packages.nix
View File

@ -546,6 +546,8 @@ in {
augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; };
auroranoaa = callPackage ../development/python-modules/auroranoaa { };
auth0-python = callPackage ../development/python-modules/auth0-python { };
authheaders = callPackage ../development/python-modules/authheaders { };
@ -2858,6 +2860,8 @@ in {
else
callPackage ../development/python-modules/gunicorn { };
guppy3 = callPackage ../development/python-modules/guppy3 { };
gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" then
callPackage ../development/python-modules/gurobipy/darwin.nix { inherit (pkgs.darwin) cctools insert_dylib; }
else if stdenv.hostPlatform.system == "x86_64-linux" then
@ -4036,6 +4040,8 @@ in {
metaphone = callPackage ../development/python-modules/metaphone { };
metar = callPackage ../development/python-modules/metar { };
mezzanine = callPackage ../development/python-modules/mezzanine { };
micawber = callPackage ../development/python-modules/micawber { };
@ -4921,6 +4927,8 @@ in {
pynuki = callPackage ../development/python-modules/pynuki { };
pynws = callPackage ../development/python-modules/pynws { };
pysbd = callPackage ../development/python-modules/pysbd { };
pyshark = callPackage ../development/python-modules/pyshark { };