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: 251a5604492e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8b323287f284
Choose a head ref
  • 8 commits
  • 12 files changed
  • 7 contributors

Commits on Oct 31, 2019

  1. rPackages.glmnet: Add missing dependency

    Fixes the error:
        ld: library not found for -liconv
    nkpart committed Oct 31, 2019
    Copy the full SHA
    4d54c9e View commit details

Commits on Nov 7, 2019

  1. Copy the full SHA
    61de713 View commit details

Commits on Nov 11, 2019

  1. Merge pull request #72389 from nkpart/nkpart/fix-rPackages-glmnet

    rPackages.glmnet: Add missing dependency
    peti authored Nov 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1a2415e View commit details
  2. Copy the full SHA
    173bf34 View commit details
  3. Merge pull request #72922 from davidak/fix_versions

    Fix package metadata like version and homepage
    jtojnar authored Nov 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e994fdc View commit details
  4. arrow-cpp: fix on i686-linux

    veprbl committed Nov 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    Copy the full SHA
    03e7849 View commit details
  5. Merge pull request #73203 from veprbl/pr/arrow-cpp_i686

    arrow-cpp: fix on i686-linux
    veprbl authored Nov 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    418f550 View commit details
  6. pypi2nix: 2.0.0 -> 2.0.1

    seppeljordan authored and FRidh committed Nov 11, 2019
    Copy the full SHA
    8b32328 View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/misc/wego/default.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

