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: e2bb73ce5f78
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: b6042f56ab27
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 8, 2020

  1. atlassian-crowd: 3.4.5 -> 4.0.2 

    (cherry picked from commit dc0f741)
    @WilliButz @lheckemann
    WilliButz authored and lheckemann committed Jun 8, 2020
    Copy the full SHA
    82dc55e View commit details

  2. moosefs: fix datapath for mfscgiserv 

    The datapath in mfscgisrv is hardcoded and pointed to
the nix store, which made the program fail on startup.

(cherry picked from commit 69a601c)
    @markuskowa
    markuskowa committed Jun 8, 2020
    Copy the full SHA
    b6042f5 View commit details
Showing with 4 additions and 3 deletions.
  1. +2 −2 pkgs/servers/atlassian/crowd.nix
  2. +2 −1 pkgs/tools/filesystems/moosefs/default.nix
4 changes: 2 additions & 2 deletions pkgs/servers/atlassian/crowd.nix
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
pname = "atlassian-crowd";
version = "3.4.5";
version = "4.0.2";

src = fetchurl {
url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz";
sha256 = "1k72aar68iqiaf0l75i6pp81dpsllqkp69f70hja754hrzvhz8j3";
sha256 = "1ndg9qb406rd239q7xycc2vdh2jd4fh9wryx1fm9493rxlncx28b";
};

phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
3 changes: 2 additions & 1 deletion pkgs/tools/filesystems/moosefs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
, fuse
, pkgconfig
, libpcap
, zlib
, zlib
}:

stdenv.mkDerivation rec {
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
[ fuse libpcap zlib ];

postInstall = ''
substituteInPlace $out/sbin/mfscgiserv --replace "datapath=\"$out" "datapath=\""
wrapProgram $out/sbin/mfscgiserv \
--prefix PATH ":" "${python}/bin"
'';