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: ad246fb87458
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: 629fe7b14503
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 28, 2020

  1. linux: 4.19.147 -> 4.19.148

    @NeQuissimus
    NeQuissimus committed Sep 28, 2020
    Copy the full SHA
    c9fb177 View commit details

  2. linux: 5.4.67 -> 5.4.68

    @NeQuissimus
    NeQuissimus committed Sep 28, 2020
    Copy the full SHA
    f646148 View commit details

  3. roundcube: 1.4.8 -> 1.4.9 

    https://github.com/roundcube/roundcubemail/releases/tag/1.4.9
(cherry picked from commit f09ae7e)
(cherry picked from commit f8bd03c)
    @Ma27 @asbachb
    Ma27 authored and asbachb committed Sep 28, 2020
    Copy the full SHA
    6b80a3d View commit details

Commits on Sep 29, 2020

  1. Merge pull request #99048 from asbachb/update/roundcube-20.03 

    [20.03] roundcube: 1.4.8 -> 1.4.9
    @Ma27
    Ma27 authored Sep 29, 2020
    Copy the full SHA
    629fe7b View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/os-specific/linux/kernel/linux-4.19.nix
  2. +2 −2 pkgs/os-specific/linux/kernel/linux-5.4.nix
  3. +2 −2 pkgs/servers/roundcube/default.nix
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.19.147";
version = "4.19.148";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "19nnx61v7c0102ik1rjan0kdsj8av8v7iqz5vm3v3kjllmjmvr2x";
sha256 = "0nsmcfyi6drlihj8i8knby4hl93120sx2dfybx4lwvffjd5cf21k";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.4.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.4.67";
version = "5.4.68";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "196avi0950qrd0lxdpdsl6lxa51f20sz476mcl1i5islbnfbsxf1";
sha256 = "1pfn7i75wfkhhlqfs7s6yw6bj0mb8qd9fcg6rdahrp78b9n8g4qf";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/servers/roundcube/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "roundcube";
version = "1.4.8";
version = "1.4.9";

src = fetchurl {
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
sha256 = "0jkas28k7px95sm3zix86ggraxc9vyy66271sgpr2wrmbg2r056r";
sha256 = "1cpcr3abjq1f2af0ca571y976yni48z3rh3x146c6ninl5ip9b4z";
};

patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];