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: d2891652c551
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: 68c599acd587
Choose a head ref
  • 7 commits
  • 7 files changed
  • 6 contributors

Commits on Jul 10, 2020

  1. ruamel: moved from bitbucket to sourceforge 

    (cherry picked from commit c3b5bda)
    @dylex @knl
    dylex authored and knl committed Jul 10, 2020
    Copy the full SHA
    7cc0212 View commit details

  2. ruamel: quote urls, update ordereddict url 

    (cherry picked from commit 15a97f8)
    @dylex @knl
    dylex authored and knl committed Jul 10, 2020
    Copy the full SHA
    a8688c7 View commit details

  3. zfs: 0.8.3 -> 0.8.4 

    (cherry picked from commit 1b3825e)
    @adisbladis @Mic92
    adisbladis authored and Mic92 committed Jul 10, 2020
    Copy the full SHA
    fe0b300 View commit details

  4. Merge pull request #92845 from knl/ruamel-backport 

    ruamel: moved from bitbucket to sourceforge
    @basvandijk
    basvandijk authored Jul 10, 2020
    Copy the full SHA
    537e49e View commit details

  5. mautrix-whatsapp: 0.1.2 -> 0.1.3 

    https://github.com/tulir/mautrix-whatsapp/releases/tag/v0.1.3
(cherry picked from commit e43685e)
    @Ma27
    Ma27 committed Jul 10, 2020
    Copy the full SHA
    cfde9ce View commit details

  6. Merge pull request #92850 from Mic92/zfs-backport 

    [20.03] zfs: 0.8.3 -> 0.8.4
    @andir
    andir authored Jul 10, 2020
    Copy the full SHA
    692c7b3 View commit details

  7. yarn2nix: Don't pass yarnNix to mkDerivation (#92856) 

    The generated yarnNix file doesn't need to be part of the mkDerivation.
And doing so prevents other platforms from reproducibly instantiating
it. With this change you can e.g. do

  darwinPkgs.yarn2nix.mkYarnPackage {
    # ...
    yarnNix = pkgs.yarn2nix.mkYarnNix {
      yarnLock = ./yarn.lock;
    };
  }

Which is a darwin derivation, but can still be instantiated reproducibly on Linux.

(cherry picked from commit 75ee187)
    @infinisil
    infinisil committed Jul 10, 2020
    Copy the full SHA
    68c599a View commit details
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/ruamel_base/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ buildPythonPackage rec {

meta = with stdenv.lib; {
description = "Common routines for ruamel packages";
homepage = https://bitbucket.org/ruamel/base;
homepage = "https://sourceforge.net/projects/ruamel-base/";
license = licenses.mit;
};

2 changes: 1 addition & 1 deletion pkgs/development/python-modules/ruamel_ordereddict/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ buildPythonPackage rec {

meta = with stdenv.lib; {
description = "A version of dict that keeps keys in insertion resp. sorted order";
homepage = https://bitbucket.org/ruamel/ordereddict;
homepage = "https://sourceforge.net/projects/ruamel-ordereddict/";
license = licenses.mit;
};

2 changes: 1 addition & 1 deletion pkgs/development/python-modules/ruamel_yaml/default.nix
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ buildPythonPackage rec {

meta = with lib; {
description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
homepage = https://bitbucket.org/ruamel/yaml;
homepage = "https://sourceforge.net/projects/ruamel-yaml/";
license = licenses.mit;
};

9 changes: 4 additions & 5 deletions pkgs/development/python-modules/ruamel_yaml_clib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv
, buildPythonPackage
, fetchFromBitbucket
, fetchhg
, ruamel_base
, ruamel_ordereddict
, isPy3k
@@ -10,9 +10,8 @@ buildPythonPackage rec {
pname = "ruamel.yaml.clib";
version = "0.2.0";

src = fetchFromBitbucket {
owner = "ruamel";
repo = "yaml.clib";
src = fetchhg {
url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code";
rev = version;
sha256 = "0kq6zi96qlm72lzj90fc2rfk6nm5kqhk6qxdl8wl9s3a42b0v6wl";
};
@@ -22,7 +21,7 @@ buildPythonPackage rec {

meta = with stdenv.lib; {
description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
homepage = https://bitbucket.org/ruamel/yaml;
homepage = "https://sourceforge.net/projects/ruamel-yaml-clib/";
license = licenses.mit;
};

4 changes: 2 additions & 2 deletions pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -284,7 +284,7 @@ in rec {
'')
workspaceDependenciesTransitive;

in stdenv.mkDerivation (builtins.removeAttrs attrs ["pkgConfig" "workspaceDependencies"] // {
in stdenv.mkDerivation (builtins.removeAttrs attrs ["yarnNix" "pkgConfig" "workspaceDependencies"] // {
inherit src pname;

name = baseName;
@@ -389,7 +389,7 @@ in rec {
# yarn2nix is the only package that requires the yarnNix option.
# All the other projects can auto-generate that file.
yarnNix = ./yarn.nix;

# Using the filter above and importing package.json from the filtered
# source results in an error in restricted mode. To circumvent this,
# we import package.json from the unfiltered source
15 changes: 5 additions & 10 deletions pkgs/os-specific/linux/zfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -41,12 +41,7 @@ let
inherit rev sha256;
};

patches = [ (fetchpatch {
# https://github.com/openzfs/zfs/pull/9961#issuecomment-585827288
# will be included in zfs 0.5.4 as well
url = "https://gist.githubusercontent.com/satmandu/67cbae9c4d461be0e64428a1707aef1c/raw/ba0fb65f17ccce5b710e4ce86a095de577f7dfe1/k5.6.3.patch";
sha256 = "0zay7cz078v7wcnk7xl96blp7j6y64q1migb91c7h66zkpikqvgb";
}) ] ++ extraPatches;
patches = [ ] ++ extraPatches;

postPatch = optionalString buildKernel ''
patchShebangs scripts
@@ -185,19 +180,19 @@ in {
# incompatibleKernelVersion = "4.20";

# this package should point to the latest release.
version = "0.8.3";
version = "0.8.4";

sha256 = "0viql8rnqr32diapkpdsrwm6xj8vw5vi4dk2x2m7s7g0q2zdkahw";
sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp";
};

zfsUnstable = common {
# comment/uncomment if breaking kernel versions are known
# incompatibleKernelVersion = "4.19";

# this package should point to a version / git revision compatible with the latest kernel release
version = "0.8.3";
version = "0.8.4";

sha256 = "0viql8rnqr32diapkpdsrwm6xj8vw5vi4dk2x2m7s7g0q2zdkahw";
sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp";
isUnstable = true;
};
}
6 changes: 3 additions & 3 deletions pkgs/servers/mautrix-whatsapp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,18 +2,18 @@

buildGoModule rec {
pname = "mautrix-whatsapp";
version = "0.1.2";
version = "0.1.3";

src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "v${version}";
sha256 = "1df6m1jjv8la6qcz3c5a6pw0jk81f1khx3d9q17d6v3ihrki8krk";
sha256 = "1qagp6jnc4n368pg4h3jr9bzpwpbnva1xyl1b1k2a7q4b5fm5yww";
};

buildInputs = [ olm ];

modSha256 = "1m4aa6bzsn9wa577abnsnkj5qzkk42z54k17xvybc47a9inc5gp8";
modSha256 = "02q5i7a8k08zlwa6hfwm51v5di5qhhhl1wsjx5h0dkq7lznlkdhq";

meta = with stdenv.lib; {
homepage = https://github.com/tulir/mautrix-whatsapp;