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: 8ba41a1e1496
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: b03aaae436e0
Choose a head ref
  • 9 commits
  • 5 files changed
  • 6 contributors

Commits on May 13, 2020

  1. golangci-lint: 1.26.0 -> 1.27.0

    oxzi committed May 13, 2020
    Copy the full SHA
    8a0bcaf View commit details
  2. Copy the full SHA
    f300fb8 View commit details
  3. j: add avxSupport option

    FireyFly committed May 13, 2020
    Copy the full SHA
    20235a8 View commit details
  4. Merge pull request #87546 from FireyFly/pkgs/j/avx-flag

    j: add avxSupport option
    7c6f434c authored May 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b2f83be View commit details
  5. Copy the full SHA
    115b797 View commit details
  6. podman: fix passthru.tests

    zowoq committed May 13, 2020
    Copy the full SHA
    82e0e43 View commit details

Commits on May 14, 2020

  1. Merge pull request #87769 from zowoq/podman

    podman: 1.9.1 -> 1.9.2
    marsam authored May 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    51b5b54 View commit details
  2. Merge pull request #87770 from thefloweringash/sensu-go-update

    sensu-go: 5.18.1 -> 5.20.0
    marsam authored May 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    35de81b View commit details
  3. Merge pull request #87763 from geistesk/golangci-lint-v1.27.0

    golangci-lint: 1.26.0 -> 1.27.0
    marsam authored May 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b03aaae View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/podman/default.nix
Original file line number Diff line number Diff line change
@@ -14,13 +14,13 @@

buildGoPackage rec {
pname = "podman";
version = "1.9.1";
version = "1.9.2";

src = fetchFromGitHub {
owner = "containers";
repo = "libpod";
rev = "v${version}";
sha256 = "0dr5vd52fnjwx3zn2nj2nlvkbvh5bg579nf3qw8swrn8i1jwxd6j";
sha256 = "0jvqzn1q52z6aka98d2i3dyn2i8xld7xvmi2zfxgm9g53wdgi2g2";
};

goPackagePath = "github.com/containers/libpod";
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/podman/wrapper.nix
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ let

in runCommand podman.name {
name = "${podman.pname}-wrapper-${podman.version}";
inherit (podman) pname version;
inherit (podman) pname version passthru;

meta = builtins.removeAttrs podman.meta [ "outputsToInstall" ];

9 changes: 7 additions & 2 deletions pkgs/development/interpreters/j/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{ stdenv, fetchFromGitHub, readline, libedit, bc }:
{ stdenv, fetchFromGitHub, readline, libedit, bc
, avxSupport ? false
}:

stdenv.mkDerivation rec {
pname = "j";
@@ -19,6 +21,9 @@ stdenv.mkDerivation rec {
if stdenv.isLinux then "linux" else
if stdenv.isDarwin then "darwin" else
"unknown";
variant = if stdenv.isx86_64 && avxSupport then "avx" else "";

j64x="j${bits}${variant}";

doCheck = true;

@@ -34,7 +39,7 @@ stdenv.mkDerivation rec {
patchShebangs .
sed -i $JLIB/bin/profile.ijs -e "s@'/usr/share/j/.*'@'$out/share/j'@;"
./build_all.sh
j64x="${j64x}" ./build_all.sh
cp $SOURCE_DIR/bin/${platform}/j${bits}*/* "$JLIB/bin"
'';
6 changes: 3 additions & 3 deletions pkgs/development/tools/golangci-lint/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "golangci-lint";
version = "1.26.0";
version = "1.27.0";

src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
sha256 = "1xw6m4ps6yw8gnkwy8v7rrz2b8c8n72cd7vkpx481dkd36vccpkc";
sha256 = "1capiw8af4wmx3wpfslb30xivfyh72x5kj12f8p5pwhl6id31931";
};

modSha256 = "0xgnimr1jydrgwhbyjaz710kx3m3505nhy5cs10p501qxbnzkjf9";
modSha256 = "0adsy71hl6256v40b5gb00kmqswbgfb1576m6lwak1fcfi07hf6b";
subPackages = [ "cmd/golangci-lint" ];

meta = with lib; {
6 changes: 3 additions & 3 deletions pkgs/servers/monitoring/sensu-go/default.nix
Original file line number Diff line number Diff line change
@@ -4,16 +4,16 @@ let
generic = { subPackages, pname, postInstall ? "" }:
buildGoModule rec {
inherit pname;
version = "5.18.1";
shortRev = "1f6d16b"; # for internal version info
version = "5.20.0";
shortRev = "3a1ac58"; # for internal version info

goPackagePath = "github.com/sensu/sensu-go";

src = fetchFromGitHub {
owner = "sensu";
repo = "sensu-go";
rev = "v${version}";
sha256 = "1iwlkm7ac7brap45r6ly0blywgq6f28r1nws3yf0ybydv30brfj4";
sha256 = "0hnsgd6ryrl1y2prkavm7psqjnppkkfd891xkzbdfzblxsafs8cw";
};

inherit subPackages postInstall;