Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: da8bd7747d14
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fcf65032d262
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 6, 2020

  1. rainloop: allow multiple instances to use the same package

    @Twey
    Twey committed Sep 6, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    servalcatty
    GPG key ID: 4A2AAAA382F8294C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a9def8d View commit details

Commits on Nov 27, 2020

  1. Merge pull request #97271 from Twey/rainloop-multiple-instances 

    rainloop: allow multiple instances to use the same package
    @SuperSandro2000
    SuperSandro2000 authored Nov 27, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fcf6503 View commit details
Showing with 14 additions and 11 deletions.
  1. +14 −11 pkgs/servers/rainloop/default.nix
25 changes: 14 additions & 11 deletions pkgs/servers/rainloop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,8 @@
*/
function __get_custom_data_full_path()
{
return '${dataPath}'; // custom data folder path
$v = getenv('RAINLOOP_DATA_DIR', TRUE);
return $v === FALSE ? '${dataPath}' : $v;
}
'';

@@ -33,6 +34,8 @@
cp -r rainloop/* $out
rm -rf $out/data
cp ${includeScript} $out/include.php
mkdir $out/data
chmod 700 $out/data
'';

meta = with stdenv.lib; {
@@ -44,13 +47,13 @@
maintainers = with maintainers; [ das_j ];
};
});
in {
rainloop-community = common {
edition = "community";
sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y";
};
rainloop-standard = common {
edition = "";
sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch";
};
}
in {
rainloop-community = common {
edition = "community";
sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y";
};
rainloop-standard = common {
edition = "";
sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch";
};
}