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: 0cfa467f8771
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: b1d87641a158
Choose a head ref
  • 10 commits
  • 5 files changed
  • 4 contributors

Commits on Jul 7, 2020

  1. gitlab: 12.10.13 -> 12.10.14 

    Security release: https://about.gitlab.com/releases/2020/07/06/critical-security-release-gitlab-13-1-3-released/
    Milan Pässler committed Jul 7, 2020
    Copy the full SHA
    6be3886 View commit details

Commits on Jul 8, 2020

  1. Merge pull request #92637 from petabyteboy/feature/gitlab-12-10-14 

    [20.03] gitlab: 12.10.13 -> 12.10.14
    @flokli
    flokli authored Jul 8, 2020
    Copy the full SHA
    d57d32e View commit details

  2. tl-expected: init at 2019-11-11 

    This version is 5 commits ahead of version 1.0.0 because we need at
least one patch [0] that prevents CMake from trying to use Git to fetch
the already fetched submodule...
Also some files have the wrong formatting (CRLF line endings) which
makes the patching really messy. At this point is seems therefore better
to use the master version instead (1.0.0 is pretty broken regarding
CMake).

[0]: TartanLlama/expected@0ca73ee

(cherry picked from commit 818628c)
    @primeos @flokli
    primeos authored and flokli committed Jul 8, 2020
    Copy the full SHA
    abd69cc View commit details

  3. tdesktop: 1.9.9 -> 1.9.12 

    Note: I skipped the packaging of mapbox-variant for now.
