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: 95fed28ac372
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: 343abf7730fb
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Mar 5, 2019

  1. python.pkgs.bpython: correct Exec in bpython.desktop 

    (cherry picked from commit b0a9ac7)
    @flokli
    Robert Schütz authored and flokli committed Mar 5, 2019
    Copy the full SHA
    ed8c74e View commit details

  2. linux: 4.9.161 -> 4.9.162 

    (cherry picked from commit cfc1110)
    @NeQuissimus
    NeQuissimus committed Mar 5, 2019
    Copy the full SHA
    95ad0f6 View commit details

  3. linux: 4.14.104 -> 4.14.105 

    (cherry picked from commit 535600b)
    @NeQuissimus
    NeQuissimus committed Mar 5, 2019
    Copy the full SHA
    8fa7a36 View commit details

  4. linux: 4.19.26 -> 4.19.27 

    (cherry picked from commit 5e67bc1)
    @NeQuissimus
    NeQuissimus committed Mar 5, 2019
    Copy the full SHA
    343abf7 View commit details
5 changes: 5 additions & 0 deletions pkgs/development/python-modules/bpython/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,11 @@ buildPythonPackage rec {

propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ];

postInstall = ''
substituteInPlace "$out/share/applications/bpython.desktop" \
--replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython"
'';

checkInputs = [ mock ];

# tests fail: https://github.com/bpython/bpython/issues/712
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.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.14.104";
version = "4.14.105";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "0rz0gg5dhgga58ywaylmvkwz4wlw38z3bxszkdwsb38kclz0whyx";
sha256 = "1sgnccr9aadaaivjnlfzmy6yylc47w7m7yplc07avl74njcdp2rr";
};
} // (args.argsOverride or {}))
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.26";
version = "4.19.27";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "1z27nxyi3asj1fbkgdb3rw3x9jx2wyfyhddw5dpmjfa7r5k5zi5y";
sha256 = "0ibjd1cq5hp22hk4hj546jf8j6d2pxhxx9440p73lc26gksppd81";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.161";
version = "4.9.162";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "19i8igx0pchzd9wgx595alcji8jxl4bpcg5zd33ymyamgq5q67p1";
sha256 = "1mdc1l89kbdzmaxn61hvndanamclykc7vq8wyp6b3qf4vi7g8imr";
};
} // (args.argsOverride or {}))