buildGoPackage rec {
pname = "wego";
version = "20170403-${stdenv.lib.strings.substring 0 7 rev}";
version = "unstable-2017-04-03";
rev = "415efdfab5d5ee68300bf261a0c6f630c6c2584c";

goPackagePath = "github.com/schachmat/wego";
4 changes: 2 additions & 2 deletions pkgs/development/mobile/titaniumenv/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{pkgs, androidenv, xcodeenv, tiVersion ? "7.1.0.GA"}:
{pkgs, androidenv, xcodeenv, tiVersion ? "8.2.1.GA"}:

rec {
titaniumsdk = let
titaniumSdkFile = if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix
titaniumSdkFile = if tiVersion == "8.2.1.GA" then ./titaniumsdk-8.2.nix
else if tiVersion == "7.5.1.GA" then ./titaniumsdk-7.5.nix
else throw "Titanium version not supported: "+tiVersion;
in
Original file line number Diff line number Diff line change
@@ -53,14 +53,14 @@ let
};
in
stdenv.mkDerivation {
name = "mobilesdk-7.1.0.GA";
name = "mobilesdk-8.2.1.GA";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-linux.zip;
sha256 = "18b3jnr65sdn5wj191bcl48gvhyklxmighxakv4vrz1fb59kyvqn";
url = https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-linux.zip;
sha256 = "1nvcmm6cby6bmwdiacq46n5y4zjpz9qlipakvglw27j3p4rbmkwl";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-osx.zip;
sha256 = "1f62616biwsw1fqxz2sq7lpa6bsfjazffliplyf5dpnh298cnc1m";
url = https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-osx.zip;
sha256 = "1nxwmyw3vqc5wghj38kpksisy0i808x0x3pa8w3p290w709g311l";
}
else throw "Platform: ${stdenv.system} not supported!";

@@ -73,7 +73,7 @@ stdenv.mkDerivation {
# Rename ugly version number
cd mobilesdk/*
mv * 7.1.0.GA
mv * 8.2.1.GA
cd *
# Patch bundled gradle build infrastructure to make shebangs work
@@ -87,6 +87,13 @@ stdenv.mkDerivation {
# Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
# Patch the strip frameworks script in the iPhone build template to not let
# it skip the strip phase. This is caused by an assumption on the file
# permissions in which Nix deviates from the standard.
sed -i -e "s|-perm +111|-perm /111|" iphone/templates/build/strip-frameworks.sh
''}
# Patch some executables
${if stdenv.system == "i686-linux" then
1 change: 1 addition & 0 deletions pkgs/development/r-modules/default.nix
Original file line number Diff line number Diff line change
@@ -454,6 +454,7 @@ let
randomForest = [ pkgs.libiconv ];
sundialr = [ pkgs.libiconv ];
ucminf = [ pkgs.libiconv ];
glmnet = [ pkgs.libiconv ];
};

packagesRequireingX = [
5 changes: 3 additions & 2 deletions pkgs/development/tools/pypi2nix/default.nix
Original file line number Diff line number Diff line change
@@ -4,12 +4,13 @@ with python3;

pkgs.buildPythonApplication rec {
pname = "pypi2nix";
version = "2.0.0";
version = "2.0.1";
src = pkgs.fetchPypi {
inherit pname version;
sha256 = "0w9z07kdnfs96230jag8xgz4wx337bb3q3bvqxn3r31x8fsmz6rr";
sha256 = "138fwd3cznkfa6w3a5s4fbflh88q26hk4grlmq73dcbk06ykf84k";
};
checkInputs = with pkgs; [ pytest ];
buildInputs = with pkgs; [ setuptools_scm ];
propagatedBuildInputs = with pkgs; [
attrs
click
4 changes: 2 additions & 2 deletions pkgs/development/tools/wiiload/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoconf, automake, zlib }:
stdenv.mkDerivation rec {
version = "v0.5.1";
version = "0.5.1";
pname = "wiiload";

nativeBuildInputs = [ autoconf automake ];
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "devkitPro";
repo = "wiiload";
rev = version;
rev = "v${version}";
sha256 = "0dffy603zggkqv7g1a2jninmi64vy519gpgkdfhjnijhdm9gs5m3";
};

4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/xf86-input-cmt/default.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
utilmacros, libgestures, libevdevc }:

stdenv.mkDerivation rec {
name = "xf86-input-cmt-${version}";
pname = "xf86-input-cmt";
version = "2.0.2";
src = fetchFromGitHub {
owner = "hugegreenbug";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
description = "Chromebook touchpad driver.";
license = licenses.bsd3;
platforms = platforms.linux;
homepage = "www.github.com/hugegreenbug/xf86-input-cmt";
homepage = "https://www.github.com/hugegreenbug/xf86-input-cmt";
maintainers = with maintainers; [ kcalvinalvin ];
};
}
20 changes: 9 additions & 11 deletions pkgs/tools/misc/venus/default.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{ stdenv, fetchurl, python, pythonPackages, libxslt, libxml2, makeWrapper }:

let
rev = "9de21094a8cf565bdfcf75688e121a5ad1f5397b";
in
{ stdenv, fetchFromGitHub, python, pythonPackages, libxslt, libxml2, makeWrapper }:

stdenv.mkDerivation rec {
name = "venus-${rev}";

src = fetchurl {
url = "https://github.com/rubys/venus/tarball/${rev}";
name = "${name}.tar.bz";
sha256 = "0lsc9d83grbi3iwm8ppaig4h9vbmd5h4vvz83lmpnyp7zqfka7dy";
pname = "venus";
version = "unstable-2011-02-18";

src = fetchFromGitHub {
owner = "rubys";
repo = "venus";
rev = "9de21094a8cf565bdfcf75688e121a5ad1f5397b";
sha256 = "10yyx4jaxxbwhica12aiw119aywghcr7b24gs9lrmafpa6xd3an2";
};

preConfigure = ''
2 changes: 1 addition & 1 deletion pkgs/tools/misc/vimpager/build.nix
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ stdenv.mkDerivation {

meta = with stdenv.lib; {
description = "Use Vim as PAGER";
homepage = "https://www.vim.org/scripts/script.php?script_id = 1723";
homepage = "https://www.vim.org/scripts/script.php?script_id=1723";
license = with licenses; [ bsd2 mit vim ];
platforms = platforms.unix;
};
6 changes: 3 additions & 3 deletions pkgs/tools/system/yeshup/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub }:

stdenv.mkDerivation rec {
name = "yeshup-${builtins.substring 0 7 rev}";
rev = "5461a8f957c686ccd0240be3f0fd8124d7381b08";
pname = "yeshup";
version = "unstable-2013-10-29";

src = fetchFromGitHub {
owner = "RhysU";
repo = "yeshup";
inherit rev;
rev = "5461a8f957c686ccd0240be3f0fd8124d7381b08";
sha256 = "1wwbc158y46jsmdi1lp0m3dlbr9kvzvwxfvzj6646cpy9d6h21v9";
};

6 changes: 4 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -10577,9 +10577,11 @@ in
stdenv = gcc6Stdenv;
};

arrow-cpp = callPackage ../development/libraries/arrow-cpp {
arrow-cpp = callPackage ../development/libraries/arrow-cpp ({
gtest = gtest.override { static = true; };
};
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4'
});

assimp = callPackage ../development/libraries/assimp { };

7 changes: 4 additions & 3 deletions pkgs/top-level/emscripten-packages.nix
Original file line number Diff line number Diff line change
@@ -81,7 +81,8 @@ rec {
});

xmlmirror = pkgs.buildEmscriptenPackage rec {
name = "xmlmirror";
pname = "xmlmirror";
version = "unstable-2016-06-05";

buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ];
nativeBuildInputs = [ pkgconfig zlib ];
@@ -113,7 +114,7 @@ rec {

installPhase = ''
mkdir -p $out/share
mkdir -p $doc/share/${name}
mkdir -p $doc/share/${pname}
cp Demo* $out/share
cp -R codemirror-5.12 $out/share
@@ -124,7 +125,7 @@ rec {
cp *.html $out/share
cp *.json $out/share
cp *.rng $out/share
cp README.md $doc/share/${name}
cp README.md $doc/share/${pname}
'';
checkPhase = ''