Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 67e45efa3a48
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 142afb8942ee
Choose a head ref
  • 4 commits
  • 5 files changed
  • 3 contributors

Commits on Apr 15, 2020

  1. tig: fix tig-completion's dependency on __git_complete 

    tig recently updated it's bash-completion making it depend on __git-complete from git.
Becase __git-complete is not automatically sourced tig bash completion fails.
Also this PR makes tig completion load on-demand.

(cherry picked from commit f57da8e)
    @basilgood @Ma27
    basilgood authored and Ma27 committed Apr 15, 2020
    Copy the full SHA
    a438aed View commit details

  2. cargo-make: 0.30.4 -> 0.30.5 

    https://github.com/sagiegurari/cargo-make/releases/tag/0.30.5
(cherry picked from commit b7c3c3f)
    @Ma27
    Ma27 committed Apr 15, 2020
    Copy the full SHA
    8c3b765 View commit details

  3. ping: use vala_0_40 

    fails to build otherwise.

(cherry picked from commit 10c0352)
    @worldofpeace
    worldofpeace committed Apr 15, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    GPG key ID: D57EFA625C9A925F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6ca86a0 View commit details

  4. nasc: fix build 

    (cherry picked from commit 433ea74)
    @worldofpeace
    worldofpeace committed Apr 15, 2020
    Copy the full SHA
    142afb8 View commit details
6 changes: 4 additions & 2 deletions pkgs/applications/networking/ping/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,9 @@
, json-glib
, libsoup
, libgee
, wrapGAppsHook }:
, wrapGAppsHook
, vala_0_40
}:

stdenv.mkDerivation rec {
pname = "ping";
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
vala
vala_0_40
pkgconfig
python3
wrapGAppsHook
9 changes: 9 additions & 0 deletions pkgs/applications/science/math/nasc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
, fetchpatch
, pkgconfig
, vala
, gtk3
@@ -25,6 +26,14 @@ stdenv.mkDerivation rec {
sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn";
};

patches = [
# fix build with gcc9
(fetchpatch {
url = "https://github.com/parnold-x/nasc/commit/46b9b80e228b6b86001bded45d85e073a9411549.patch";
sha256 = "1sm2aw0xhw2chk036r231nmp2f2ypxcmzggwljkn7wfzgg3h1mx3";
})
];

nativeBuildInputs = [
cmake
vala
7 changes: 5 additions & 2 deletions pkgs/applications/version-management/git-and-tools/tig/default.nix
View file
Original file line number Diff line number Diff line change
@@ -31,10 +31,13 @@ stdenv.mkDerivation rec {
make install
make install-doc
# fixes tig-completion __git-complete dependency
sed -i '1s;^;source ${git}/share/bash-completion/completions/git\n;' contrib/tig-completion.bash
substituteInPlace contrib/tig-completion.zsh \
--replace 'e=$(dirname ''${funcsourcetrace[1]%:*})/tig-completion.bash' "e=$out/etc/bash_completion.d/tig-completion.bash"
--replace 'e=$(dirname ''${funcsourcetrace[1]%:*})/tig-completion.bash' "e=$out/share/bash-completion/completions/tig"
install -D contrib/tig-completion.bash $out/etc/bash_completion.d/tig-completion.bash
install -D contrib/tig-completion.bash $out/share/bash-completion/completions/tig
install -D contrib/tig-completion.zsh $out/share/zsh/site-functions/_tig
cp contrib/vim.tigrc $out/etc/
74 changes: 62 additions & 12 deletions pkgs/development/tools/rust/cargo-make/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkgs/development/tools/rust/cargo-make/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.30.4";
version = "0.30.5";

src =
let
source = fetchFromGitHub {
owner = "sagiegurari";
repo = pname;
rev = version;
sha256 = "14sl7kcr1n3xb912vd3445pwf3v1kp74lgxlwqybnwiyh1dxihvg";
sha256 = "0p6rzkrwyfcrg4qrlb67rf0wb12kqldl1xg0rfnwc23y17fbwx49";
};
in
runCommand "source" {} ''
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];

cargoSha256 = "0adilcl76mh520zk40vhzi3y6riai73282wzhvjcfaasbcwlr738";
cargoSha256 = "0l3k4k63zx4gbdp5bnamrnhib2pw6z0d1ff06n8v2z7rcrawhlyx";

# Some tests fail because they need network access.
# However, Travis ensures a proper build.