aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-01 00:43:37 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-01 00:47:05 +0200
commit3345e58db4e8364a9561dc3d488da2438aca982a (patch)
tree28bf8d3b62d2d4d8969ed08f6f174db026b24db3 /nixops/modules
parent7ac9bef4930a10101f02cbfdc4c75351e98553d6 (diff)
downloadNix-3345e58db4e8364a9561dc3d488da2438aca982a.tar.gz
Nix-3345e58db4e8364a9561dc3d488da2438aca982a.tar.zst
Nix-3345e58db4e8364a9561dc3d488da2438aca982a.zip
Temporarily fix diaspora package
Upgrade from 18.09 to 19.03 broke because of change at https://github.com/NixOS/nixpkgs/pull/51842 This partially reverts the change, which permits to build again diaspora using the latest pkgs version. Related issue: https://git.immae.eu/mantisbt/view.php?id=131
Diffstat (limited to 'nixops/modules')
-rw-r--r--nixops/modules/websites/tools/diaspora/default.nix4
-rw-r--r--nixops/modules/websites/tools/diaspora/diaspora.nix5
2 files changed, 6 insertions, 3 deletions
diff --git a/nixops/modules/websites/tools/diaspora/default.nix b/nixops/modules/websites/tools/diaspora/default.nix
index 7a2af97..b1cb6f2 100644
--- a/nixops/modules/websites/tools/diaspora/default.nix
+++ b/nixops/modules/websites/tools/diaspora/default.nix
@@ -1,6 +1,6 @@
1{ lib, pkgs, pkgsPrevious, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, mylibs, ... }:
2let 2let
3 diaspora = pkgsPrevious.callPackage ./diaspora.nix { 3 diaspora = pkgs.callPackage ./diaspora.nix {
4 inherit (mylibs) fetchedGithub; 4 inherit (mylibs) fetchedGithub;
5 env = myconfig.env.tools.diaspora; 5 env = myconfig.env.tools.diaspora;
6 }; 6 };
diff --git a/nixops/modules/websites/tools/diaspora/diaspora.nix b/nixops/modules/websites/tools/diaspora/diaspora.nix
index 616c5cc..a57c529 100644
--- a/nixops/modules/websites/tools/diaspora/diaspora.nix
+++ b/nixops/modules/websites/tools/diaspora/diaspora.nix
@@ -15,7 +15,10 @@ let
15 }); 15 });
16 gems = bundlerEnv { 16 gems = bundlerEnv {
17 name = "diaspora-env"; 17 name = "diaspora-env";
18 ruby = ruby_2_4; 18 # https://git.immae.eu/mantisbt/view.php?id=131
19 ruby = ruby_2_4.overrideAttrs(old: {
20 postInstall = builtins.replaceStrings [" --destdir $GEM_HOME"] [""] old.postInstall;
21 });
19 gemfile = "${diaspora}/Gemfile"; 22 gemfile = "${diaspora}/Gemfile";
20 lockfile = "${diaspora}/Gemfile.lock"; 23 lockfile = "${diaspora}/Gemfile.lock";
21 gemset = ./gemset.nix; 24 gemset = ./gemset.nix;