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: f03a88e18474
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: fcd7d6ad4189
Choose a head ref
  • 2 commits
  • 5 files changed
  • 2 contributors

Commits on Sep 10, 2019

  1. rstudio: fix build with new hunspell-dicts 

    (cherry picked from commit cd9aec6)
    @lheckemann
    Eamonn Coughlan authored and lheckemann committed Sep 10, 2019
    Copy the full SHA
    ada07de View commit details

  2. skydive: remove it from nixpkgs 

    The current Skydive version can not be build with a recent Go version
and the maintainer (lewo) is no longer interested in maintaining it.

(cherry picked from commit 636e155)
    @nlewo @worldofpeace
    nlewo authored and worldofpeace committed Sep 10, 2019
    Copy the full SHA
    fcd7d6a View commit details
11 changes: 9 additions & 2 deletions pkgs/applications/editors/rstudio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
, llvmPackages
}:

with stdenv.lib;
let
verMajor = "1";
verMinor = "2";
@@ -47,7 +48,13 @@ stdenv.mkDerivation rec {
sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb";
};

hunspellDictionaries = with stdenv.lib; filter isDerivation (unique (attrValues hunspellDicts));
hunspellDictionaries = filter isDerivation (unique (attrValues hunspellDicts));
# These dicts contain identically-named dict files, so we only keep the
# -large versions in case of clashes
largeDicts = filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries;
otherDicts = filter (d: !(hasAttr "dictFileName" d &&
elem d.dictFileName (map (d: d.dictFileName) largeDicts))) hunspellDictionaries;
dictionaries = largeDicts ++ otherDicts;

mathJaxSrc = fetchurl {
url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip;
@@ -77,7 +84,7 @@ stdenv.mkDerivation rec {
mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer}
mkdir dependencies/common/dictionaries
for dict in ${builtins.concatStringsSep " " hunspellDictionaries}; do
for dict in ${builtins.concatStringsSep " " dictionaries}; do
for i in "$dict/share/hunspell/"*; do
ln -sv $i dependencies/common/dictionaries/
done
45 changes: 0 additions & 45 deletions pkgs/tools/networking/skydive/default.nix
View file

This file was deleted.

Loading