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

Commits on Jan 24, 2020

  1. uberwriter: add shared-mime-info to environment

    @sternenseemann
    sternenseemann committed Jan 24, 2020
    Copy the full SHA
    97e9a3f View commit details

Commits on Jan 25, 2020

  1. uberwriter: 2019-11-29 -> 2020-01-24

    @sternenseemann
    sternenseemann committed Jan 25, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    03aa58f View commit details

Commits on Jan 28, 2020

  1. Merge pull request #78397 from sternenseemann/uberwriter-bugfix 

    uberwriter: add shared-mime-info to environment and update
    @matthewbauer
    matthewbauer authored Jan 28, 2020
    Copy the full SHA
    fb36553 View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/applications/editors/uberwriter/default.nix
9 changes: 5 additions & 4 deletions pkgs/applications/editors/uberwriter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
, wrapGAppsHook, pkgconfig, desktop-file-utils
, appstream-glib, pythonPackages, glib, gobject-introspection
, gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive
, haskellPackages}:
, shared-mime-info, haskellPackages}:

let
pythonEnv = pythonPackages.python.withPackages(p: with p;
@@ -11,13 +11,13 @@ let

in stdenv.mkDerivation rec {
pname = "uberwriter";
version = "unstable-2019-11-29";
version = "unstable-2020-01-24";

src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "7606a55389f8516d9fed7927fa50ff8822ee9e38";
sha256 = "0ky001vs9nfvqf05h4q7fl0n8vsgim59z22i66a8sw6bqipv62sg";
rev = "0647b413407eb8789a25c353602c4ac979dc342a";
sha256 = "19z52fpbf0p7dzx7q0r5pk3nn0c8z69g1hv6db0cqp61cqv5z95q";
};

nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils
@@ -41,6 +41,7 @@ in stdenv.mkDerivation rec {
--prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/"
--prefix PATH : "${texliveDist}/bin"
--prefix PATH : "${haskellPackages.pandoc-citeproc}/bin"
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
)
'';