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: d5053d12eb23
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: 9c691e6fd72f
Choose a head ref
  • 12 commits
  • 8 files changed
  • 8 contributors

Commits on Aug 22, 2019

  1. boost171: init at 1.71.0

    dtzWill committed Aug 22, 2019
    Copy the full SHA
    3a192fb View commit details
  2. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    bf3de12 View commit details

Commits on Sep 3, 2019

  1. boost171: use 'urls' attribute per suggestion (thanks!)

    Co-Authored-By: Jon <jonringer@users.noreply.github.com>
    dtzWill and Jon authored Sep 3, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    b538402 View commit details

Commits on Nov 16, 2019

  1. http-prompt: fix build

    I don't really understand why this works:
    
    - Building with python3 because python2 fails with "error: invalid command
    'bdist_wheel'".
    - Specifying the path to prompt_toolkit v1 because otherwise the dependency
    resolution fails with "ERROR: Could not find a version that satisfies the
    requirement prompt-toolkit<2.0.0,>=1.0.0 (from http-prompt==1.0.0) (from
    versions: none) ERROR: No matching distribution found for
    prompt-toolkit<2.0.0,>=1.0.0 (from http-prompt==1.0.0)".
    ryneeverett committed Nov 16, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    0e283d6 View commit details
  2. Merge pull request #67282 from dtzWill/feature/boost-1.71

    boost171: init at 1.71.0
    dtzWill authored Nov 16, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    44d9a86 View commit details
  3. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    e651f5d View commit details
  4. rfc-bibtex: fix homepage url

    Incorrect schema: "ttps://" -> "https://"
    c0bw3b authored Nov 16, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    1459e57 View commit details
  5. gzrt: fix homepage and src url redirect

    + meta.license is GPL2+
    c0bw3b authored Nov 16, 2019
    Copy the full SHA
    206c264 View commit details
  6. Merge pull request #65427 from dtzWill/update/purple-matrix

    purple-matrix: pname, fix cflags, restore hardening
    Mic92 authored Nov 16, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9d21910 View commit details
  7. Merge pull request #73482 from ryneeverett/fix-http-prompt

    http-prompt: fix build
    Mic92 authored Nov 16, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    c19b3dc View commit details
  8. ledger-live-desktop: 1.15.0 -> 1.18.2

    nyanloutre authored and bjornfor committed Nov 16, 2019
    Copy the full SHA
    25dbbd2 View commit details
  9. discord-canary: 0.0.97 -> 0.0.98

    tadeokondrak authored and bjornfor committed Nov 16, 2019
    Copy the full SHA
    9c691e6 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/blockchains/ledger-live-desktop/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

let
pname = "ledger-live-desktop";
version = "1.15.0";
version = "1.18.2";
name = "${pname}-${version}";

src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
sha256 = "0r7gm7q7gj39v36jd5xz20931za94nf2fpf3clbghkhlbrm0kbnq";
sha256 = "1giy8xg1yfv7b7gh98dmfc05wh54xqpd53nanacwcc7lakzizqnn";
};

appimageContents = appimageTools.extractType2 {
Original file line number Diff line number Diff line change
@@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
version = "0.0.97";
version = "0.0.98";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "17kwgk2kwrfqgjqmfv055gvlqq144gz7bywwrs6i2x7mimz4345x";
sha256 = "0raqsfakjbcsh7g280yi7sg2jsrmy2q4jldg73wb868z35radld4";
};
};
}.${branch}
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } :
{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } :

let
version = "2018-08-03";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "purple-matrix-unstable";
inherit version;
version = "2019-06-06";

src = fetchgit {
url = "https://github.com/matrix-org/purple-matrix";
rev = "5a7166a3f54f85793c6b60662f8d12196aeaaeb0";
sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "purple-matrix";
rev = "4494ba22b479917f0b1f96a3019792d3d75bcff1";
sha256 = "1gjm0z4wa5vi9x1xk43rany5pffrwg958n180ahdj9a7sa8a4hpm";
};

# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = [
# glib-2.62 deprecations
"-DGLIB_DISABLE_DEPRECATION_WARNINGS"
# override "-O0 -Werror" set by build system
"-O3" "-Wno-error"
];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ];

hardeningDisable = [ "fortify" ]; # upstream compiles with -O0

makeFlags = [
"PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2"
"DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share"
15 changes: 15 additions & 0 deletions pkgs/development/libraries/boost/1.71.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:

callPackage ./generic.nix (args // rec {
version = "1.71.0";

src = fetchurl {
#url = "mirror://sourceforge/boost/boost_1_71_0.tar.bz2";
urls = [
"mirror://sourceforge/boost/boost_1_71_0.tar.bz2"
"https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_71_0.html
sha256 = "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee";
};
})
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/rfc-bibtex/default.nix
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ buildPythonApplication rec {
disabled = !isPy3k;

meta = with stdenv.lib; {
homepage = ttps://github.com/iluxonchik/rfc-bibtex/;
homepage = https://github.com/iluxonchik/rfc-bibtex/;
description = "Generate Bibtex entries for IETF RFCs and Internet-Drafts";
license = licenses.mit;
maintainers = with maintainers; [ teto ];
6 changes: 3 additions & 3 deletions pkgs/tools/compression/gzrt/default.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "gzrt-0.8";

src = fetchurl {
url = "http://www.urbanophile.com/arenn/coding/gzrt/${name}.tar.gz";
url = "https://www.urbanophile.com/arenn/coding/gzrt/${name}.tar.gz";
sha256 = "1vhzazj47xfpbfhzkwalz27cc0n5gazddmj3kynhk0yxv99xrdxh";
};

@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
'';

meta = {
homepage = http://www.urbanophile.com/arenn/hacking/gzrt/;
homepage = https://www.urbanophile.com/arenn/hacking/gzrt/;
description = "The gzip Recovery Toolkit";
license = stdenv.lib.licenses.gpl3;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
};
}
9 changes: 4 additions & 5 deletions pkgs/tools/networking/http-prompt/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pythonPackages, httpie }:
{ stdenv, fetchFromGitHub, python3Packages, httpie }:

pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "http-prompt";
version = "1.0.0";

@@ -11,11 +11,11 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0kngz2izcqjphbrdkg489p0xmf65xjc8ki1a2szcc8sgwc7z74xy";
};

propagatedBuildInputs = with pythonPackages; [
propagatedBuildInputs = with python3Packages; [
click
httpie
parsimonious
prompt_toolkit
(python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {})
pygments
six
];
@@ -30,6 +30,5 @@ pythonPackages.buildPythonApplication rec {
license = licenses.mit;
maintainers = with maintainers; [ matthiasbeyer ];
platforms = platforms.linux ++ platforms.darwin;
broken = true;
};
}
3 changes: 2 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -10721,7 +10721,8 @@ in
boost169 = callPackage ../development/libraries/boost/1.69.nix { };
boost16x = boost167;
boost170 = callPackage ../development/libraries/boost/1.70.nix { };
boost17x = boost170;
boost171 = callPackage ../development/libraries/boost/1.71.nix { };
boost17x = boost171;
boost = boost16x;

boost_process = callPackage ../development/libraries/boost-process { };