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: 2cf477f28da9
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: 44fe29a624e6
Choose a head ref
  • 5 commits
  • 4 files changed
  • 5 contributors

Commits on Dec 10, 2019

  1. php74: Enable zip support 

    This fixes #75427
    @etu
    etu committed Dec 10, 2019
    Copy the full SHA
    9d71e7f View commit details

Commits on Dec 11, 2019

  1. mbedtls_1_3: clarify deprecation message

    @c0bw3b
    c0bw3b authored Dec 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a8df1b1 View commit details

  2. samba: 4.10.10 -> 4.10.11 (#75456) 

    Security fix: CVE-2019-14861, CVE-2019-14870

This update is only a security fix. See
https://www.samba.org/samba/history/samba-4.10.11.html
    @wamserma @c0bw3b
    wamserma authored and c0bw3b committed Dec 11, 2019
    Copy the full SHA
    7e93638 View commit details

  3. Merge pull request #75444 from etu/php74-zip 

    php74: Enable zip support
    @aanderse
    aanderse authored Dec 11, 2019
    Copy the full SHA
    2891726 View commit details

  4. clojure: 1.10.1.489 -> 1.10.1.492 

    Install again default deps.edn. deps.edn was embedded in clojure jar,
but that change was reverted, see
clojure/brew-install@a349695

Update derivation to produce only one output. Multiple outputs was
introduced by #35140, but I don't think is necessary anymore.
    @jlesquembre @bendlas
    jlesquembre authored and bendlas committed Dec 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    44fe29a View commit details
Showing with 19 additions and 18 deletions.
  1. +15 −15 pkgs/development/interpreters/clojure/default.nix
  2. +1 −0 pkgs/development/interpreters/php/default.nix
  3. +2 −2 pkgs/servers/samba/4.x.nix
  4. +1 −1 pkgs/top-level/aliases.nix
30 changes: 15 additions & 15 deletions pkgs/development/interpreters/clojure/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,30 +2,30 @@

stdenv.mkDerivation rec {
pname = "clojure";
version = "1.10.1.489";
version = "1.10.1.492";

src = fetchurl {
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "12ks7adh5cx99l5vydppkqknk5nvv9vsj2k0afcwwxd897m794kz";
sha256 = "09mhy5xw9kdr10a1xpbn5v97qyyhngw5s1n1alrs45a4m3l11iky";
};

buildInputs = [ makeWrapper ];

outputs = [ "out" "prefix" ];

installPhase = let
binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ];
in ''
mkdir -p $prefix/libexec
cp clojure-tools-${version}.jar $prefix/libexec
cp example-deps.edn $prefix
substituteInPlace clojure --replace PREFIX $prefix
install -Dt $out/bin clj clojure
wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}
wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
'';
in
''
mkdir -p $out/libexec
cp clojure-tools-${version}.jar $out/libexec
cp example-deps.edn $out
cp deps.edn $out
substituteInPlace clojure --replace PREFIX $out
install -Dt $out/bin clj clojure
wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}
wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
'';

meta = with stdenv.lib; {
description = "A Lisp dialect for the JVM";
1 change: 1 addition & 0 deletions pkgs/development/interpreters/php/default.nix
View file
Original file line number Diff line number Diff line change
@@ -182,6 +182,7 @@ let
++ optional mcryptSupport "--with-mcrypt=${libmcrypt'}"
++ optional bz2Support "--with-bz2=${bzip2.dev}"
++ optional (zipSupport && (versionOlder version "7.4")) "--enable-zip"
++ optional (zipSupport && (versionAtLeast version "7.4")) "--with-zip"
++ optional ftpSupport "--enable-ftp"
++ optional fpmSupport "--enable-fpm"
++ optional ztsSupport "--enable-maintainer-zts"
4 changes: 2 additions & 2 deletions pkgs/servers/samba/4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@ with lib;

stdenv.mkDerivation rec {
pname = "samba";
version = "4.10.10";
version = "4.10.11";

src = fetchurl {
url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
sha256 = "19b653rr2i9snvapik58phbqj38cxjdlyx6nl3m2y3k1a55p633h";
sha256 = "157qvz8x2s7994rzxhcmpc79cfk86zc0rq5qwg8alvjcw0r457v0";
};

outputs = [ "out" "dev" "man" ];
2 changes: 1 addition & 1 deletion pkgs/top-level/aliases.nix
View file
Original file line number Diff line number Diff line change
@@ -234,7 +234,7 @@ mapAliases ({
man_db = man-db; # added 2016-05
manpages = man-pages; # added 2015-12-06
mariadb-client = hiPrio mariadb.client; #added 2019.07.28
mbedtls_1_3 = throw "End of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08
mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08
mess = mame; # added 2019-10-30
mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10
mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10