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: 710945cc34a6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cd06d23ccb02
Choose a head ref

Commits on Nov 11, 2017

  1. Copy the full SHA
    c06f3ca View commit details
  2. Copy the full SHA
    eeaf53d View commit details
  3. baresip: 0.5.1 -> 0.5.6

    7c6f434c committed Nov 11, 2017
    Copy the full SHA
    99a3e13 View commit details
  4. Copy the full SHA
    1867de6 View commit details
  5. pari: 2.9.1 -> 2.9.3

    7c6f434c committed Nov 11, 2017
    Copy the full SHA
    563b08c View commit details
  6. Copy the full SHA
    59b00f8 View commit details
  7. golly: 2.8 -> 3.1

    7c6f434c committed Nov 11, 2017
    Copy the full SHA
    eaaaebe View commit details
  8. Copy the full SHA
    2093a37 View commit details
  9. Copy the full SHA
    88788e7 View commit details
  10. gtdialog: 1.3 -> 1.4

    7c6f434c committed Nov 11, 2017
    Copy the full SHA
    61a9f69 View commit details
  11. ipmiutil: 3.0.5 -> 3.0.7

    7c6f434c committed Nov 11, 2017
    Copy the full SHA
    2f974a2 View commit details
  12. fuseki: 2.5.0 -> 3.5.0

    7c6f434c committed Nov 11, 2017
    Copy the full SHA
    ebd0740 View commit details
  13. apache-jena: 3.2.0 -> 3.5.0

    7c6f434c committed Nov 11, 2017
    Copy the full SHA
    052f456 View commit details
  14. getmail: 4.54.0 -> 5.4

    7c6f434c committed Nov 11, 2017
    Copy the full SHA
    29dc669 View commit details
  15. xscreensaver: 5.36 -> 5.37

    7c6f434c committed Nov 11, 2017
    Copy the full SHA
    6b9b8b1 View commit details
  16. nilfs-utils: 2.2.6 -> 2.2.7

    7c6f434c committed Nov 11, 2017
    Copy the full SHA
    2d2d87d View commit details
  17. dd_rescue: 1.99.5 -> 1.99.7

    7c6f434c committed Nov 11, 2017
    Copy the full SHA
    fcd66ca View commit details
  18. luarocks: 2.4.2 -> 2.4.3

    7c6f434c committed Nov 11, 2017
    Copy the full SHA
    84f8ba8 View commit details
  19. Copy the full SHA
    af0212c View commit details
  20. glusterfs: drop .upstream file, as the source archive has to be inspe…

    …cted manually (not just the known commands from the build output)
    7c6f434c committed Nov 11, 2017
    Copy the full SHA
    254701d View commit details
  21. asdf: 3.2.0 -> 3.3.0

    7c6f434c committed Nov 11, 2017
    Copy the full SHA
    cd06d23 View commit details
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
}:
stdenv.mkDerivation rec {
version = "0.5.1";
version = "0.5.6";
name = "baresip-${version}";
src=fetchurl {
url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
sha256 = "0yi80gi2vb600n7wi6mk81zfdi1n5pg1dsz7458sb3z5cv5gj8yg";
sha256 = "036hvl652zndqj3kmkv8z9pv7r4d1jxq8b7rg8jf0hh82vpyz38l";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [zlib openssl libre librem
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ pSub ];
platforms = with platforms; linux;
updateWalker = true;
downloadPage = "http://mcabber.com/files/";
downloadURLRegexp = "mcabber-[0-9.]+[.]tar[.][a-z0-9]+$";
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/science/math/pari/default.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {

name = "pari-${version}";
version = "2.9.1";
version = "2.9.3";

src = fetchurl {
url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
sha256 = "0rq7wz9df1xs4acdzzb5dapx8vs6m5py39n2wynw2qv4d2b0ylfw";
sha256 = "0qqal1lpggd6dvs19svnz0dil86xk0xkcj5s3b7104ibkmvjfsp7";
};

buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ];
4 changes: 2 additions & 2 deletions pkgs/applications/science/math/pari/unstable.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, gmp, readline, perl }:

stdenv.mkDerivation rec {
version = "2.8.1.beta";
version = "2.9.3";
name = "pari-unstable-${version}";

src = fetchurl {
url = "http://pari.math.u-bordeaux.fr/pub/pari/unstable/pari-${version}.tar.gz";
sha256 = "167dcqrqsblqrd7z5pb8jrs9xqm8138mik0s4ihlqcq6c3wndhv1";
sha256 = "0qqal1lpggd6dvs19svnz0dil86xk0xkcj5s3b7104ibkmvjfsp7";
};

buildInputs = [gmp readline];
27 changes: 10 additions & 17 deletions pkgs/applications/science/misc/golly/default.nix
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
{stdenv, fetchurl, wxGTK, perl, python2, zlib, mesa, libX11}:
let
s = # Generated upstream information
rec {
baseName="golly";
version="2.8";
name="${baseName}-${version}";
hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
url="mirror://sourceforge/project/golly/golly/golly-2.8/golly-2.8-src.tar.gz";
sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
stdenv.mkDerivation rec {
baseName="golly";
version = "3.1";
name="${baseName}-${version}";

src = fetchurl {
sha256 = "0dn74k3rylhx023n047lz4z6qrqijfcxi0b6jryqklhmm2n532f7";
url="mirror://sourceforge/project/golly/golly/golly-${version}/golly-${version}-src.tar.gz";
};

buildInputs = [
wxGTK perl python2 zlib mesa libX11
];
in
stdenv.mkDerivation rec {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};

setSourceRoot = ''
sourceRoot=$(echo */gui-wx/configure)
@@ -37,7 +30,7 @@ stdenv.mkDerivation rec {
'';

meta = {
inherit (s) version;
inherit version;
description = "Cellular automata simulation program";
license = stdenv.lib.licenses.gpl2;
maintainers = [stdenv.lib.maintainers.raskin];
6 changes: 0 additions & 6 deletions pkgs/data/fonts/anonymous-pro/default.upstream

This file was deleted.

7 changes: 0 additions & 7 deletions pkgs/data/fonts/cm-unicode/default.upstream

This file was deleted.

4 changes: 2 additions & 2 deletions pkgs/development/libraries/botan/2.0.upstream
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
url http://botan.randombit.net/download.html
version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$'
url https://botan.randombit.net/
version_link 'Botan-[0-9]+([.][0-9]+)*[.](tgz|tbz|tbz2|tar[.]bz2)$'
ensure_version
attribute_name botan2
do_overwrite(){
8 changes: 4 additions & 4 deletions pkgs/development/libraries/gtdialog/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="gtdialog";
version="1.3";
version="1.4";
name="${baseName}-${version}";
hash="0y7sln877940bpj0s38cs5s97xg8csnaihh18lmnchf7c2kkbxpq";
url="http://foicica.com/gtdialog/download/gtdialog_1.3.zip";
sha256="0y7sln877940bpj0s38cs5s97xg8csnaihh18lmnchf7c2kkbxpq";
hash="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk";
url="http://foicica.com/gtdialog/download/gtdialog_1.4.zip";
sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
1 change: 0 additions & 1 deletion pkgs/development/libraries/libatomic_ops/default.upstream

This file was deleted.

9 changes: 0 additions & 9 deletions pkgs/development/libraries/libgphoto2/default.upstream

This file was deleted.

8 changes: 4 additions & 4 deletions pkgs/development/lisp-modules/asdf/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="asdf";
version="3.2.0";
version="3.3.0";
name="${baseName}-${version}";
hash="0ns4hh5f0anfgvy4q68wsylgwfin82kb1k2p53h29cf8jiil0p9a";
url="http://common-lisp.net/project/asdf/archives/asdf-3.2.0.tar.gz";
sha256="0ns4hh5f0anfgvy4q68wsylgwfin82kb1k2p53h29cf8jiil0p9a";
hash="16qphj2ilds4plzr36jbnrxxl5s21q53m9vasv3208gb5wjwcnv8";
url="http://common-lisp.net/project/asdf/archives/asdf-3.3.0.tar.gz";
sha256="16qphj2ilds4plzr36jbnrxxl5s21q53m9vasv3208gb5wjwcnv8";
};
buildInputs = [
texinfo texLive perl
Original file line number Diff line number Diff line change
@@ -264,7 +264,7 @@ parasitic systems will be tracked."
(source-file (asdf:system-source-file asdf-system)))
(cond
(source-file
(loop :for system-name :being :the :hash-keys :of asdf/find-system:*defined-systems* :do
(loop :for system-name :being :the :hash-keys :of asdf/find-system::*registered-systems* :do
(when (and (parasitic-relationship-p system system-name)
(not (blacklisted-parasite-p system-name)))
(found-new-parasite system-name)
8 changes: 4 additions & 4 deletions pkgs/development/tools/misc/luarocks/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="luarocks";
version="2.4.2";
version="2.4.3";
name="${baseName}-${version}";
hash="1rfjfjgnafjxs1zrd1gy0ga5lw28sf5lrdmgzgh6bcp1hd2w67hf";
url="http://luarocks.org/releases/luarocks-2.4.2.tar.gz";
sha256="1rfjfjgnafjxs1zrd1gy0ga5lw28sf5lrdmgzgh6bcp1hd2w67hf";
hash="0binkd8mpzdzvx0jw0dwm4kr1p7jny015zykf8f15fymzqr4shad";
url="http://luarocks.org/releases/luarocks-2.4.3.tar.gz";
sha256="0binkd8mpzdzvx0jw0dwm4kr1p7jny015zykf8f15fymzqr4shad";
};
buildInputs = [
lua curl makeWrapper which unzip
4 changes: 2 additions & 2 deletions pkgs/games/sgt-puzzles/default.nix
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
name = "sgt-puzzles-r${version}";
version = "20170228.1f613ba";
version = "20171029.69773d8";

src = fetchurl {
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
sha256 = "02nqc18fhvxr545wgk55ly61fi0a06q61ljzwadprqxa1n0g0fz5";
sha256 = "0m1gaa802jyih9hcwpvb05zrzprgj6akafgvbsnq321s0sqzaxf0";
};

nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ];
4 changes: 2 additions & 2 deletions pkgs/misc/screensavers/xscreensaver/default.nix
Original file line number Diff line number Diff line change
@@ -5,12 +5,12 @@
}:

stdenv.mkDerivation rec {
version = "5.36";
version = "5.37";
name = "xscreensaver-${version}";

src = fetchurl {
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
sha256 = "0v60mdhvv42jla5hljp77igng11kxpah5fs9j7ci65kz0hw552vb";
sha256 = "1ng5ddzb4k2h1w54pvk9hzxvnxxmc54bc4a2ibk974nzjjjaxivs";
};

buildInputs =
4 changes: 2 additions & 2 deletions pkgs/servers/nosql/apache-jena/binary.nix
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@ let
s = # Generated upstream information
rec {
baseName="apache-jena";
version = "3.2.0";
version = "3.5.0";
name="${baseName}-${version}";
url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz";
sha256 = "0n15mx8lnamkf3a1wlgx5slh6615m14wclv8fzkbb1xqq001c3j4";
sha256 = "08hfn359l9s4lckba9xgghkn32r12gqzjjr5s5hn3fzkbsig7njy";
};
buildInputs = [
makeWrapper
4 changes: 2 additions & 2 deletions pkgs/servers/nosql/apache-jena/fuseki-binary.nix
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@ let
s = # Generated upstream information
rec {
baseName="apache-jena-fuseki";
version = "2.5.0";
version = "3.5.0";
name="${baseName}-${version}";
url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
sha256 = "0qkdpifv30138y7d6vj0dksk4fbgcnwl26dqm89q0d66sc0czfbv";
sha256 = "0pdq103vqpkbwi84yyigw4dy60ch7xzazaj3gfcbipg73v81wpvp";
};
buildInputs = [
makeWrapper
5 changes: 0 additions & 5 deletions pkgs/tools/filesystems/glusterfs/default.upstream

This file was deleted.

4 changes: 2 additions & 2 deletions pkgs/tools/filesystems/nilfs-utils/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, libuuid, libselinux }:
let
sourceInfo = rec {
version = "2.2.6";
version = "2.2.7";
url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2";
sha256 = "1rjj6pv7yx5wm7b3w6hv88v6r53jqaam5nrnkw2and4ifhsprf3y";
sha256 = "01f09bvjk2crx65pxmxiw362wkkl3v2v144dfn3i7bk5gz253xic";
baseName = "nilfs-utils";
name = "${baseName}-${version}";
};
4 changes: 2 additions & 2 deletions pkgs/tools/networking/getmail/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, python2Packages }:

python2Packages.buildPythonApplication rec {
version = "4.54.0";
version = "5.4";
name = "getmail-${version}";
namePrefix = "";

src = fetchurl {
url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
sha256 = "0r9s91zrdm6xklnj1fwzz74cxhkbmrgrrp86n62qgijkafa5fmnl";
sha256 = "1iwss9z94p165gxr2yw7s9q12a0bn71fcdbikzkykr5s7xxnz2ds";
};

doCheck = false;
4 changes: 2 additions & 2 deletions pkgs/tools/system/dd_rescue/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoconf }:

stdenv.mkDerivation rec {
version = "1.99.5";
version = "1.99.7";
name = "dd_rescue-${version}";

src = fetchurl {
sha256 = "0db94piwcdyqhnlhgfs0bfp0gp2mqyrcr2l5nljapgni31qk4p8j";
sha256 = "0d318i1i5d7hbj06wmb3xag14x542cv7fpkh5zjf5ccm64nyzir4";
url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2";
};

4 changes: 2 additions & 2 deletions pkgs/tools/system/ipmiutil/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

stdenv.mkDerivation rec {
baseName = "ipmiutil";
version = "3.0.5";
version = "3.0.7";
name = "${baseName}-${version}";

src = fetchurl {
url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
sha256 = "0ppfxh04c0aj9dxpkzj3xv1kylc17k1kvqabp8r7h70k6ljzgmxj";
sha256 = "0bsl4czbwmz1f42b15y0fabys50bbfll4z73nm9xk161i2njzz6y";
};

buildInputs = [ openssl ];