cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2020-12-15 18:20:53 +00:00 committed by GitHub
commit 6e0acbf2ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 92 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/stdenv/cross-compilation.chapter.md
View file

@ -75,7 +75,7 @@ A run time dependency between two packages requires that their host platforms ma
A build time dependency, however, has a shift in platforms between the depending package and the depended-on package. "build time dependency" means that to build the depending package we need to be able to run the depended-on's package. The depending package's build platform is therefore equal to the depended-on package's host platform.
If both the dependency and depending packages aren't compilers or other machine-code-producing tools, we're done. And indeed `buildInputs` and `nativeBuildInputs` have covered these simpler build-time and run-time (respectively) changes for many years. But if the dependency does produce machine code, we might need to worry about its target platform too. In principle, that target platform might be any of the depending package's build, host, or target platforms, but we prohibit dependencies from a "later" platform to an earlier platform to limit confusion because we've never seen a legitimate use for them.
If both the dependency and depending packages aren't compilers or other machine-code-producing tools, we're done. And indeed `buildInputs` and `nativeBuildInputs` have covered these simpler cases for many years. But if the dependency does produce machine code, we might need to worry about its target platform too. In principle, that target platform might be any of the depending package's build, host, or target platforms, but we prohibit dependencies from a "later" platform to an earlier platform to limit confusion because we've never seen a legitimate use for them.
Finally, if the depending package is a compiler or other machine-code-producing tool, it might need dependencies that run at "emit time". This is for compilers that (regrettably) insist on being built together with their source languages' standard libraries. Assuming build != host != target, a run-time dependency of the standard library cannot be run at the compiler's build time or run time, but only at the run time of code emitted by the compiler.

6
maintainers/maintainer-list.nix
View file

@ -100,6 +100,12 @@
githubId = 178750;
name = "Andreas Baldeau";
};
abathur = {
email = "travis.a.everett+nixpkgs@gmail.com";
github = "abathur";
githubId = 2548365;
name = "Travis A. Everett";
};
abbe = {
email = "ashish.is@lostca.se";
github = "wahjava";

2
nixos/tests/lsd.nix
View file

@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = ''
lsd.succeed('echo "abc" > /tmp/foo')
assert "4 B /tmp/foo" in lsd.succeed('lsd --classic --blocks "size,name" /tmp/foo')
assert "4 B /tmp/foo" in lsd.succeed('lsd --classic --blocks "size,name" -l /tmp/foo')
assert "lsd ${pkgs.lsd.version}" in lsd.succeed("lsd --version")
'';
})

2
pkgs/applications/misc/hstr/default.nix
View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
description = "Shell history suggest box - easily view, navigate, search and use your command history";
license = stdenv.lib.licenses.asl20;
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
platforms = with stdenv.lib.platforms; linux; # Cannot test others
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}

64
pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix Normal file
View file

@ -0,0 +1,64 @@
{ stdenv, appimageTools, gsettings-desktop-schemas, gtk3, autoPatchelfHook, zlib, fetchurl }:
let
pname = "radicle-upstream";
version = "0.1.5";
name = "${pname}-${version}";
src = fetchurl {
url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage";
sha256 = "1q5p6bvzi5awxd9a3xvvdhy26bz0dx8drb1z0zzqdvqqcxxyydq7";
};
contents = appimageTools.extractType2 { inherit name src; };
git-remote-rad = stdenv.mkDerivation rec {
pname = "git-remote-rad";
inherit version;
src = contents;
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [ zlib ];
installPhase = ''
mkdir -p $out/bin/
cp ${contents}/resources/git-remote-rad $out/bin/git-remote-rad
'';
};
in
# FIXME: a dependency of the `proxy` component of radicle-upstream (radicle-macros
# v0.1.0) uses unstable rust features, making a from source build impossible at
# this time. See this PR for discussion: https://github.com/NixOS/nixpkgs/pull/105674
appimageTools.wrapType2 {
inherit name src;
profile = ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
# this automatically adds the git-remote-rad binary to the users `PATH` so
# they don't need to mess around with shell profiles...
ln -s ${git-remote-rad}/bin/git-remote-rad $out/bin/git-remote-rad
# desktop item
install -m 444 -D ${contents}/${pname}.desktop $out/share/applications/${pname}.desktop
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
# icon
install -m 444 -D ${contents}/${pname}.png \
$out/share/icons/hicolor/512x512/apps/${pname}.png
'';
meta = with stdenv.lib; {
description = "A decentralized app for code collaboration";
homepage = "https://radicle.xyz/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ xwvvvvwx ];
platforms = [ "x86_64-linux" ];
};
}

