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: 57cf4eb83bc7
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: e5b32b971975
Choose a head ref
  • 7 commits
  • 7 files changed
  • 4 contributors

Commits on Nov 25, 2019

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    Copy the full SHA
    fe0eb2a View commit details

Commits on Nov 26, 2019

  1. Copy the full SHA
    d8e24fc View commit details
  2. gource: 0.49 -> 0.51

    r-ryantm authored and Jon committed Nov 26, 2019
    Copy the full SHA
    c74aee8 View commit details
  3. geekbench: 5.0.3 -> 5.0.4

    r-ryantm authored and Jon committed Nov 26, 2019
    Copy the full SHA
    c3fb226 View commit details
  4. gitfs: 0.5.1 -> 0.5.2

    r-ryantm authored and Jon committed Nov 26, 2019
    Copy the full SHA
    e17a0f3 View commit details
  5. Merge pull request #74222 from marsam/update-pgtap

    postgresqlPackages.pgtap: 1.0.0 -> 1.1.0
    WilliButz authored Nov 26, 2019

    Verified

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

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    e5b32b9 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gource/default.nix
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@
}:

stdenv.mkDerivation rec {
version = "0.49";
version = "0.51";
pname = "gource";

src = fetchurl {
url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "12hf5ipcsp9dxsqn84n4kr63xaiskrnf5a084wr29qk171lj7pd9";
sha256 = "16p7b1x4r0915w883lp374jcdqqja37fnb7m8vnsfnl2n64gi8qr";
};

nativeBuildInputs = [ pkgconfig ];
6 changes: 6 additions & 0 deletions pkgs/development/libraries/protobuf/3.11.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{ callPackage, ... }:

callPackage ./generic-v3.nix {
version = "3.11.0";
sha256 = "1b0kf02aw1yvpwdax3865057dzrlrdc7dgam05znwq8id5q76ckr";
}
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/openrazer/driver.nix
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ stdenv.mkDerivation (common // {
nativeBuildInputs = kernel.moduleBuildDependencies;

buildFlags = [
"KERNELDIR=${kernel.dev}/lib/modules/${kernel.version}/build"
"KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];

installPhase = ''
4 changes: 2 additions & 2 deletions pkgs/servers/sql/postgresql/ext/pgtap.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "pgtap";
version = "1.0.0";
version = "1.1.0";

src = fetchFromGitHub {
owner = "theory";
repo = "pgtap";
rev = "v${version}";
sha256 = "0ks53lsrpa8yxav8jh0jlvs25y6p7mkcdch8il1kvib9k5zq2wnb";
sha256 = "09fvzsl8m18yzpvrz6cqvs1ffzs451iwmb2mw39yq69jgqby5kqy";
};

nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ];
4 changes: 2 additions & 2 deletions pkgs/tools/filesystems/gitfs/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

python2Packages.buildPythonApplication rec {
pname = "gitfs";
version = "0.5.1";
version = "0.5.2";

src = fetchFromGitHub {
owner = "PressLabs";
repo = "gitfs";
rev = version;
sha256 = "04plfdaai7bvnz39lw0yyda6ahbwx0wkws9fjnxxx43dzm3sjl98";
sha256 = "1jzwdwan8ndvp2lw6j7zbvg5k9rgf2d8dcxjrwc6bwyk59xdxn4p";
};

patchPhase = ''
4 changes: 2 additions & 2 deletions pkgs/tools/misc/geekbench/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "geekbench";
version = "5.0.3";
version = "5.0.4";

src = fetchurl {
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
sha256 = "0bdkq36b8rr8xzbhjhxia7ss24bm5i4gz4g63dxckis5qi0pfsii";
sha256 = "04d7ixfmzj22w9svjdj0kxsp7ycnzdzx9kd2z1vswnyybdkgyjy7";
};

dontConfigure = true;
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -13493,6 +13493,7 @@ in

protobuf = protobuf3_7;

protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { };
protobuf3_10 = callPackage ../development/libraries/protobuf/3.10.nix { };
protobuf3_9 = callPackage ../development/libraries/protobuf/3.9.nix { };
protobuf3_8 = callPackage ../development/libraries/protobuf/3.8.nix { };