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: 3791a20e9783
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: 1f6e46ff968a
Choose a head ref
  • 8 commits
  • 9 files changed
  • 7 contributors

Commits on Mar 24, 2019

  1. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    32ec718 View commit details

Commits on Mar 25, 2019

  1. Copy the full SHA
    0fa6ebe View commit details
  2. Copy the full SHA
    83cb84e View commit details
  3. Merge pull request #58199 from rnhmjoj/superbuffer

    haskellPackages.superbuffer: fix build
    peti authored Mar 25, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3e113f5 View commit details
  4. tdesktop: 1.6.1 -> 1.6.2

    tdesktopPackages.preview: 1.6.1 -> 1.6.2
    primeos committed Mar 25, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    Copy the full SHA
    abadb74 View commit details
  5. Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    Copy the full SHA
    072adcc View commit details
  6. Merge pull request #58238 from dtzWill/update/youtube-dl-2019.03.18

    youtube-dl: 2019.03.01 -> 2019.03.18
    worldofpeace authored Mar 25, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3cb00c5 View commit details
  7. bazelisk: init at 0.0.3 (#56867)

    elasticdog authored and kalbasit committed Mar 25, 2019
    Copy the full SHA
    1f6e46f View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/networking/gns3/default.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

let
stableVersion = "2.1.15";
previewVersion = "2.2.0a2";
previewVersion = "2.2.0a3";
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
@@ -18,7 +18,7 @@ in {
};
guiPreview = mkGui {
stable = false;
sha256Hash = "1lvdff4yfavfkjmdbhxqfxdd5nq77c2vyy2wnsdliwnmdh3fhm28";
sha256Hash = "110mghkhanz92p8vfzyh4199mnihb24smxsc44a8v534ds6hww74";
};

serverStable = mkServer {
@@ -27,6 +27,6 @@ in {
};
serverPreview = mkServer {
stable = false;
sha256Hash = "033bi1bcw5ss6g380qnam1qqyi4bz1cykbb3lparb8hryikicdb9";
sha256Hash = "104pvrba7n9gp7mx31xg520cfahcy0vsmbzx23007c50kp0nxc56";
};
}
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ let
mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
stableVersion = {
stable = true;
version = "1.6.1";
sha256Hash = "1gy5al5m1hks0z98cya9kkfinh6k1i8a1d97cy7x6gj0jgmgs88k";
version = "1.6.2";
sha256Hash = "1vkcwlr9mmn9ns02has2qb4x1qgx3a9hjh3k5x7k57n3v7k2a7x2";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
archPatchesRevision = "429149";
archPatchesHash = "1ylpi9kb6hk27x9wmna4ing8vzn9b7247iya91pyxxrpxrcrhpli";
8 changes: 8 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
@@ -1218,6 +1218,14 @@ self: super: {
})];
});

# Remove unecessary constraint:
# https://github.com/agrafix/superbuffer/pull/2
superbuffer = overrideCabal super.superbuffer (drv: {
postPatch = ''
sed -i 's#QuickCheck < 2.10#QuickCheck < 2.13#' superbuffer.cabal
'';
});

# Use latest pandoc despite what LTS says.
# Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309.
pandoc = doDistribute super.pandoc_2_7_1;
Original file line number Diff line number Diff line change
@@ -8871,7 +8871,6 @@ broken-packages:
- sunroof-server
- super-user-spark
- superbubbles
- superbuffer
- supercollider-ht
- supercollider-midi
- superconstraints
1 change: 0 additions & 1 deletion pkgs/development/haskell-modules/hackage-packages.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
Original file line number Diff line number Diff line change
@@ -10,11 +10,13 @@ in
{
stumpwm = x:{
overrides = y: (x.overrides y) // {
linkedSystems = [];
preConfigure = ''
export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh";
'';
postInstall = ''
export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm '(function stumpwm:stumpwm)'"
export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm \
'(function stumpwm:stumpwm)' '$linkedSystems'"
"$out/bin/stumpwm-lisp-launcher.sh"
cp "$out/lib/common-lisp/stumpwm/stumpwm" "$out/bin"
22 changes: 22 additions & 0 deletions pkgs/development/tools/bazelisk/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ stdenv, buildGoModule, fetchFromGitHub }:

buildGoModule rec {
pname = "bazelisk";
version = "0.0.3";

src = fetchFromGitHub {
owner = "philwo";
repo = pname;
rev = "v${version}";
sha256 = "1rkpw9izpav3ysb9fpbdf0m1wqrs3vl87s9zjjmfsjm5dfhxss72";
};

modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl";

meta = with stdenv.lib; {
description = "A user-friendly launcher for Bazel";
homepage = https://github.com/philwo/bazelisk;
license = licenses.asl20;
maintainers = with maintainers; [ elasticdog ];
};
}
4 changes: 2 additions & 2 deletions pkgs/tools/misc/youtube-dl/default.nix
Original file line number Diff line number Diff line change
@@ -19,11 +19,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2019.03.01";
version = "2019.03.18";

src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "0bxk6adyppdv50jnp5cika8wc6wfgd6d8zbg1njgmcs1pxskllmf";
sha256 = "0r31q7j3gg2zfw3b45jancxl7mmr2gin8dyfx5dgyyp92ss8hih7";
};

nativeBuildInputs = [ makeWrapper ];
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -8493,6 +8493,8 @@ in

bazel-watcher = callPackage ../development/tools/bazel-watcher { };

bazelisk = callPackage ../development/tools/bazelisk { };

buildBazelPackage = callPackage ../build-support/build-bazel-package { };

bear = callPackage ../development/tools/build-managers/bear { };