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: e0b6b0a6d1fb
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: 6148f6360310
Choose a head ref

Commits on Jul 8, 2020

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Copy the full SHA
    d12886f View commit details
  2. v2ray: 4.23.3 -> 4.26.0

    servalcatty committed Jul 8, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Copy the full SHA
    86f90b3 View commit details
  3. Unverified

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

Commits on Jul 13, 2020

  1. Unverified

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

Commits on Jul 16, 2020

  1. perlPackages.WWWCurl: fix build

    - Include patch from AUR to fix compatibility with newer libcurl.
    - Fix build with clang
    stigtsp committed Jul 16, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    stigtsp Stig
    Copy the full SHA
    a05489f View commit details
  2. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    11f986d View commit details
  3. darktable: fix OpenCL support

    The OpenCL compiler does not properly support -I flags to include the
    kernel paths, breaking relative includes. Simply replace the included
    files by absolute paths.
    
    OpenCL kernels verified to compile and work on an RX 580.
    
    Credits for the fix go to nixos-rocm.
    danieldk committed Jul 16, 2020
    Copy the full SHA
    0aef146 View commit details
  4. cargo-fuzz: 0.5.4 -> 0.8.0

    r-ryantm committed Jul 16, 2020
    Copy the full SHA
    35f96e6 View commit details
  5. Copy the full SHA
    7c11d00 View commit details
  6. Merge pull request #93303 from claudiiii/update-element

    element-desktop, element-web: 1.7.0 -> 1.7.1
    worldofpeace authored Jul 16, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d7cb69a View commit details
  7. GZDoom 4.3.3 -> 4.4.2

    * Update to 4.4.2
    
    4.4.0 increased the ZScript version number, GZDoom 4.4.1 and 4.4.2 have some bugfixes.
    
    * Fix bad checksum
    
    Old hash was done without `--unpack` option, resulting in a mismatch.
    
    * Fetch submodules
    
    This fixes the issue with `zmusic` not being brought in as a dependency.
    
    * Add zmusic derivation
    
    Since zmusic isn't actually a submodule, we have to derive it ourselves and pass it as a buildInput.
    
    * Semicolon.
    
    * Semicolon in the *right* place this time.
    
    * Merge the zmusic source into the gzdoom source.
    
    Apparently this is how they expect zmusic to be added. Why this isn't a submodule, I don't know.
    
    * Fix bad path editing
    
    Credit to Open Skies for fixing this. Turns out the paths edited in the `gzdoom` derivation were for zmusic, which needs these edits to be made so that it looks in nix-friendly places for its stuff.
    Derpford authored Jul 16, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    951e217 View commit details
  8. xdg-desktop-portal-gtk: add gnome-settings-daemon

    This fixes "xdg-desktop-portal-gtk breaks font hinting".
    Aka, NixOS/nixpkgs#93199.
    colemickens committed Jul 16, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    colemickens Cole Mickens
    Copy the full SHA
    749418c View commit details
  9. Copy the full SHA
    69246f1 View commit details
  10. Merge pull request #85021 from oxalica/osu

    osu-lazer: init at 2020.714.0
    infinisil authored Jul 16, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2a74034 View commit details
  11. Copy the full SHA
    2025e91 View commit details
  12. Copy the full SHA
    2a45eea View commit details

