NixOS · Aug 26, 2019 · Aug 26, 2019 · Aug 26, 2019 · Aug 26, 2019 · Aug 26, 2019
diff --git a/doc/languages-frameworks/crystal.section.md b/doc/languages-frameworks/crystal.section.md
@@ -0,0 +1,71 @@
+# Crystal
+
+## Building a Crystal package
+
+This section uses [Mint](https://github.com/mint-lang/mint) as an example for how to build a Crystal package.
+
+If the Crystal project has any dependencies, the first step is to get a `shards.nix` file encoding those. Get a copy of the project and go to its root directory such that its `shard.lock` file is in the current directory, then run `crystal2nix` in it
+```bash
+$ git clone https://github.com/mint-lang/mint
+$ cd mint
+$ git checkout 0.5.0
+$ nix-shell -p crystal2nix --run crystal2nix
+```
+
+This should have generated a `shards.nix` file.
+
+Next create a Nix file for your derivation and use `pkgs.crystal.buildCrystalPackage` as follows:
+```nix
+with import <nixpkgs> {};
+crystal.buildCrystalPackage rec {
+  pname = "mint";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "mint-lang";
+    repo = "mint";
+    rev = version;
+    sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl";
+  };
+
+  # Insert the path to your shards.nix file here
+  shardsFile = ./shards.nix;
+
+  ...
+}
+```
+
+This won't build anything yet, because we haven't told it what files build. We can specify a mapping from binary names to source files with the `crystalBinaries` attribute. The project's compilation instructions should show this. For Mint, the binary is called "mint", which is compiled from the source file `src/mint.cr`, so we'll specify this as follows:
+
+```nix
+  crystalBinaries.mint.src = "src/mint.cr";
+
+  # ...
+```
+
+Additionally you can override the default `crystal build` options (which are currently `--release --progress --no-debug --verbose`) with
+
+```nix
+  crystalBinaries.mint.options = [ "--release" "--verbose" ];
+```
+
+Depending on the project, you might need additional steps to get it to compile successfully. In Mint's case, we need to link against openssl, so in the end the Nix file looks as follows:
+
+```nix
+with import <nixpkgs> {};
+crystal.buildCrystalPackage rec {
+  version = "0.5.0";
+  pname = "mint";
+  src = fetchFromGitHub {
+    owner = "mint-lang";
+    repo = "mint";
+    rev = version;
+    sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl";
+  };
+
+  shardsFile = ./shards.nix;
+  crystalBinaries.mint.src = "src/mint.cr";
+
+  buildInputs = [ openssl_1_0_2 ];
+}
+```
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
@@ -32,4 +32,5 @@
  <xi:include href="titanium.section.xml" />
  <xi:include href="vim.section.xml" />
  <xi:include href="emscripten.section.xml" />
+ <xi:include href="crystal.section.xml" />
 </chapter>
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
@@ -98,7 +98,7 @@ in
           if [ "$TERM" != "dumb" -o -n "$INSIDE_EMACS" ]; then
             PROMPT_COLOR="1;31m"
             let $UID && PROMPT_COLOR="1;32m"
-            if [ -n "$INSIDE_EMACS" ]; then
+            if [ -n "$INSIDE_EMACS" -o "$TERM" == "eterm" -o "$TERM" == "eterm-color" ]; then
               # Emacs term mode doesn't support xterm title escape sequence (\e]0;)
               PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
             else

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
diff --git a/pkgs/applications/altcoins/aeon/default.nix → ...applications/blockchains/aeon/default.nix b/pkgs/applications/altcoins/aeon/default.nix → ...applications/blockchains/aeon/default.nix
diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix → .../applications/blockchains/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix → .../applications/blockchains/bitcoin-abc.nix
diff --git a/...applications/altcoins/bitcoin-classic.nix → ...lications/blockchains/bitcoin-classic.nix b/...applications/altcoins/bitcoin-classic.nix → ...lications/blockchains/bitcoin-classic.nix
diff --git a/...plications/altcoins/bitcoin-unlimited.nix → ...cations/blockchains/bitcoin-unlimited.nix b/...plications/altcoins/bitcoin-unlimited.nix → ...cations/blockchains/bitcoin-unlimited.nix
diff --git a/pkgs/applications/altcoins/bitcoin.nix → pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix → pkgs/applications/blockchains/bitcoin.nix
diff --git a/pkgs/applications/altcoins/btc1.nix → pkgs/applications/blockchains/btc1.nix b/pkgs/applications/altcoins/btc1.nix → pkgs/applications/blockchains/btc1.nix
diff --git a/pkgs/applications/altcoins/clightning.nix → pkgs/applications/blockchains/clightning.nix b/pkgs/applications/altcoins/clightning.nix → pkgs/applications/blockchains/clightning.nix
diff --git a/...applications/altcoins/cryptop/default.nix → ...lications/blockchains/cryptop/default.nix b/...applications/altcoins/cryptop/default.nix → ...lications/blockchains/cryptop/default.nix
diff --git a/pkgs/applications/altcoins/dashpay.nix → pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/altcoins/dashpay.nix → pkgs/applications/blockchains/dashpay.nix
diff --git a/pkgs/applications/altcoins/dcrd.nix → pkgs/applications/blockchains/dcrd.nix b/pkgs/applications/altcoins/dcrd.nix → pkgs/applications/blockchains/dcrd.nix
diff --git a/pkgs/applications/altcoins/dcrwallet.nix → pkgs/applications/blockchains/dcrwallet.nix b/pkgs/applications/altcoins/dcrwallet.nix → pkgs/applications/blockchains/dcrwallet.nix
diff --git a/pkgs/applications/altcoins/dero.nix → pkgs/applications/blockchains/dero.nix b/pkgs/applications/altcoins/dero.nix → pkgs/applications/blockchains/dero.nix
diff --git a/pkgs/applications/altcoins/dogecoin.nix → pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix → pkgs/applications/blockchains/dogecoin.nix
diff --git a/pkgs/applications/altcoins/ethabi.nix → pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix → pkgs/applications/blockchains/ethabi.nix
diff --git a/.../applications/altcoins/exodus/default.nix → ...plications/blockchains/exodus/default.nix b/.../applications/altcoins/exodus/default.nix → ...plications/blockchains/exodus/default.nix
diff --git a/...tions/altcoins/fix-bitcoin-qt-build.patch → ...ns/blockchains/fix-bitcoin-qt-build.patch b/...tions/altcoins/fix-bitcoin-qt-build.patch → ...ns/blockchains/fix-bitcoin-qt-build.patch
diff --git a/pkgs/applications/altcoins/freicoin.nix → pkgs/applications/blockchains/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix → pkgs/applications/blockchains/freicoin.nix
diff --git a/.../altcoins/go-ethereum-classic/default.nix → ...ockchains/go-ethereum-classic/default.nix b/.../altcoins/go-ethereum-classic/default.nix → ...ockchains/go-ethereum-classic/default.nix
diff --git a/...ons/altcoins/go-ethereum-classic/deps.nix → .../blockchains/go-ethereum-classic/deps.nix b/...ons/altcoins/go-ethereum-classic/deps.nix → .../blockchains/go-ethereum-classic/deps.nix
diff --git a/pkgs/applications/altcoins/go-ethereum.nix → .../applications/blockchains/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix → .../applications/blockchains/go-ethereum.nix
diff --git a/...ications/altcoins/jormungandr/default.nix → ...tions/blockchains/jormungandr/default.nix b/...ications/altcoins/jormungandr/default.nix → ...tions/blockchains/jormungandr/default.nix
diff --git a/.../altcoins/ledger-live-desktop/default.nix → ...ockchains/ledger-live-desktop/default.nix b/.../altcoins/ledger-live-desktop/default.nix → ...ockchains/ledger-live-desktop/default.nix
diff --git a/pkgs/applications/altcoins/litecoin.nix → pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix → pkgs/applications/blockchains/litecoin.nix
diff --git a/pkgs/applications/altcoins/lnd.nix → pkgs/applications/blockchains/lnd.nix b/pkgs/applications/altcoins/lnd.nix → pkgs/applications/blockchains/lnd.nix
diff --git a/pkgs/applications/altcoins/masari.nix → pkgs/applications/blockchains/masari.nix b/pkgs/applications/altcoins/masari.nix → pkgs/applications/blockchains/masari.nix
diff --git a/pkgs/applications/altcoins/mist.nix → pkgs/applications/blockchains/mist.nix b/pkgs/applications/altcoins/mist.nix → pkgs/applications/blockchains/mist.nix
diff --git a/...lications/altcoins/monero-gui/default.nix → ...ations/blockchains/monero-gui/default.nix b/...lications/altcoins/monero-gui/default.nix → ...ations/blockchains/monero-gui/default.nix
diff --git a/...s/altcoins/monero-gui/move-log-file.patch → ...lockchains/monero-gui/move-log-file.patch b/...s/altcoins/monero-gui/move-log-file.patch → ...lockchains/monero-gui/move-log-file.patch
diff --git a/.../applications/altcoins/monero/default.nix → ...plications/blockchains/monero/default.nix b/.../applications/altcoins/monero/default.nix → ...plications/blockchains/monero/default.nix
diff --git a/pkgs/applications/altcoins/namecoin.nix → pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix → pkgs/applications/blockchains/namecoin.nix
diff --git a/...altcoins/nano-wallet/CMakeLists.txt.patch → ...ckchains/nano-wallet/CMakeLists.txt.patch b/...altcoins/nano-wallet/CMakeLists.txt.patch → ...ckchains/nano-wallet/CMakeLists.txt.patch
diff --git a/...ications/altcoins/nano-wallet/default.nix → ...tions/blockchains/nano-wallet/default.nix b/...ications/altcoins/nano-wallet/default.nix → ...tions/blockchains/nano-wallet/default.nix
diff --git a/...plications/altcoins/parity-ui/default.nix → ...cations/blockchains/parity-ui/default.nix b/...plications/altcoins/parity-ui/default.nix → ...cations/blockchains/parity-ui/default.nix
diff --git a/pkgs/applications/altcoins/parity-ui/env.nix → ...pplications/blockchains/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix → ...pplications/blockchains/parity-ui/env.nix
diff --git a/pkgs/applications/altcoins/parity/beta.nix → .../applications/blockchains/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix → .../applications/blockchains/parity/beta.nix
diff --git a/.../applications/altcoins/parity/default.nix → ...plications/blockchains/parity/default.nix b/.../applications/altcoins/parity/default.nix → ...plications/blockchains/parity/default.nix
diff --git a/pkgs/applications/altcoins/parity/parity.nix → ...pplications/blockchains/parity/parity.nix b/pkgs/applications/altcoins/parity/parity.nix → ...pplications/blockchains/parity/parity.nix
diff --git a/...cations/altcoins/particl/particl-core.nix → ...ions/blockchains/particl/particl-core.nix b/...cations/altcoins/particl/particl-core.nix → ...ions/blockchains/particl/particl-core.nix
diff --git a/pkgs/applications/altcoins/pivx.nix → pkgs/applications/blockchains/pivx.nix b/pkgs/applications/altcoins/pivx.nix → pkgs/applications/blockchains/pivx.nix
diff --git a/...pplications/altcoins/polkadot/default.nix → ...ications/blockchains/polkadot/default.nix b/...pplications/altcoins/polkadot/default.nix → ...ications/blockchains/polkadot/default.nix
diff --git a/...altcoins/stellar-core-dirty-version.patch → ...ckchains/stellar-core-dirty-version.patch b/...altcoins/stellar-core-dirty-version.patch → ...ckchains/stellar-core-dirty-version.patch
diff --git a/pkgs/applications/altcoins/stellar-core.nix → ...applications/blockchains/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix → ...applications/blockchains/stellar-core.nix
diff --git a/pkgs/applications/altcoins/sumokoin.nix → pkgs/applications/blockchains/sumokoin.nix b/pkgs/applications/altcoins/sumokoin.nix → pkgs/applications/blockchains/sumokoin.nix
diff --git a/...cations/altcoins/wasabiwallet/default.nix → ...ions/blockchains/wasabiwallet/default.nix b/...cations/altcoins/wasabiwallet/default.nix → ...ions/blockchains/wasabiwallet/default.nix
diff --git a/pkgs/applications/altcoins/wownero.nix → pkgs/applications/blockchains/wownero.nix b/pkgs/applications/altcoins/wownero.nix → pkgs/applications/blockchains/wownero.nix
diff --git a/pkgs/applications/altcoins/zcash/default.nix → ...pplications/blockchains/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix → ...pplications/blockchains/zcash/default.nix
diff --git a/...s/altcoins/zcash/librustzcash/default.nix → ...lockchains/zcash/librustzcash/default.nix b/...s/altcoins/zcash/librustzcash/default.nix → ...lockchains/zcash/librustzcash/default.nix
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -131,6 +131,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
         irony = super.irony.overrideAttrs (old: {
           cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ];
+          NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR";
           preConfigure = ''
             cd server
           '';
@@ -144,6 +145,9 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             make check
             cd ../..
           '';
+          preFixup = ''
+            rm -rf $out/share/emacs/site-lisp/elpa/*/server
+          '';
           dontUseCmakeBuildDir = true;
           doCheck = true;
           packageRequires = [ self.emacs ];

diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rsClock";
-  version = "0.1.0";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "valebes";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1fpidswkgpf9yr4vxqn38livz6r3z5i0lhg7ngj9f1ki4yqxn9zh";
+    sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2";
   };
 
-  cargoSha256 = "1m0lm8xh1qp0cbx870xy2m0bv047mb00vcwzq7r5gxqx8n61qm4n";
+  cargoSha256 = "0zg5q2p9snpfyxl0gx87ix1f46afrfm5jq0m6c7s8qw2x9hpvxzr";
 
   meta = with stdenv.lib; {
     description = "A simple terminal clock written in Rust";

diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix
@@ -0,0 +1,53 @@
+{ stdenv, lib, crystal, linkFarm, fetchFromGitHub }:
+{ # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root
+  shardsFile ? null
+  # Specify binaries to build in the form { foo.src = "src/foo.cr"; }
+  # The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; }
+, crystalBinaries ? {}
+, ...
+}@args:
+let
+  mkDerivationArgs = builtins.removeAttrs args [ "shardsFile" "crystalBinaries" ];
+
+  crystalLib = linkFarm "crystal-lib" (lib.mapAttrsToList (name: value: {
+    inherit name;
+    path = fetchFromGitHub value;
+  }) (import shardsFile));
+
+  defaultOptions = [ "--release" "--progress" "--no-debug" "--verbose" ];
+
+in stdenv.mkDerivation (mkDerivationArgs // {
+
+  configurePhase = args.configurePhase or ''
+    runHook preConfigure
+    ${lib.optionalString (shardsFile != null) "ln -s ${crystalLib} lib"}
+    runHook postConfigure
+  '';
+
+  buildInputs = args.buildInputs or [] ++ [ crystal ];
+
+  buildPhase = args.buildPhase or ''
+    runHook preBuild
+    ${lib.concatStringsSep "\n" (lib.mapAttrsToList (bin: attrs: ''
+      crystal ${lib.escapeShellArgs ([
+        "build"
+        "-o" bin
+        (attrs.src or (throw "No source file for crystal binary ${bin} provided"))
+      ] ++ attrs.options or defaultOptions)}
+    '') crystalBinaries)}
+    runHook postBuild
+  '';
+
+  installPhase = args.installPhase or ''
+    runHook preInstall
+    mkdir -p "$out/bin"
+    ${lib.concatMapStringsSep "\n" (bin: ''
+      mv ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]}
+    '') (lib.attrNames crystalBinaries)}
+    runHook postInstall
+  '';
+
+  meta = args.meta or {} // {
+    platforms = args.meta.platforms or crystal.meta.platforms;
+  };
+})
diff --git a/...development/compilers/mint/crystal2nix.cr → ...elopment/compilers/crystal/crystal2nix.cr b/...development/compilers/mint/crystal2nix.cr → ...elopment/compilers/crystal/crystal2nix.cr
@@ -26,7 +26,7 @@ File.open "shards.nix", "w+" do |file|
 
     sha256 = ""
     args = ["--url", url, "--rev", rev]
-    Process.run("nix-prefetch-git", args: args) do |x|
+    Process.run("@nixPrefetchGit@", args: args) do |x|
       x.error.each_line { |e| puts e }
       sha256 = PrefetchJSON.from_json(x.output).sha256
     end

diff --git a/pkgs/development/compilers/crystal/crystal2nix.nix b/pkgs/development/compilers/crystal/crystal2nix.nix
@@ -0,0 +1,16 @@
+{ lib, crystal, nix-prefetch-git }:
+crystal.buildCrystalPackage {
+  pname = "crystal2nix";
+  version = "unstable-2018-07-31";
+
+  nixPrefetchGit = "${lib.getBin nix-prefetch-git}/bin/nix-prefetch-git";
+  unpackPhase = "substituteAll ${./crystal2nix.cr} crystal2nix.cr";
+
+  crystalBinaries.crystal2nix.src = "crystal2nix.cr";
+
+  meta = with lib; {
+    description = "Utility to convert Crystal's shard.lock files to a Nix file";
+    license = licenses.mit;
+    maintainers = [ maintainers.manveru ];
+  };
+}
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
-, coreutils, git, gmp, nettools, openssl, readline, tzdata, libxml2, libyaml
-, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib }:
+, coreutils, git, gmp, nettools, openssl_1_0_2, readline, tzdata, libxml2, libyaml
+, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib
+, callPackage }:
 
 # We need multiple binaries as a given binary isn't always able to build
 # (even slightly) older or newer versions.
@@ -19,7 +20,7 @@ let
 
   arch = archs."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
-  checkInputs = [ git gmp openssl readline libxml2 libyaml ];
+  checkInputs = [ git gmp openssl_1_0_2 readline libxml2 libyaml ];
 
   genericBinary = { version, sha256s, rel ? 1 }:
   stdenv.mkDerivation rec {
@@ -37,7 +38,7 @@ let
   };
 
   generic = { version, sha256, binary, doCheck ? true }:
-  stdenv.mkDerivation rec {
+  let compiler = stdenv.mkDerivation rec {
     pname = "crystal";
     inherit doCheck version;
 
@@ -72,7 +73,7 @@ let
 
     buildInputs = [
       boehmgc libatomic_ops pcre libevent libyaml
-      llvm zlib openssl
+      llvm zlib openssl_1_0_2
     ] ++ stdenv.lib.optionals stdenv.isDarwin [
       libiconv
     ];
@@ -134,14 +135,18 @@ let
       export PATH=${lib.makeBinPath checkInputs}:$PATH
     '';
 
+    passthru.buildCrystalPackage = callPackage ./build-package.nix {
+      crystal = compiler;
+    };
+
     meta = with lib; {
       description = "A compiled language with Ruby like syntax and type inference";
       homepage = https://crystal-lang.org/;
       license = licenses.asl20;
       maintainers = with maintainers; [ manveru david50407 peterhoeg ];
       platforms = builtins.attrNames archs;
     };
-  };
+  }; in compiler;
 
 in rec {
   binaryCrystal_0_26 = genericBinary {
@@ -207,4 +212,6 @@ in rec {
   };
 
   crystal = crystal_0_30;
+
+  crystal2nix = callPackage ./crystal2nix.nix {};
 }