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: 92e700d29718
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: 9deeaa225b5c
Choose a head ref
  • 8 commits
  • 2 files changed
  • 6 contributors

Commits on Nov 28, 2018

  1. libtiff: 4.0.9 -> 2018-11-04 

    This includes a bunch of security fixes (#49786), and mimics what Debian
has done in moving to a git snapshot instead of a released version +
backported security patches.

(cherry picked from commit 3137c60)
    @andrew-d @Ekleog
    andrew-d authored and Ekleog committed Nov 28, 2018
    Copy the full SHA
    76fc36f View commit details

  2. libtiff: 2018-11-04 -> 4.0.10 

    (cherry picked from commit ac3b358)
    @andrew-d @Ekleog
    andrew-d authored and Ekleog committed Nov 28, 2018
    Copy the full SHA
    6ea49f6 View commit details

  3. mtools: add license 

    (cherry picked from commit 4f83467)
    @markuskowa @samueldr
    markuskowa authored and samueldr committed Nov 28, 2018
    Copy the full SHA
    9be0cb1 View commit details

  4. mtools: 4.0.18 -> 4.0.19 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mtools/versions

(cherry picked from commit aee3689)
    @r-ryantm @samueldr
    r-ryantm authored and samueldr committed Nov 28, 2018
    Copy the full SHA
    75c1a76 View commit details

  5. mtools: 4.0.19 -> 4.0.20 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mtools/versions

(cherry picked from commit 4f99f26)
    @r-ryantm @samueldr
    r-ryantm authored and samueldr committed Nov 28, 2018
    Copy the full SHA
    a58cdb9 View commit details

  6. mtools: fix darwin build 

    (cherry picked from commit 47a239a)
    @Mic92 @samueldr
    Mic92 authored and samueldr committed Nov 28, 2018
    Copy the full SHA
    20cdb37 View commit details

  7. mtools: 4.0.20 -> 4.0.21 

    * mtools: 4.0.20 -> 4.0.21 (#50993)

https://lists.gnu.org/archive/html/info-mtools/2018-11/msg00009.html

* mtools: homepage is https-capable

(cherry picked from commit 51b526d)
    @dtzWill @samueldr
    dtzWill authored and samueldr committed Nov 28, 2018
    Copy the full SHA
    84f7a5e View commit details

  8. Merge pull request #51159 from samueldr/18.09/mtools-4.0.21 

    [18.09] mtools 4.0.18 -> 4.0.21
    @samueldr
    samueldr authored Nov 28, 2018
    Copy the full SHA
    9deeaa2 View commit details
Showing with 17 additions and 25 deletions.
  1. +11 −17 pkgs/development/libraries/libtiff/default.nix
  2. +6 −8 pkgs/tools/filesystems/mtools/default.nix
28 changes: 11 additions & 17 deletions pkgs/development/libraries/libtiff/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }:
{ stdenv
, fetchurl

, pkgconfig

, zlib
, libjpeg
, xz
}:

let
version = "4.0.9";
in
stdenv.mkDerivation rec {
version = "4.0.10";
name = "libtiff-${version}";

src = fetchurl {
url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
sha256 = "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf";
sha256 = "1r4np635gr6zlc0bic38dzvxia6iqzcrary4n1ylarzpr8fd2lic";
};

prePatch = let
debian = fetchurl {
# When the URL disappears, it typically means that Debian has new patches
# (probably security) and updating to new tarball will apply them as well.
url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-6.debian.tar.xz;
sha256 = "10yk5npchxscgsnd7ihd3bbbw2fxkl7ni0plm43c9q4nwp6ms52f";
};
in ''
tar xf ${debian}
patches="$patches $(sed 's|^|debian/patches/|' < debian/patches/series)"
'';

outputs = [ "bin" "dev" "out" "man" "doc" ];

nativeBuildInputs = [ pkgconfig ];
14 changes: 6 additions & 8 deletions pkgs/tools/filesystems/mtools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "mtools-4.0.18";
name = "mtools-4.0.21";

src = fetchurl {
url = "mirror://gnu/mtools/${name}.tar.bz2";
sha256 = "119gdfnsxc6hzicnsf718k0fxgy2q14pxn7557rc96aki20czsar";
sha256 = "1kybydx74qgbwpnjvjn49msf8zipchl43d4cq8zzwcyvfkdzw7h2";
};

# Prevents errors such as "mainloop.c:89:15: error: expected ')'"
# Upstream issue https://lists.gnu.org/archive/html/info-mtools/2014-02/msg00000.html
patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;

# fails to find X on darwin
configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x";

doCheck = true;

meta = {
homepage = http://www.gnu.org/software/mtools/;
meta = with stdenv.lib; {
homepage = https://www.gnu.org/software/mtools/;
description = "Utilities to access MS-DOS disks";
platforms = stdenv.lib.platforms.unix;
maintainers = [ ];
platforms = platforms.unix;
license = licenses.gpl3;
};
}