(cherry picked from commit d0729f8)
    @primeos @flokli
    primeos authored and flokli committed Jul 8, 2020
    Copy the full SHA
    6a32251 View commit details

  4. tdesktop: 1.9.12 -> 1.9.13 

    (cherry picked from commit a59a557)
    @primeos @flokli
    primeos authored and flokli committed Jul 8, 2020
    Copy the full SHA
    46c4d88 View commit details

  5. tdesktop: 1.9.13 -> 1.9.14 

    (cherry picked from commit 4af086a)
    @primeos @flokli
    primeos authored and flokli committed Jul 8, 2020
    Copy the full SHA
    1cad1b1 View commit details

  6. tdesktop: 1.9.14 -> 1.9.21 (#82806) 

    (cherry picked from commit 2b25d0e)
    @primeos @flokli
    primeos authored and flokli committed Jul 8, 2020
    Copy the full SHA
    a666ff9 View commit details

  7. tdesktop: 1.9.21 -> 2.0.1 (#83790) 

    * tdesktop: 1.9.21 -> 2.0.0
* tdesktop: 2.0.0 -> 2.0.1

(cherry picked from commit 606baf0)
    @primeos @flokli
    primeos authored and flokli committed Jul 8, 2020
    Copy the full SHA
    4b210eb View commit details

  8. tdesktop: 2.0.1 -> 2.1.0 

    (cherry picked from commit 0339990)
    @primeos @flokli
    primeos authored and flokli committed Jul 8, 2020
    Copy the full SHA
    5d68f77 View commit details

  9. Merge pull request #92744 from flokli/20.03-tdesktop 

    tdesktop: 1.9.9 -> 2.1.0
    @grahamc
    grahamc authored Jul 8, 2020
    Copy the full SHA
    b1d8764 View commit details
24 changes: 11 additions & 13 deletions pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{ mkDerivation, lib, fetchurl, fetchsvn
, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
, qtbase, qtimageformats, gtk3, libappindicator-gtk3, enchant2, lz4, xxHash
, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash
, dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
, tl-expected, microsoft_gsl, hunspell
# TODO: Shouldn't be required:
, pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
, xdg_utils
@@ -18,17 +19,15 @@ with lib;

mkDerivation rec {
pname = "telegram-desktop";
version = "1.9.9";
version = "2.1.0";

# Telegram-Desktop with submodules
src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
sha256 = "08bxlqiapj9yqj9ywni33n5k7n3ckgfhv200snjqyqy9waqph1i6";
sha256 = "0l5917w90z9pg1al1hzcycb4yxv03vc88jg958ifl9nlvz1arll6";
};

postPatch = ''
substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
--replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \
--replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"'
substituteInPlace Telegram/CMakeLists.txt \
@@ -42,8 +41,9 @@ mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook ];

buildInputs = [
qtbase qtimageformats gtk3 libappindicator-gtk3 enchant2 lz4 xxHash
qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash
dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3
tl-expected microsoft_gsl hunspell
# TODO: Shouldn't be required:
pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst
];
@@ -55,12 +55,9 @@ mkDerivation rec {
# TODO: Officiall API credentials for Nixpkgs
# (see: https://github.com/NixOS/nixpkgs/issues/55271):
"-DTDESKTOP_API_TEST=ON"
"-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF"
"-DDESKTOP_APP_USE_PACKAGED=ON"
"-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF"
"-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON"
"-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF"
"-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON"
"-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON"
"-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF"
#"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""'
"-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default
@@ -80,6 +77,7 @@ mkDerivation rec {
# - upstream: https://github.com/grishka/libtgvoip
# Both of these packages are included in this PR (kotatogram-desktop):
# https://github.com/NixOS/nixpkgs/pull/75210
# TODO: Package mapbox-variant

postFixup = ''
# This is necessary to run Telegram in a pure environment.
@@ -88,8 +86,7 @@ mkDerivation rec {
"''${gappsWrapperArgs[@]}" \
"''${qtWrapperArgs[@]}" \
--prefix PATH : ${xdg_utils}/bin \
--set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" \
--unset QT_QPA_PLATFORMTHEME # From the Arch wrapper
--set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
sed -i $out/bin/telegram-desktop \
-e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","
'';
@@ -102,7 +99,8 @@ mkDerivation rec {
'';
license = licenses.gpl3;
platforms = platforms.linux;
homepage = https://desktop.telegram.org/;
homepage = "https://desktop.telegram.org/";
changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v{version}";
maintainers = with maintainers; [ primeos abbradar ];
};
}
8 changes: 4 additions & 4 deletions pkgs/applications/version-management/gitlab/data.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"version": "12.10.13",
"repo_hash": "0smhx2v5l9ya4j3xq66w9m4jbd72k74f6j67k6nrw7862pl251gc",
"version": "12.10.14",
"repo_hash": "1h3h5irmanaxizw66dw87ahrnzpfs3g4s9gxlsypbkdnzbi1rfsm",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v12.10.13-ee",
"rev": "v12.10.14-ee",
"passthru": {
"GITALY_SERVER_VERSION": "12.10.13",
"GITALY_SERVER_VERSION": "12.10.14",
"GITLAB_PAGES_VERSION": "1.17.0",
"GITLAB_SHELL_VERSION": "12.2.0",
"GITLAB_WORKHORSE_VERSION": "8.30.3"
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/gitaly/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,14 +19,14 @@ let
};
};
in buildGoPackage rec {
version = "12.10.13";
version = "12.10.14";
pname = "gitaly";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "0x6zlj468l5fmq1r7hb2sr2z9dy8pr0apnpmbf28ivap942a10dx";
sha256 = "0v2ikj4vvlgj2cpp4m5di9kw63nsc3p9hgjfacvzr7nj3ar2pwqa";
};

# Fix a check which assumes that hook files are writeable by their
24 changes: 24 additions & 0 deletions pkgs/development/libraries/tl-expected/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ stdenv, fetchFromGitHub, cmake }:

stdenv.mkDerivation rec {
pname = "tl-expected-unstable";
version = "2019-11-11"; # 5 commits ahead of version 1.0.0

src = fetchFromGitHub {
owner = "TartanLlama";
repo = "expected";
rev = "1d9c5d8c0da84b8ddc54bd3d90d632eec95c1f13";
fetchSubmodules = true;
sha256 = "0rzfn9yyg70zwpxbmv22qy0015baymi2rdd65ixmcb31fgnap68i";
};

nativeBuildInputs = [ cmake ];

meta = with stdenv.lib; {
description = "C++11/14/17 std::expected with functional-style extensions";
homepage = https://tl.tartanllama.xyz/en/latest/api/expected.html;
license = licenses.cc0;
platforms = platforms.all;
maintainers = with maintainers; [ primeos ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -14542,6 +14542,8 @@ in
tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { };
tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; };

tl-expected = callPackage ../development/libraries/tl-expected { };

tnt = callPackage ../development/libraries/tnt { };

tntnet = callPackage ../development/libraries/tntnet { };