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: b66d6f404ef7
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: b46666a86770
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 30, 2018

  1. tdesktop: 1.3.14 -> 1.4.0 

    tdesktopPackages.preview: 1.3.14 -> 1.4.0
    @primeos
    primeos committed Sep 30, 2018
    Copy the full SHA
    766e322 View commit details

  2. ocamlPackages.odoc: fix resolution of odoc.css

    @vbgl
    vbgl committed Sep 30, 2018
    Copy the full SHA
    b46666a View commit details
Showing with 6 additions and 4 deletions.
  1. +4 −4 pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
  2. +2 −0 pkgs/development/ocaml-modules/odoc/default.nix
8 changes: 4 additions & 4 deletions pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ let
mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
stableVersion = {
stable = true;
version = "1.3.14";
sha256Hash = "107m9iqw78b691pcq65s3m3zhamn8slh0wiyipwbbp0w13rqna3v";
version = "1.4.0";
sha256Hash = "1zlsvbk9vgsqwplcswh2q0mqjdqf5md1043paab02wy3qg2x37d8";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
archPatchesRevision = "359861";
archPatchesHash = "15xybfs9k6dww747if8z6m9sh7anvqi76zsx2gxyna2j1z36i0r0";
archPatchesRevision = "388448";
archPatchesHash = "06a1j7fxg55d3wgab9rnwv93dvwdwkx7mvsxaywwwiz7ng20rgs1";
};
in {
stable = mkTelegram stableVersion;
2 changes: 2 additions & 0 deletions pkgs/development/ocaml-modules/odoc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {

propagatedBuildInputs = [ bos doc-ock-html doc-ock-xml ];

configurePhase = "ocaml bin/set-etc bin/odoc_etc.ml $out/etc/odoc";

inherit (dune) installPhase;

meta = {