From a4993193703e14c4af10dd0ea84829594a6ee30b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 1 Apr 2019 02:11:03 +0200 Subject: 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 --- nixops/scripts/nixops_wrap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nixops/scripts') 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 nixops set-args --argstr privateFiles "$TEMP" # This will automatically upgrade to latest version at each build -# nixpkgsNext="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz" -nixpkgsNext="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171840.23fd1394dc6/nixexprs.tar.xz" -nixpkgsPrevious="https://releases.nixos.org/nixos/18.09/nixos-18.09.1834.9d608a6f592/nixexprs.tar.xz" -nixpkgs="$nixpkgsNext" +# nixpkgs="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz" +nixpkgs="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171840.23fd1394dc6/nixexprs.tar.xz" +nixpkgsPrevious="$nixpkgs" +nixpkgsNext="$nixpkgs" export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious" nixops "$@" -- cgit v1.2.3