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: 2dd325307977
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eb2a26f5c61e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 11, 2019

  1. wlroots: 0.4.1 -> 0.5.0

    @primeos
    primeos committed Mar 11, 2019
    Copy the full SHA
    7f43089 View commit details

  2. sway-beta: 1.0-rc5 -> 1.0

    @primeos
    primeos committed Mar 11, 2019
    Copy the full SHA
    eb2a26f View commit details
Showing with 14 additions and 6 deletions.
  1. +12 −4 pkgs/applications/window-managers/sway/beta.nix
  2. +2 −2 pkgs/development/libraries/wlroots/default.nix
16 changes: 12 additions & 4 deletions pkgs/applications/window-managers/sway/beta.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub
{ stdenv, fetchFromGitHub, fetchpatch
, meson, ninja
, pkgconfig, scdoc
, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
@@ -10,17 +10,25 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "sway";
version = "1.0-rc5";
version = "1.0";

src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = version;
sha256 = "1jkacibmxy9rpq5mxnq7bkwcy0c592zk4vf20j5qbbljp9h7c87i";
sha256 = "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx";
};

# TODO: The following patch introduced a compiler warning which leads to a
# build failure (we'll revert it for now as this patch is not supposed to
# change any functionality):
patch-remove-unused-functions = fetchpatch {
url = "https://github.com/swaywm/sway/commit/2b70e8518b7327d29eec4f9593e9b8f4238cebfe.patch";
sha256 = "1bq1i8dzxwckahzna6s9swvhpj1c1ics14pc1f1jcxwya50lk1rz";
};

postPatch = ''
sed -iE "s/version: '1.0',/version: '${version}',/" meson.build
patch -p1 --reverse < ${patch-remove-unused-functions}
'';

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/development/libraries/wlroots/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,15 +6,15 @@

let
pname = "wlroots";
version = "0.4.1";
version = "0.5.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchFromGitHub {
owner = "swaywm";
repo = "wlroots";
rev = version;
sha256 = "1624gasx8k0yy649d65ih4hs290szyxzd3bl0kg1l6njnhlxnr6b";
sha256 = "1phiidyddzgaxy4gbqwmykxn0y8za6y5mp66l9dpd9i6fml153yq";
};

# $out for the library, $bin for rootston, and $examples for the example