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

Commits on Nov 30, 2018

  1. wlroots: 0.1 -> 0.2

    @primeos
    primeos committed Nov 30, 2018
    2
    Copy the full SHA
    80756cd View commit details

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

    @primeos
    primeos committed Nov 30, 2018
    Copy the full SHA
    9ac03eb View commit details
Showing with 8 additions and 8 deletions.
  1. +2 −2 pkgs/applications/window-managers/sway/beta.nix
  2. +6 −6 pkgs/development/libraries/wlroots/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/window-managers/sway/beta.nix
View file
Original file line number Diff line number Diff line change
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "sway";
version = "1.0-beta.1";
version = "1.0-beta.2";

src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = version;
sha256 = "0h9kgrg9mh2acks63z72bw3lwff32pf2nb4i7i5xhd9i6l4gfnqa";
sha256 = "0f9rniwizbc3vzxdy6rc47749p6gczfbgfdy4r458134rbl551hw";
};

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

let
pname = "wlroots";
version = "0.1";
version = "0.2";
meson480 = meson.overrideAttrs (oldAttrs: rec {
name = pname + "-" + version;
pname = "meson";
@@ -28,13 +28,13 @@ in stdenv.mkDerivation rec {
owner = "swaywm";
repo = "wlroots";
rev = version;
sha256 = "0xfipgg2qh2xcf3a1pzx8pyh1aqpb9rijdyi0as4s6fhgy4w269c";
sha256 = "0gfxawjlb736xl90zfv3n6zzf5n1cacgzflqi1zq1wn7wd3j6ppv";
};

patches = [ (fetchpatch { # TODO: Only required for version 0.1
url = https://github.com/swaywm/wlroots/commit/be6210cf8216c08a91e085dac0ec11d0e34fb217.patch;
sha256 = "0njv7mr4ark603w79cxcsln29galh87vpzsx2dzkrl1x5x4i6cj5";
}) ];
postPatch = ''
substituteInPlace meson.build \
--replace "version: '0.1.0'" "version: '${version}.0'"
'';

# $out for the library, $bin for rootston, and $examples for the example
# programs (in examples) AND rootston