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

Commits on Aug 9, 2019

  1. meteor: 1.5 -> 1.8.1

    @flokli
    flokli committed Aug 9, 2019
    Copy the full SHA
    1b94657 View commit details

  2. Merge pull request #66400 from flokli/meteor-1.8.1 

    meteor: 1.5 -> 1.8.1
    @mmahut
    mmahut authored Aug 9, 2019

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    6515fc9 View commit details
Showing with 9 additions and 12 deletions.
  1. +9 −12 pkgs/servers/meteor/default.nix
21 changes: 9 additions & 12 deletions pkgs/servers/meteor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
{ stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }:

let
bootstrap = fetchurl {
url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.5/meteor-bootstrap-os.linux.x86_64.tar.gz";
sha256 = "0cwwqv88h1ji7g4zmfz34xsrxkn640wr11ddjq5c6b9ygcljci3p";
};
version = "1.8.1";
in

stdenv.mkDerivation rec {
name = "meteor-${version}";
version = "1.5";
inherit version;
pname = "meteor";
src = fetchurl {
url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz";
sha256 = "1ql58j2d1pqhzpj7c9a6zrpmxxfmlgx743q7lw7g35vz2mpq34c6";
};

dontStrip = true;
#dontStrip = true;

unpackPhase = ''
tar xf ${bootstrap}
sourceRoot=.meteor
'';
sourceRoot = ".meteor";

installPhase = ''
mkdir $out
@@ -25,7 +23,6 @@ stdenv.mkDerivation rec {
chmod -R +w $out/packages
cp -r package-metadata $out
chmod -R +w $out/package-metadata
devBundle=$(find $out/packages/meteor-tool -name dev_bundle)
ln -s $devBundle $out/dev_bundle