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: 70717a337f7a
Choose a head ref
  • 5 commits
  • 6 files changed
  • 4 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

  3. nixos/nextcloud: preserve OC_PASS env variable in the occ wrapper 

    The OC_PASS environment variable can be used to create a user with
`occ user:add --password-from-env`. It is currently not possible to
use the `nextcloud-occ` to "non-interactively" create a user since
this variable is ignored by sudo.

(cherry picked from commit cb68231)
    @nlewo
    nlewo committed Jun 8, 2020
    Copy the full SHA
    4340dd7 View commit details

  4. flake.nix: Remove edition field 

    (cherry picked from commit 97fc8af)
    @edolstra
    edolstra committed Jun 8, 2020
    Copy the full SHA
    b119c09 View commit details

  5. nix: 2.3.6 -> 2.3.6 

    (cherry picked from commit aef2bc1)
    @edolstra
    edolstra committed Jun 8, 2020
    Copy the full SHA
    70717a3 View commit details
2 changes: 0 additions & 2 deletions flake.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Experimental flake interface to Nixpkgs.
# See https://github.com/NixOS/rfcs/pull/49 for details.
{
edition = 201909;

description = "A collection of packages for the Nix package manager";

outputs = { self }:
8 changes: 4 additions & 4 deletions nixos/modules/installer/tools/nix-fallback-paths.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
x86_64-linux = "/nix/store/xb0nl3z356n0sfrhswfli2g19a19slys-nix-2.3.5";
i686-linux = "/nix/store/k8kdd4yy1yap6lai5idyhmzcwsjh1fik-nix-2.3.5";
aarch64-linux = "/nix/store/dr86cbipxqjcb8pf2k0v8wvw0h0adfpz-nix-2.3.5";
x86_64-darwin = "/nix/store/n6dqdndkv9kac66kdr988kaiyavl44x8-nix-2.3.5";
x86_64-linux = "/nix/store/j8dbv5w6jl34caywh2ygdy88knx1mdf7-nix-2.3.6";
i686-linux = "/nix/store/9fqvbdisahqp0238vrs7wn5anpri0a65-nix-2.3.6";
aarch64-linux = "/nix/store/72pwn0nm9bjqx9vpi8sgh4bl6g5wh814-nix-2.3.6";
x86_64-darwin = "/nix/store/g37vk77m90p5zcl5nixjlzp3vqpisfn5-nix-2.3.6";
}
2 changes: 1 addition & 1 deletion nixos/modules/services/web-apps/nextcloud.nix
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ let
cd ${cfg.package}
sudo=exec
if [[ "$USER" != nextcloud ]]; then
sudo='exec /run/wrappers/bin/sudo -u nextcloud --preserve-env=NEXTCLOUD_CONFIG_DIR'
sudo='exec /run/wrappers/bin/sudo -u nextcloud --preserve-env=NEXTCLOUD_CONFIG_DIR --preserve-env=OC_PASS'
fi
export NEXTCLOUD_CONFIG_DIR="${cfg.home}/config"
$sudo \
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"
'';
4 changes: 2 additions & 2 deletions pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -178,10 +178,10 @@ in rec {
nix = nixStable;

nixStable = callPackage common (rec {
name = "nix-2.3.5";
name = "nix-2.3.6";
src = fetchurl {
url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "25445353c27d7c2703cd74216bce6458a02068965055d111765ac4186ed678c1";
sha256 = "05e90529c9dc9f4bf656cbceae61cafdca49935bb79cd291c8f078a095701d89";
};

inherit storeDir stateDir confDir boehmgc;