diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-01 02:11:03 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-01 02:11:03 +0200 |
| commit | a4993193703e14c4af10dd0ea84829594a6ee30b (patch) | |
| tree | ad1474a7f748a36de6db73a19cb8bd4ba45ff320 /nixops/scripts | |
| parent | 3345e58db4e8364a9561dc3d488da2438aca982a (diff) | |
| download | Nix-a4993193703e14c4af10dd0ea84829594a6ee30b.tar.gz Nix-a4993193703e14c4af10dd0ea84829594a6ee30b.tar.zst Nix-a4993193703e14c4af10dd0ea84829594a6ee30b.zip | |
Temporarily fix mastodon 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 mastodon
using the latest pkgs version.
Related issue: https://git.immae.eu/mantisbt/view.php?id=131
Diffstat (limited to 'nixops/scripts')
| -rwxr-xr-x | nixops/scripts/nixops_wrap | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap index d6b66bd..bf41e81 100755 --- a/nixops/scripts/nixops_wrap +++ b/nixops/scripts/nixops_wrap | |||
| @@ -29,9 +29,9 @@ done | |||
| 29 | nixops set-args --argstr privateFiles "$TEMP" | 29 | nixops set-args --argstr privateFiles "$TEMP" |
| 30 | 30 | ||
| 31 | # This will automatically upgrade to latest version at each build | 31 | # This will automatically upgrade to latest version at each build |
| 32 | # nixpkgsNext="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz" | 32 | # nixpkgs="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz" |
| 33 | nixpkgsNext="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171840.23fd1394dc6/nixexprs.tar.xz" | 33 | nixpkgs="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171840.23fd1394dc6/nixexprs.tar.xz" |
| 34 | nixpkgsPrevious="https://releases.nixos.org/nixos/18.09/nixos-18.09.1834.9d608a6f592/nixexprs.tar.xz" | 34 | nixpkgsPrevious="$nixpkgs" |
| 35 | nixpkgs="$nixpkgsNext" | 35 | nixpkgsNext="$nixpkgs" |
| 36 | export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious" | 36 | export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious" |
| 37 | nixops "$@" | 37 | nixops "$@" |