From 32e666aa4bdec7cf2565931248c58d5dd3ee640e Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Wed, 1 Apr 2020 19:39:31 -0500 Subject: [PATCH 01/13] yadm: install from build directory instead of $src Noticed while trying to use substituteInPlace from prePatch that my changes weren't applying to the installed copy. --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/version-management/yadm/default.nix | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 81dd8e981e0..9aef6939497 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -87,6 +87,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"; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index aab47ed1327..5f16335117f 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -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; }; } From 3adf803295288eac0c9f5d1ea6c25e58cba41d01 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 11 Dec 2020 11:09:37 -0500 Subject: [PATCH 02/13] tailscale: 1.2.8 -> 1.2.10 --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index a32f8115e27..18803636a0d 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tailscale"; - version = "1.2.8"; - tagHash = "37adb62a35d818f4af638924d3fc1526bdeaf215"; # from `git rev-parse v1.2.7` + version = "1.2.10"; + tagHash = "4b3581abed6c2db79b61eb1b53e29645df12a833"; # from `git rev-parse v1.2.10` src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "0305n5gwp2w36z3yh0w8x3ma8a074zr913cx3y73szln56jz88hg"; + sha256 = "09m4xhnjpnkic9jy5dwnmpl40r92xa8fcx4xhpadv6hjpx9k4xx5"; }; nativeBuildInputs = [ makeWrapper ]; From 9907ec90d6abfe8a6a31687d8b85f4f719e61842 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Fri, 11 Dec 2020 15:29:16 -0300 Subject: [PATCH 03/13] vtk_9: qt514 -> qt515 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61c43289a62..fb53f5d1578 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16388,7 +16388,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 From b719f980ce88f9cf49534b39dac28beb3e58005d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 15 Dec 2020 02:44:22 +0000 Subject: [PATCH 04/13] dt-schema: 2020.11 -> 2020.12 --- pkgs/development/tools/dt-schema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix index 0392c4c95f9..3d420bf1901 100644 --- a/pkgs/development/tools/dt-schema/default.nix +++ b/pkgs/development/tools/dt-schema/default.nix @@ -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 ]; From c7e5c023744adce6e651cf20580cc0c59fb6f158 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 15 Dec 2020 11:45:38 +0100 Subject: [PATCH 05/13] doc/cross-compilation: Remove confusing re-explanation See https://github.com/NixOS/nixpkgs/issues/106950 > They way it's worded says buildInputs are for build-time and nativeBuildInputs are for run-time. The other documentation leads me to believe it is the other way around. --- doc/stdenv/cross-compilation.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md index bc7a1a13817..bdade81466e 100644 --- a/doc/stdenv/cross-compilation.chapter.md +++ b/doc/stdenv/cross-compilation.chapter.md @@ -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 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. 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. From 9062c1ecffe7b34bf5329601edc3869be522a31a Mon Sep 17 00:00:00 2001 From: David Terry Date: Wed, 2 Dec 2020 10:15:03 +0100 Subject: [PATCH 06/13] radicle-upstream: init at 0.1.5 --- .../radicle-upstream/default.nix | 64 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix new file mode 100644 index 00000000000..f7b6aa15314 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -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" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e336517b32..de9f256ca63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17628,6 +17628,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 { }; From 40b1f0d473f8c418122eecc3dce8011452f00090 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sun, 13 Dec 2020 10:48:18 +0100 Subject: [PATCH 07/13] pyopenssl: skip test that fails on i686 Found in https://github.com/NixOS/nixpkgs/pull/105454#issuecomment-743973848 Upstream issue https://github.com/pyca/pyopenssl/issues/974 --- pkgs/development/python-modules/pyopenssl/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index d9d2b382f50..202607186b9 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -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. From 89ce7a70f159dc469df95e6145e4086302ba6eda Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 15 Dec 2020 14:56:14 +0100 Subject: [PATCH 08/13] amdvlk: 2020.Q4.5 -> 2020.Q4.6 --- pkgs/development/libraries/amdvlk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index c3e52611554..f6859c94364 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -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 = [ From ba31c04641d63603ee137d455c9031b12ffa5906 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Dec 2020 09:10:34 -0500 Subject: [PATCH 09/13] lsd: Fix test CLI arguments changes in 0.19.0 See https://github.com/Peltoche/lsd/issues/461 --- nixos/tests/lsd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lsd.nix b/nixos/tests/lsd.nix index fee8e95e14f..e7525c97e32 100644 --- a/nixos/tests/lsd.nix +++ b/nixos/tests/lsd.nix @@ -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") ''; }) From 800c4724b7e070d95b78b2e3f25299664eddc535 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 15 Dec 2020 14:30:32 +0000 Subject: [PATCH 10/13] sbt: 1.4.4 -> 1.4.5 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index ebcae9e63ee..39832109d99 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -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 = '' From 3393e110a9fe54101134a793ad4c14931d2e93d5 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 15 Dec 2020 15:57:27 +0100 Subject: [PATCH 11/13] doc/stdenv/cross-compilation.chapter.md typo Co-authored-by: John Ericson --- doc/stdenv/cross-compilation.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md index bdade81466e..d7a07a621be 100644 --- a/doc/stdenv/cross-compilation.chapter.md +++ b/doc/stdenv/cross-compilation.chapter.md @@ -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 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. From 818c3001e8f08948a8733d9d3dd5bbd58d6f7ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 15 Dec 2020 16:58:56 +0100 Subject: [PATCH 12/13] knot-dns: 3.0.2 -> 3.0.3 https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.3 --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 9eb3fc4e74c..ee37ae1f0bf 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -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" ]; From a8d2b7b42e89a0c47b2b66d99ee86dd78bb4ae2c Mon Sep 17 00:00:00 2001 From: Severyn Lisovskyi Date: Tue, 15 Dec 2020 17:50:46 +0100 Subject: [PATCH 13/13] hstr: add darwin support (#106798) --- pkgs/applications/misc/hstr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 421d02e97b9..c58f87d1ab8 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -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; }; }