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: 5b2db9151c2a
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: aca0bbe791c2
Choose a head ref
  • 12 commits
  • 6 files changed
  • 3 contributors

Commits on Jul 12, 2020

  1. Copy the full SHA
    9b204b3 View commit details
  2. urlscan: 0.9.4 -> 0.9.5

    r-ryantm committed Jul 12, 2020
    Copy the full SHA
    541db58 View commit details

Commits on Jul 13, 2020

  1. ffsend: 0.2.64 -> 0.2.65

    r-ryantm committed Jul 13, 2020
    Copy the full SHA
    8aeb5cb View commit details
  2. fping: 4.2 -> 4.3

    r-ryantm committed Jul 13, 2020
    Copy the full SHA
    9267570 View commit details
  3. gtkgnutella: 1.1.15 -> 1.2.0

    r-ryantm committed Jul 13, 2020
    Copy the full SHA
    3334892 View commit details
  4. jetbrains-mono: 2.000 -> 2.001

    marsam committed Jul 13, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    Copy the full SHA
    15a7e9c View commit details
  5. Merge pull request #93059 from marsam/update-jetbrains-mono

    jetbrains-mono: 2.000 -> 2.001
    marsam authored Jul 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c78139b View commit details
  6. Merge pull request #93033 from r-ryantm/auto-update/ffsend

    ffsend: 0.2.64 -> 0.2.65
    marsam authored Jul 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0d4dc29 View commit details
  7. Merge pull request #93005 from r-ryantm/auto-update/urlscan

    urlscan: 0.9.4 -> 0.9.5
    marsam authored Jul 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f31d085 View commit details
  8. Merge pull request #93034 from r-ryantm/auto-update/fping

    fping: 4.2 -> 4.3
    marsam authored Jul 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    35b97dc View commit details

Commits on Jul 14, 2020

  1. Merge pull request #92985 from r-ryantm/auto-update/librealsense

    librealsense: 2.35.2 -> 2.36.0
    ryantm authored Jul 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c6e7f26 View commit details
  2. Merge pull request #93044 from r-ryantm/auto-update/gtk-gnutella

    gtkgnutella: 1.1.15 -> 1.2.0
    ryantm authored Jul 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    aca0bbe View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/urlscan/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

python3Packages.buildPythonApplication rec {
pname = "urlscan";
version = "0.9.4";
version = "0.9.5";

src = fetchFromGitHub {
owner = "firecat53";
repo = pname;
rev = version;
sha256 = "11wkwjqsq848ks6m2jqsb8h0xnz75fb60bm0c4jkxys9wzy4chg5";
sha256 = "16g7dzvjcfhaz52wbmcapamy55l7vfhgizqy3m8dv9gkmy8vap89";
};

propagatedBuildInputs = [ python3Packages.urwid ];
4 changes: 2 additions & 2 deletions pkgs/data/fonts/jetbrains-mono/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ lib, fetchzip }:

let
version = "2.000";
version = "2.001";
in
fetchzip {
name = "JetBrainsMono-${version}";

url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrains.Mono.${version}.zip";

sha256 = "1kmb0fckiwaphqxw08xd5fbfjrwnwxz48bidj16ixw8lgcr29b8g";
sha256 = "06rh8dssq6qzgb9rri3an2ka24j47c0i8yhgq81yyg471spc39h1";

postFetch = ''
mkdir -p $out/share/fonts
4 changes: 2 additions & 2 deletions pkgs/development/libraries/librealsense/default.nix
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

stdenv.mkDerivation rec {
pname = "librealsense";
version = "2.35.2";
version = "2.36.0";

outputs = [ "out" "dev" ];

src = fetchFromGitHub {
owner = "IntelRealSense";
repo = pname;
rev = "v${version}";
sha256 = "14vf76vlyhh7b4yjzsnqpg1x3wdhwxrf1syvgf8wyxbjwb9plw82";
sha256 = "1dfkhnybnd8qnljf3y3hjyamaqzw733hb3swy4hjcsdm9dh0wpay";
};

buildInputs = [
6 changes: 3 additions & 3 deletions pkgs/tools/misc/ffsend/default.nix
Original file line number Diff line number Diff line change
@@ -16,16 +16,16 @@ with rustPlatform;

buildRustPackage rec {
pname = "ffsend";
version = "0.2.64";
version = "0.2.65";

src = fetchFromGitLab {
owner = "timvisee";
repo = "ffsend";
rev = "v${version}";
sha256 = "1fgzcw0955vjypwwx3ja8sil0vxwvhsnspn1bjl869ccbnx2x4hs";
sha256 = "02yw129rw072jlf36k60jbhfdv9ayx2wb5il61fc0v07h1nd7i0d";
};

cargoSha256 = "0svmbay9waaq9fpc8lg1nys6l35xsjvkri5v1frlgxida5dzghpq";
cargoSha256 = "04waki61b5pjlgznbhbrjpi9rxgdwg9mjbx2apfh9swvfip602r6";

nativeBuildInputs = [ cmake pkgconfig installShellFiles ];
buildInputs =
4 changes: 2 additions & 2 deletions pkgs/tools/networking/fping/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "fping-4.2";
name = "fping-4.3";

src = fetchurl {
url = "https://www.fping.org/dist/${name}.tar.gz";
sha256 = "0jmnf4vmr43aiwk3h2b5qdsb95gxar8gz1yli8fswnm9nrs9ccvx";
sha256 = "0b9ppwibc0dx2ns95m0z1b28939af1c8yvgjbhnr9f7p8bl0l14j";
};

configureFlags = [ "--enable-ipv6" "--enable-ipv4" ];
4 changes: 2 additions & 2 deletions pkgs/tools/networking/p2p/gtk-gnutella/default.nix
Original file line number Diff line number Diff line change
@@ -19,13 +19,13 @@ stdenv.mkDerivation rec {
pname = "gtk-gnutella";
# NOTE: Please remove hardeningDisable on the next release, see:
# https://sourceforge.net/p/gtk-gnutella/bugs/555/#5c19
version = "1.1.15";
version = "1.2.0";

src = fetchFromGitHub {
owner = "gtk-gnutella";
repo = "gtk-gnutella";
rev = "v${version}";
sha256 = "1g7w6ywwp2g4qdgmfqkrl1rldk1b4rx50yb7h75hh15mh6nr159r";
sha256 = "0j596dpajk68bkry0gmpqawsi61rphfciy4vji1dh890jyhkhdgy";
};

nativeBuildInputs = [