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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-02 18:13:34 +00:00 committed by GitHub
commit d3f5608624
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 180 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/merge-staging.yml vendored
View File

@ -4,7 +4,7 @@ on:
schedule:
# * is a special character in YAML so you have to quote this string
# Merge every 6 hours
- cron: '* */6 * * *'
- cron: '0 */6 * * *'
jobs:
sync-branch:

2
lib/systems/default.nix
View File

@ -25,7 +25,7 @@ rec {
system = parse.doubleFromSystem final.parsed;
config = parse.tripleFromSystem final.parsed;
# Just a guess, based on `system`
platform = platforms.selectBySystem final.system;
platform = platforms.select final;
# Determine whether we are compatible with the provided CPU
isCompatible = platform: parse.isCompatible final.parsed.cpu platform.parsed.cpu;
# Derived meta-data

6
lib/systems/examples.nix
View File

@ -7,7 +7,7 @@ let
riscv = bits: {
config = "riscv${bits}-unknown-linux-gnu";
platform = platforms.riscv-multiplatform bits;
platform = platforms.riscv-multiplatform;
};
in
@ -110,13 +110,13 @@ rec {
riscv64-embedded = {
config = "riscv64-none-elf";
libc = "newlib";
platform = platforms.riscv-multiplatform "64";
platform = platforms.riscv-multiplatform;
};
riscv32-embedded = {
config = "riscv32-none-elf";
libc = "newlib";
platform = platforms.riscv-multiplatform "32";
platform = platforms.riscv-multiplatform;
};
mmix = {

34
lib/systems/platforms.nix
View File

@ -471,10 +471,9 @@ rec {
## Other
##
riscv-multiplatform = bits: {
riscv-multiplatform = {
name = "riscv-multiplatform";
kernelArch = "riscv";
bfdEmulation = "elf${bits}lriscv";
kernelTarget = "vmlinux";
kernelAutoModules = true;
kernelBaseConfig = "defconfig";
@ -484,17 +483,22 @@ rec {
'';
};
selectBySystem = system: {
i486-linux = pc32;
i586-linux = pc32;
i686-linux = pc32;
x86_64-linux = pc64;
armv5tel-linux = sheevaplug;
armv6l-linux = raspberrypi;
armv7a-linux = armv7l-hf-multiplatform;
armv7l-linux = armv7l-hf-multiplatform;
aarch64-linux = aarch64-multiplatform;
mipsel-linux = fuloong2f_n32;
powerpc64le-linux = powernv;
}.${system} or pcBase;
select = platform:
# x86
/**/ if platform.isx86_32 then pc32
else if platform.isx86_64 then pc64
# ARM
else if platform.isAarch32 then let
version = platform.parsed.cpu.version or "";
in if lib.versionOlder version "6" then sheevaplug
else if lib.versionOlder version "7" then raspberrypi
else armv7l-hf-multiplatform
else if platform.isAarch64 then aarch64-multiplatform
else if platform.parsed.cpu == lib.systems.parse.cpuTypes.mipsel then fuloong2f_n32
else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv
else pcBase;
}

1
nixos/tests/gitea.nix
View File

@ -14,6 +14,7 @@ let
nodes = {
server = { config, pkgs, ... }: {
virtualisation.memorySize = 2048;
services.gitea = {
enable = true;
database = { inherit type; };

28
pkgs/applications/editors/jetbrains/default.nix
View File

@ -307,12 +307,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "2020.2.4"; /* updated by script */
version = "2020.3"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "1rlw01aq6ci46xv4d4877k30309jjws29kwhriy98xf804msyzyb"; /* updated by script */
sha256 = "0x1nsjw1m03iq7sd9i2qqlyribrzgi8yh6k5hnb630kvrxr8pxy6"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA RELEASE";
@ -320,12 +320,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "2020.2.4"; /* updated by script */
version = "2020.3"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
sha256 = "05qr8jiasqxmkgi9v52g7hgpdf7pkkjcp42bbkh1f4zgvq81p5py"; /* updated by script */
sha256 = "1l6bvfgzp27113rjy1y3jvp09cqx8gpnbgpwp83vsph7x0dhx8a3"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA RELEASE";
@ -333,12 +333,12 @@ in
mps = buildMps rec {
name = "mps-${version}";
version = "2020.2.2"; /* updated by script */
version = "2020.2.3"; /* updated by script */
description = "Create your own domain-specific language";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/mps/2020.2/MPS-${version}.tar.gz";
sha256 = "1a09yahky8ii2dypj69m89c3yh7akn7sa74n0j0mff7r46ad421y"; /* updated by script */
sha256 = "1wd3d8pc155m54y5p2056p0x93v2nv9457i7la53ibbs7rj1j7kw"; /* updated by script */
};
wmClass = "jetbrains-mps";
update-channel = "MPS RELEASE";
@ -359,12 +359,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
version = "2020.2.4"; /* updated by script */
version = "2020.2.5"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "196hhb4n52a50w50awx01ksyl5dkrbdmnz8sb9di5ihni7043p97"; /* updated by script */
sha256 = "0jkc26y3v94jj8q7dxq1py59is2whh45b890iac5adg6x670z3s6"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
@ -372,12 +372,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "2020.2.4"; /* updated by script */
version = "2020.2.5"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "0dwd9gvi8n3igza95pil3mf7azxn131830rvfzdvnvrzj9yb2q8l"; /* updated by script */
sha256 = "04imfgr45gvicjjgqzdcdmbnbiszjma3s40k2pgqs5nn6wbrw3dd"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";
@ -398,12 +398,12 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
version = "2020.2.4"; /* updated by script */
version = "2020.3"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "0bpkl8phc16yjm7qjfbg42rm7sbfwbrjva7w0qiwiw9ibwvs90id"; /* updated by script */
sha256 = "0ij6j9bxfqzj8gnrhhdgai22s1n5swd4waxd5zjvmv7q9j9cb2l5"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "RubyMine RELEASE";
@ -411,12 +411,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
version = "2020.2.4"; /* updated by script */
version = "2020.3"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "0l97nk9psb8g0sxm148fcz0x2v9mwqblffigrz2rmac3gd275s7f"; /* updated by script */
sha256 = "0sk7slwfr9jasid09hxw81sik5srn35vif3pbzpybig3yszbv6ld"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE";

6
pkgs/applications/networking/cluster/istioctl/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "istioctl";
version = "1.7.5";
version = "1.8.0";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
sha256 = "10h2ak3s74xb1rjvc6bc5yiyq2k8qbv07wxnshiqp5cnd6pjni0w";
sha256 = "0fwc56797gmcg9pcy0jpv5lb0b6wwiqh242xn1chd4a4hp8in7h9";
};
vendorSha256 = "1xj77w2h7qg808v6ll8hm5nvnb2lwky789aikgxli2k6m0cy0c5k";
vendorSha256 = "0ing5pih2rz974dcianlb05fpgrj3y7h32awf3cp41gh448gxd24";
doCheck = false;

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

@ -3,17 +3,17 @@
let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
version = "1.11.1";
version = "1.12.0";
name = "${stname}-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "0x5a24r74i9am6a8k32qkb2vck28d2jiy4yhpb4g774m4krjqxd2";
sha256 = "09kqc66pnklhmlcn66c5zydnvy2mfs2hqzd1465ydww8bbgcncss";
};
vendorSha256 = "0ap287996ix119hkdyssn2q2bqjbgdshi9a67hf8msfp7k9warm7";
vendorSha256 = "1jw0k1wm9mfsa2yr2fi2j8mrlykrlcwfnii07rafv9dnnwabs022";
doCheck = false;

4
pkgs/applications/science/biology/hmmer/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "3.3.1";
version = "3.3.2";
pname = "hmmer";
src = fetchurl {
url = "http://eddylab.org/software/hmmer/${pname}-${version}.tar.gz";
sha256 = "1mcvr74w6ffd5z0p8v3jss473mbgard9lz5whjnk95c661lnmrlc";
sha256 = "0s9wf6n0qanbx8qs6igfl3vyjikwbrvh4d9d6mv54yp3xysykzlj";
};
meta = with stdenv.lib; {

29
pkgs/applications/version-management/bumpver/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib, python3, git, mercurial}:
python3.pkgs.buildPythonApplication rec {
pname = "bumpver";
version = "2020.1107";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "75704333a8d1699e2cadcf1fcd3027a2cab6837ae343af10a61c6eef4e0313d7";
};
prePatch = ''
substituteInPlace setup.py \
--replace "if any(arg.startswith(\"bdist\") for arg in sys.argv):" ""\
--replace "import lib3to6" ""\
--replace "package_dir = lib3to6.fix(package_dir)" ""
'';
propagatedBuildInputs = with python3.pkgs; [ pathlib2 click toml lexid colorama setuptools ];
checkInputs = [ python3.pkgs.pytestCheckHook git mercurial];
meta = with lib; {
description = "Bump version numbers in project files";
homepage = "https://pypi.org/project/bumpver/";
license = licenses.mit;
maintainers = with maintainers; [ kfollesdal ];
};
}

4
pkgs/applications/version-management/gitea/default.nix
View File

@ -8,11 +8,11 @@ with stdenv.lib;
buildGoPackage rec {
pname = "gitea";
version = "1.12.6";
version = "1.13.0";
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "sha256-mEhtFcWLUhd+WK8wDhrGr6RvL4X2G42W6su/c8zxGR4=";
sha256 = "090i4hk9mb66ia14kyp7rqymhc897yi1ifb0skvknylx0sw8vhk9";
};
unpackPhase = ''

3
pkgs/build-support/bintools-wrapper/default.nix
View File

@ -167,7 +167,7 @@ stdenv.mkDerivation {
else if targetPlatform.isWindows then "pe"
else "elf" + toString targetPlatform.parsed.cpu.bits;
endianPrefix = if targetPlatform.isBigEndian then "big" else "little";
sep = optionalString (!targetPlatform.isMips && !targetPlatform.isPower) "-";
sep = optionalString (!targetPlatform.isMips && !targetPlatform.isPower && !targetPlatform.isRiscV) "-";
arch =
/**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64"
else if targetPlatform.isAarch32 then endianPrefix + "arm"
@ -187,6 +187,7 @@ stdenv.mkDerivation {
else if targetPlatform.isAlpha then "alpha"
else if targetPlatform.isVc4 then "vc4"
else if targetPlatform.isOr1k then "or1k"
else if targetPlatform.isRiscV then "lriscv"
else throw "unknown emulation for platform: ${targetPlatform.config}";
in if targetPlatform.useLLVM or false then ""
else targetPlatform.platform.bfdEmulation or (fmt + sep + arch);

7
pkgs/development/compilers/rust/rustc.nix
View File

@ -1,5 +1,4 @@
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
, targetPackages
, fetchurl, file, python3
, llvm_10, darwin, cmake, rust, rustPlatform
, pkgconfig, openssl
@ -93,8 +92,12 @@ in stdenv.mkDerivation rec {
"${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config"
] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox) [
"--enable-profiler" # build libprofiler_builtins
] ++ optionals stdenv.buildPlatform.isMusl [
"${setBuild}.musl-root=${pkgsBuildBuild.targetPackages.stdenv.cc.libc}"
] ++ optionals stdenv.hostPlatform.isMusl [
"${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}"
] ++ optionals stdenv.targetPlatform.isMusl [
"${setTarget}.musl-root=${targetPackages.stdenv.cc.libc}"
"${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}"
];
# The bootstrap.py will generated a Makefile that then executes the build.

23
pkgs/development/ocaml-modules/astring/default.nix
View File

@ -1,12 +1,25 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
stdenv.mkDerivation rec {
version = "0.8.3";
name = "ocaml${ocaml.version}-astring-${version}";
let
# Use astring 0.8.3 for OCaml < 4.05
param =
if stdenv.lib.versionAtLeast ocaml.version "4.05"
then {
version = "0.8.5";
sha256 = "1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6";
} else {
version = "0.8.3";
sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0";
};
in
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-astring-${param.version}";
inherit (param) version;
src = fetchurl {
url = "https://erratique.ch/software/astring/releases/astring-${version}.tbz";
sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0";
url = "https://erratique.ch/software/astring/releases/astring-${param.version}.tbz";
inherit (param) sha256;
};
buildInputs = [ ocaml findlib ocamlbuild topkg ];

4
pkgs/development/ocaml-modules/stdlib-shims/default.nix
View File

@ -2,10 +2,10 @@
buildDunePackage rec {
pname = "stdlib-shims";
version = "0.2.0";
version = "0.1.0";
src = fetchurl {
url = "https://github.com/ocaml/${pname}/releases/download/${version}/${pname}-${version}.tbz";
sha256 = "0nb5flrczpqla1jy2pcsxm06w4jhc7lgbpik11amwhfzdriz0n9c";
sha256 = "1jv6yb47f66239m7hsz7zzw3i48mjpbvfgpszws48apqx63wjwsk";
};
minimumOCamlVersion = "4.02";
doCheck = true;

7
pkgs/development/python-modules/ircrobots/default.nix
View File

@ -13,20 +13,19 @@
buildPythonPackage rec {
pname = "ircrobots";
version = "0.3.5";
version = "0.3.6";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "jesopo";
repo = pname;
rev = "v${version}";
sha256 = "1w04gif227fhzalrds9rscqmckv5h0x2p8600s876i19w41swi32";
sha256 = "1c8h8b78gmnfipppr9dxp7sl6wd9lx4l3pdwykaib1f49dqwavys";
};
postPatch = ''
# too specific pins https://github.com/jesopo/ircrobots/issues/3
sed -iE 's/==.*//' requirements.txt
sed -iE 's/dataclasses.*/dataclasses; python_version < "3.7"/' requirements.txt
sed -iE 's/anyio.*/anyio/' requirements.txt
'';
propagatedBuildInputs = [

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

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "ircstates";
version = "0.11.5";
version = "0.11.6";
disabled = pythonOlder "3.6"; # f-strings
src = fetchFromGitHub {
owner = "jesopo";
repo = pname;
rev = "v${version}";
sha256 = "1b1py1q02wbp4fmkjvchvazklfqibqd6pb28gdq7dg1bwwwd7vda";
sha256 = "0yhrd1nmf9fjwknbga8wspy3bab40lgp4qqnr7w75x9wq5ivmqhg";
};
propagatedBuildInputs = [

22
pkgs/development/python-modules/lexid/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, python, pythonOlder, buildPythonPackage, fetchPypi, pytestCheckHook, click }:
buildPythonPackage rec {
pname = "lexid";
version = "2020.1005";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "52333a2b9ebd14aa0dfeb33de72bd159c2dc31adb9c59cddfc486e2b69bfdcd1";
};
propagatedBuildInputs = [ click ];
checkInputs = [ pytestCheckHook ];
meta = with lib; {
description = "micro library to increment lexically ordered numerical ids";
homepage = "https://pypi.org/project/lexid/";
license = licenses.mit;
maintainers = with maintainers; [ kfollesdal ];
};
}

4
pkgs/development/python-modules/openrazer/common.nix
View File

@ -1,12 +1,12 @@
{ stdenv
, fetchFromGitHub
}: rec {
version = "2.8.0";
version = "2.9.0";
src = fetchFromGitHub {
owner = "openrazer";
repo = "openrazer";
rev = "v${version}";
sha256 = "0mwg6b2y3wfpvgxb9lznwblb3bnrayn858nc4fbbg76zdp5bk5ky";
sha256 = "1js7hq7zx5kj99brffrfaaah283ydkffmmrzsxv4mkd3nnd6rykk";
};
meta = with stdenv.lib; {
homepage = "https://openrazer.github.io/";

34
pkgs/development/python-modules/pyosf/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy27
, pytestrunner
, requests
}:
buildPythonPackage rec {
pname = "pyosf";
version = "1.0.5";
disabled = isPy27;
src = fetchFromGitHub {
owner = "psychopy";
repo = pname;
rev = "v${version}";
sha256 = "1fkpmylpcbqa9ky111mz4qr1n8pik49gs7pblbb5qx6b54fzl5k2";
};
preBuild = "export HOME=$TMP";
buildInputs = [ pytestrunner ]; # required via `setup_requires`
propagatedBuildInputs = [ requests ];
doCheck = false; # requires network access
pythonImportsCheck = [ "pyosf" ];
meta = with lib; {
homepage = "https://github.com/psychopy/pyosf";
description = "Pure Python library for simple sync with Open Science Framework";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};
}

4
pkgs/games/freeciv/default.nix
View File

@ -12,13 +12,13 @@ let
in stdenv.mkDerivation rec {
pname = "freeciv";
version = "2.6.2";
version = "2.6.2.1";
src = fetchFromGitHub {
owner = "freeciv";
repo = "freeciv";
rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "023slffi06j52amrnmd8n12rmf778cngxx6xg4hbsgckj2nyfmg9";
sha256 = "1nra6b6sk2gciaw1fpwx7qa20hky8cwcdwlshcl1zsikg577hyg5";
};
postPatch = ''

4
pkgs/tools/networking/haproxy/default.nix
View File

@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
stdenv.mkDerivation rec {
pname = "haproxy";
version = "2.3.1";
version = "2.3.2";
src = fetchurl {
url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
sha256 = "0jyaxwgghvgd599acxr91hr2v4wyv3bd1j45k0gb4q2v58jz2fwd";
sha256 = "1mcg0d6qiwl3xps65ir2sv5sc868zla5wnfhk24d2b0sg6xp7jwr";
};
buildInputs = [ openssl zlib ]

4
pkgs/tools/networking/i2pd/default.nix
View File

@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null;
stdenv.mkDerivation rec {
pname = "i2pd";
version = "2.34.0";
version = "2.35.0";
src = fetchFromGitHub {
owner = "PurpleI2P";
repo = pname;
rev = version;
sha256 = "0ibk222fwgjaxrmhrk5avcmmbj52ibcsydm2m02xnlpr8kcqsjnc";
sha256 = "0bpkgq7srwpjmadsz3nsd14jpr19b1zfrpc074lzjaq15icxxgxc";
};
buildInputs = with stdenv.lib; [ boost zlib openssl ]

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

@ -2788,6 +2788,8 @@ in
inherit (pythonPackages) gyp;
};
bumpver = callPackage ../applications/version-management/bumpver { };
bup = callPackage ../tools/backup/bup { };
burp = callPackage ../tools/backup/burp { };

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

@ -3380,6 +3380,8 @@ in {
leveldb = callPackage ../development/python-modules/leveldb { };
lexid = callPackage ../development/python-modules/lexid { };
libagent = callPackage ../development/python-modules/libagent { };
pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { };
@ -5364,6 +5366,8 @@ in {
pyopenssl = callPackage ../development/python-modules/pyopenssl { };
pyosf = callPackage ../development/python-modules/pyosf { };
pyosmium = callPackage ../development/python-modules/pyosmium { };
pyotp = callPackage ../development/python-modules/pyotp { };