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

Commits on Nov 17, 2019

  1. wallutils: 5.8.2 -> 5.8.3

    @primeos
    primeos committed Nov 17, 2019
    Copy the full SHA
    f62e1c4 View commit details

  2. quiterss: 0.19.0 -> 0.19.1

    @primeos
    primeos committed Nov 17, 2019
    Copy the full SHA
    f5670eb View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/newsreaders/quiterss/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "quiterss";
version = "0.19.0";
version = "0.19.1";

src = fetchFromGitHub {
owner = "QuiteRSS";
repo = "quiterss";
rev = version;
sha256 = "1czz8n21f4iaazvkq37m867bqy40sdkj44bqggfjcw49pl60kvjn";
sha256 = "0zr17r33g99ylvb1avcbixg2jiwisaks4x91lywv2dy3g6dkpxml";
};

nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
4 changes: 2 additions & 2 deletions pkgs/tools/graphics/wallutils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

buildGoPackage rec {
pname = "wallutils";
version = "5.8.2";
version = "5.8.3";

src = fetchFromGitHub {
owner = "xyproto";
repo = "wallutils";
rev = version;
sha256 = "1ghvcxsy5prj8l38r4lg39imsqbwmvn1zmiv7004j6skmgpaaawh";
sha256 = "1cc0bb6bdh3pm9mf6rcgk9myr62xhqc6l84xgw44lhm6hkkp16gb";
};

goPackagePath = "github.com/xyproto/wallutils";
29 changes: 15 additions & 14 deletions ...ools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
From 9d064428cec970ced9be6753d6250b20a45a9fe2 Mon Sep 17 00:00:00 2001
From 2643b06889605e6096174fb48dcb64a49b252217 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 19 Apr 2019 11:56:50 +0200
Date: Sun, 17 Nov 2019 20:30:08 +0100
Subject: [PATCH] lscollection: Add NixOS paths to DefaultWallpaperDirectories

---
collections.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
collections.go | 3 +++
1 file changed, 3 insertions(+)

diff --git a/collections.go b/collections.go
index ef74ea6..9f9a608 100644
index be04d41..cc79c56 100644
--- a/collections.go
+++ b/collections.go
@@ -21,7 +21,7 @@ const (
)
@@ -22,6 +22,9 @@ const (

var (
- DefaultWallpaperDirectories = []string{"/usr/share/pixmaps", "/usr/share/wallpapers", "/usr/share/backgrounds", "/usr/local/share/pixmaps", "/usr/local/share/wallpapers", "/usr/local/share/backgrounds", "/usr/share/archlinux"}
+ DefaultWallpaperDirectories = []string{"/run/current-system/sw/share/pixmaps", "/run/current-system/sw/share/wallpapers", "/run/current-system/sw/share/backgrounds", "/usr/share/pixmaps", "/usr/share/wallpapers", "/usr/share/backgrounds", "/usr/local/share/pixmaps", "/usr/local/share/wallpapers", "/usr/local/share/backgrounds", "/usr/share/archlinux"}
)

type SearchResults struct {
// DefaultWallpaperDirectories lists the default locations to look for wallpapers
var DefaultWallpaperDirectories = []string{
+ "/run/current-system/sw/share/pixmaps",
+ "/run/current-system/sw/share/wallpapers",
+ "/run/current-system/sw/share/backgrounds",
"/usr/share/pixmaps",
"/usr/share/wallpapers",
"/usr/share/backgrounds",
--
2.19.2
2.23.0