Commits on Jul 17, 2020

  1. python3Packages.torchgpipe: init at 0.0.5

    bcdarwin authored and Jon committed Jul 17, 2020
    Copy the full SHA
    ea8f8bc View commit details
  2. Merge pull request #93307 from colemickens/xdpg-fonts

    xdg-desktop-portal-gtk: add gnome-settings-daemon
    worldofpeace authored Jul 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    78fd11e View commit details
  3. Merge pull request #93312 from r-ryantm/auto-update/gnome-desktop

    gnome3.gnome-desktop: 3.36.3.1 -> 3.36.4
    worldofpeace authored Jul 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    dfc39d7 View commit details
  4. Copy the full SHA
    5650202 View commit details
  5. Copy the full SHA
    2613e6d View commit details
  6. Copy the full SHA
    60d8783 View commit details
  7. Copy the full SHA
    075a891 View commit details
  8. Merge pull request #89017 from zowoq/package-grouping

    Group packages by language/builder via dummy maintainer
    zowoq authored Jul 17, 2020

    Verified

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

    gitAndTools.gitui: 0.5.0 -> 0.8.1
    marsam authored Jul 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4f5195c View commit details
  10. Merge pull request #93285 from r-ryantm/auto-update/cargo-fuzz

    cargo-fuzz: 0.5.4 -> 0.8.0
    marsam authored Jul 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    05dc6af View commit details
  11. go_1_13: 1.13.13 -> 1.13.14

    zowoq committed Jul 17, 2020
    Copy the full SHA
    9cbf74b View commit details
  12. Merge pull request #93185 from stigtsp/package/perl-www-curl-fix

    perlPackages.WWWCurl: fix build
    veprbl authored Jul 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a9ddda9 View commit details
  13. Merge pull request #93281 from danieldk/darktable-opencl

    darktable: fix OpenCL support
    danieldk authored Jul 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b5e5800 View commit details
  14. Merge pull request #90177 from servalcatty/v2ray

    v2ray: 4.23.3 -> 4.26.0
    marsam authored Jul 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6148f63 View commit details
Showing with 1,867 additions and 130 deletions.
  1. +8 −0 maintainers/maintainer-list.nix
  2. +4 −0 pkgs/applications/graphics/darktable/default.nix
  3. +1 −1 pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
  4. +4 −4 pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
  5. +2 −2 pkgs/applications/networking/instant-messengers/element/element-desktop.nix
  6. +2 −2 pkgs/applications/networking/instant-messengers/element/element-web.nix
  7. +3 −3 pkgs/applications/version-management/git-and-tools/gh/default.nix
  8. +3 −3 pkgs/applications/version-management/git-and-tools/gitui/default.nix
  9. +5 −1 pkgs/build-support/rust/default.nix
  10. +2 −2 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
  11. +2 −2 pkgs/development/compilers/go/1.13.nix
  12. +1 −1 pkgs/development/go-modules/generic/default.nix
  13. +5 −1 pkgs/development/go-packages/generic/default.nix
  14. +1 −0 pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
  15. +0 −34 pkgs/development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch
  16. +39 −0 pkgs/development/python-modules/torchgpipe/default.nix
  17. +3 −3 pkgs/development/tools/rust/cargo-fuzz/default.nix
  18. +80 −50 pkgs/games/gzdoom/default.nix
  19. +104 −0 pkgs/games/osu-lazer/default.nix
  20. +1,492 −0 pkgs/games/osu-lazer/deps.nix
  21. +58 −0 pkgs/games/osu-lazer/update.sh
  22. +8 −6 pkgs/tools/networking/v2ray/default.nix
  23. +2 −2 pkgs/tools/networking/v2ray/generic.nix
  24. +23 −5 pkgs/tools/networking/v2ray/update.sh
  25. +5 −0 pkgs/top-level/all-packages.nix
  26. +8 −8 pkgs/top-level/perl-packages.nix
  27. +2 −0 pkgs/top-level/python-packages.nix