9
pkgs/applications/version-management/yadm/default.nix
View file

@ -19,10 +19,10 @@ stdenv.mkDerivation {
installPhase = ''
runHook preInstall
install -Dt $out/bin $src/yadm
install -Dt $out/share/man/man1 $src/yadm.1
install -D $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm
install -D $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash
install -Dt $out/bin yadm
install -Dt $out/share/man/man1 yadm.1
install -D completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm
install -D completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash
runHook postInstall
'';
@ -36,6 +36,7 @@ stdenv.mkDerivation {
* Supplies a method of encrypting confidential data so it can safely be stored in your repository.
'';
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ abathur ];
platforms = stdenv.lib.platforms.unix;
};
}

4
pkgs/development/libraries/amdvlk/default.nix
View file

@ -21,13 +21,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
version = "2020.Q4.5";
version = "2020.Q4.6";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
sha256 = "1CcupEm19ZGEma0TIkGxOa0doKhlPbfXFX2S44EBNp0=";
sha256 = "wminJxfku8Myag+SI7iLSvS+VzHlUd4c86BbpF/cr1w=";
};
buildInputs = [

3
pkgs/development/python-modules/pyopenssl/default.nix
View file

@ -54,6 +54,9 @@ let
optionals (hasPrefix "libressl" openssl.meta.name) failingLibresslTests
) ++ (
optionals (versionAtLeast (getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests
) ++ (
# https://github.com/pyca/pyopenssl/issues/974
optionals stdenv.isi686 [ "test_verify_with_time" ]
);
# Compose the final string expression, including the "-k" and the single quotes.

4
pkgs/development/tools/build-managers/sbt/default.nix
View file

@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "sbt";
version = "1.4.4";
version = "1.4.5";
src = fetchurl {
url =
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
sha256 = "0ibdq8g2bcanc7gcjslia89khlccn11inqmkx3y7pbqrc63y1yif";
sha256 = "wFxv20NfMMcw4yP8wbmLow8189jExDxkSIRqK2Ix/6U=";
};
patchPhase = ''

4
pkgs/development/tools/dt-schema/default.nix
View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "dtschema";
version = "2020.11";
version = "2020.12";
src = fetchPypi {
inherit pname version;
sha256 = "ad052d293eadb5b64631bfffac62c496427ad4105e76eef19a5422ba762ee734";
sha256 = "01de2598075909f2afb2d45277d0358645066f5bbb1770fca5f1d6f399846924";
};
nativeBuildInputs = [ setuptools_scm git ];

4
pkgs/servers/dns/knot-dns/default.nix
View file

@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
stdenv.mkDerivation rec {
pname = "knot-dns";
version = "3.0.2";
version = "3.0.3";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "f813a5e53263ef51d0415508e1f7d33cfbb75a139ccb10a344ae5a91689933fb";
sha256 = "fbc51897ef0ed0639ebad59b988a91382b9544288a2db8254f0b1de433140e38";
};
outputs = [ "bin" "out" "dev" ];

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

@ -16399,7 +16399,7 @@ in
CoreText IOSurface ImageIO OpenGL GLUT;
};
vtk_9 = libsForQt514.callPackage ../development/libraries/vtk/9.x.nix {
vtk_9 = libsForQt515.callPackage ../development/libraries/vtk/9.x.nix {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration
@ -17626,6 +17626,8 @@ in
radicale = radicale3;
radicle-upstream = callPackage ../applications/version-management/git-and-tools/radicle-upstream {};
rake = callPackage ../development/tools/build-managers/rake { };
redis = callPackage ../servers/nosql/redis { };