Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6aa0b6161c4c
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5b8a24a40ce1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 15, 2018

  1. Revert "urbit: 0.4.5 -> 0.6.0"

    @timokau
    timokau authored Aug 15, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    adisbladis
    GPG key ID: 110BFAD44C6249B7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2fecd10 View commit details

  2. Merge pull request #45069 from NixOS/revert-45041-fix/urbit-update 

    Revert "urbit: 0.4.5 -> 0.6.0"
    @timokau
    timokau authored Aug 15, 2018
    Copy the full SHA
    5b8a24a View commit details
Showing with 12 additions and 25 deletions.
  1. +12 −25 pkgs/misc/urbit/default.nix
37 changes: 12 additions & 25 deletions pkgs/misc/urbit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,20 @@
{ stdenv, fetchFromGitHub, curl, gcc, gmp, libsigsegv, libtool, libuv, ncurses,
openssl, perl, python2, ragel, re2c, zlib,
pkgconfig, meson, ninja
}:
{ stdenv, fetchFromGitHub, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel,
cmake, re2c, libtool, ncurses, perl, zlib, python2, curl }:

stdenv.mkDerivation rec {
name = "urbit-${version}";
version = "0.6.0";
version = "0.4.5";

src = fetchFromGitHub {
owner = "urbit";
repo = "urbit";
rev = "urbit-${version}";
sha256 = "158mz6c6y5z1b6piid8hvrl5mcqh8q1ny185gz51jayia51azmgs";
fetchSubmodules = true;
rev = "v${version}";
sha256 = "1zgxgqbz74nsgfyrvsnjj6xxpb64mrnby7bb5qy733sy04gmzgik";
};

nativeBuildInputs = [ pkgconfig meson ninja ];
buildInputs = with stdenv.lib; [
curl
gcc
gmp
libsigsegv
libtool
libuv
ncurses
openssl
perl
python2
ragel
re2c
zlib
gcc gmp libsigsegv openssl automake autoconf ragel cmake re2c libtool
ncurses perl zlib python2 curl
];

# uses 'readdir_r' deprecated by glibc 2.24
@@ -40,9 +25,11 @@ stdenv.mkDerivation rec {
'';

buildPhase = ''
mkdir -p "$out/bin"
meson . "$out/bin" --buildtype=release
ninja -C "$out/bin"
sed -i 's/-lcurses/-lncurses/' Makefile
mkdir -p $out
cp -r . $out/
cd $out
make
'';

installPhase = ''