8 changes: 8 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -5826,6 +5826,14 @@
githubId = 16385648;
name = "Niko Pavlinek";
};
nixpkgs-go = {
email = "go@nixpkgs";
name = "Nixpkgs Go Packages";
};
nixpkgs-rust = {
email = "rust@nixpkgs";
name = "Nixpkgs Rust Packages";
};
nixy = {
email = "nixy@nixy.moe";
github = "nixy";
4 changes: 4 additions & 0 deletions pkgs/applications/graphics/darktable/default.nix
Original file line number Diff line number Diff line change
@@ -45,6 +45,10 @@ stdenv.mkDerivation rec {
libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
libPathPrefix = "$out/lib/darktable" + stdenv.lib.optionalString stdenv.isLinux ":${ocl-icd}/lib";
in ''
for f in $out/share/darktable/kernels/*.cl; do
sed -r "s|#include \"(.*)\"|#include \"$out/share/darktable/kernels/\1\"|g" -i "$f"
done
gappsWrapperArgs+=(
--prefix ${libPathEnvVar} ":" "${libPathPrefix}"
)
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element (Riot)",
"main": "src/electron-main.js",
"version": "1.7.0",
"version": "1.7.1",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
Original file line number Diff line number Diff line change
@@ -3170,11 +3170,11 @@
};
}
{
name = "lodash___lodash_4.17.15.tgz";
name = "lodash___lodash_4.17.19.tgz";
path = fetchurl {
name = "lodash___lodash_4.17.15.tgz";
url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz";
sha1 = "b447f6670a0455bbfeedd11392eff330ea097548";
name = "lodash___lodash_4.17.19.tgz";
url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz";
sha1 = "e48ddedbe30b3321783c5b4301fbd353bc1e4a4b";
};
}
{
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@

let
executableName = "element-desktop";
version = "1.7.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
sha256 = "10qisz2s5w2ykh3j4bldadjzb4j963z5n0jd64dxmz9l2k9id2mk";
sha256 = "0sl45mxgp0sngxnba8ilsghzgv6cv36ggah1k2204ggzby13blg6";
};
electron = electron_9;

Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@ let

in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.7.0";
version = "1.7.1";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "033793zx3c95z5ikq70kxajwlbg2b8785wrgjr1zyha3pjq79bm6";
sha256 = "1axmf5h0k709kbpgh3ldsf6f8k9n2q623pk4j0nrshlxa9ighsay";
};

installPhase = ''
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "gh";
version = "0.10.1";
version = "0.11.0";

src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "0q4zpm10hcci4j0g1gx08q2qwn71ab9f7yaf4k78sfn5p89y7rm2";
sha256 = "13nq7rvxwl9cld9gng7rm534yqrr2ii0bqyzqwlkpzh9m61m3ra2";
};

vendorSha256 = "0igbqnylryiq36lbb1gha8najijzxmn10asc0xayxygbxc16s1vi";
vendorSha256 = "1xvrxdxhyj5nz5plypc5mniw5dl17w1wxcrs77w24hisn90jphgd";

nativeBuildInputs = [ installShellFiles ];

Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "gitui";
version = "0.5.0";
version = "0.8.1";

src = fetchFromGitHub {
owner = "extrawurst";
repo = pname;
rev = "v${version}";
sha256 = "0z3k83nfnl765ably4naybjf614qfizzpqb40ppwljijj9nqlng1";
sha256 = "0nch2p4isdv746p9pczqwram0c5f0f9l2r3fy5r12x9br0kak136";
};

cargoSha256 = "11y4q56vl5dp2vdc7dc5q44l2m0mn590hfg6i134m11r8988am6y";
cargoSha256 = "1d54afg45lw8zyanr49fklzhczadyja2fjmid22d81s2ari84slz";

buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];

6 changes: 5 additions & 1 deletion pkgs/build-support/rust/default.nix
Original file line number Diff line number Diff line change
@@ -241,5 +241,9 @@ stdenv.mkDerivation (args // {
meta = {
# default to Rust's platforms
platforms = rustc.meta.platforms;
} // meta;
} // meta // {
# add an extra maintainer to every package
maintainers = (meta.maintainers or []) ++
[ stdenv.lib.maintainers.nixpkgs-rust ];
};
})
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "gnome-desktop";
version = "3.36.3.1";
version = "3.36.4";

outputs = [ "out" "dev" "devdoc" ];

src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0zkbx5inprjpf4abqwn0bxc2d1rwbhv450cjh1wgz82ylagi3vab";
sha256 = "1ilv49qkppbbag5728iswg1jhhqx9hbj7j8k8wccnbyaq54bsyq0";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/development/compilers/go/1.13.nix
Original file line number Diff line number Diff line change
@@ -30,11 +30,11 @@ in

stdenv.mkDerivation rec {
pname = "go";
version = "1.13.13";
version = "1.13.14";

src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "0dsis9rymcd2916m2s6qjiqr8vi3dm6cg0jgbzyy2k3k3r348zmb";
sha256 = "01mbqzn1hj8idbyn2f9gghvirfnw348dcf7pjs3ymschfblk6wqr";
};

# perl is used for testing go vet
2 changes: 1 addition & 1 deletion pkgs/development/go-modules/generic/default.nix
Original file line number Diff line number Diff line change
@@ -236,7 +236,7 @@ let
} // meta // {
# add an extra maintainer to every package
maintainers = (meta.maintainers or []) ++
[ lib.maintainers.kalbasit ];
[ lib.maintainers.kalbasit lib.maintainers.nixpkgs-go ];
};
});
in if disabled then
6 changes: 5 additions & 1 deletion pkgs/development/go-packages/generic/default.nix
Original file line number Diff line number Diff line change
@@ -239,7 +239,11 @@ let
# Add default meta information
homepage = "https://${goPackagePath}";
platforms = go.meta.platforms or lib.platforms.all;
} // meta;
} // meta // {
# add an extra maintainer to every package
maintainers = (meta.maintainers or []) ++
[ lib.maintainers.nixpkgs-go ];
};
});
in if disabled then
throw "${package.name} not supported for go ${go.meta.branch}"
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
gsettings-desktop-schemas
gtk3
gnome3.gnome-desktop
gnome3.gnome-settings-daemon # schemas needed for settings api (fonts, etc)
];

meta = with stdenv.lib; {

This file was deleted.

39 changes: 39 additions & 0 deletions pkgs/development/python-modules/torchgpipe/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy27
, pytest
, pytestrunner
, pytestCheckHook
, pytorch
}:

buildPythonPackage rec {
pname = "torchgpipe";
version = "0.0.5";

disabled = isPy27;

src = fetchFromGitHub {
owner = "kakaobrain";
repo = pname;
rev = "v${version}";
sha256 = "0mqdavnqb8a320li2r7xw11w2lg03l59xxyg2fxpg4z57v0rbasi";
};

propagatedBuildInputs = [ pytorch ];

checkInputs = [ pytest pytestrunner pytestCheckHook ];
disabledTests = [ "test_inplace_on_requires_grad" ];
# seems like a harmless failure:
## AssertionError:
## Pattern 'a leaf Variable that requires grad has been used in an in-place operation.'
## does not match 'a leaf Variable that requires grad is being used in an in-place operation.'

meta = with lib; {
description = "GPipe implemented in Pytorch and optimized for CUDA rather than TPU";
homepage = "https://torchgpipe.readthedocs.io";
license = licenses.asl20;
maintainers = [ maintainers.bcdarwin ];
};
}
6 changes: 3 additions & 3 deletions pkgs/development/tools/rust/cargo-fuzz/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-fuzz";
version = "0.5.4";
version = "0.8.0";

src = fetchFromGitHub {
owner = "rust-fuzz";
repo = "cargo-fuzz";
rev = version;
sha256 = "0qy4xb7bxyw2x2ya7zmbkz48wxb69jcnvvj7021f1kyc6wdwcxs7";
sha256 = "1d4bq9140bri8cd9zcxh5hhc51vr0s6jadjhwkp688w7k10rq7w8";
};

cargoSha256 = "0d24crgx6wrb1p96w2yww7cs474x2pz4i6f26cry8pf5dwqfsqdm";
cargoSha256 = "0zxhak79f50m8nw95ny733mk4x2f7kyk6q9v4f7jr2rkcldhgrpr";

meta = with stdenv.lib; {
description = "Command line helpers for fuzzing";
Loading