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: db5273ce2abd
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: b047b7315d8c
Choose a head ref
  • 3 commits
  • 3 files changed
  • 3 contributors

Commits on Jan 8, 2020

  1. disnix: 0.9 -> 0.9.1 

    (cherry picked from commit 3f0fee7)
    @svanderburg
    svanderburg committed Jan 8, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    0f01a77 View commit details

  2. lib/types: Fix path type check 

    Previously when this function was called without a value coercible to a
string it would throw an error instead of returning false. Now it does.

As a result this now allows the use of a type like `either path attrs`
without it erroring out when a definition is an attribute set.

The warning about there not being a isPath primop was removed because
this is not the case anymore, there is builtins.isPath. But also there
always was `builtins.typeOf x == "path"` that could've been used
instead. However the path type now stands for more than just path types,
but absolute paths in general.

(cherry picked from commit d7a109b)

See NixOS/nixpkgs#76861 (comment)
for why this is cherry-picked
    @infinisil
    infinisil committed Jan 8, 2020
    Copy the full SHA
    86bbfc0 View commit details

Commits on Jan 9, 2020

  1. duplicati: 2.0.4.5 -> 2.0.4.23 

    (cherry picked from commit 6cd31dd)
Signed-off-by: Domen Kožar <domen@dev.si>
    @domenkozar
    domenkozar committed Jan 9, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    b047b73 View commit details
Showing with 7 additions and 8 deletions.
  1. +1 −2 lib/types.nix
  2. +3 −3 pkgs/tools/backup/duplicati/default.nix
  3. +3 −3 pkgs/tools/package-management/disnix/default.nix
3 changes: 1 addition & 2 deletions lib/types.nix
View file
Original file line number Diff line number Diff line change
@@ -242,8 +242,7 @@ rec {

path = mkOptionType {
name = "path";
# Hacky: there is no ‘isPath’ primop.
check = x: builtins.substring 0 1 (toString x) == "/";
check = x: isCoercibleToString x && builtins.substring 0 1 (toString x) == "/";
merge = mergeEqualOption;
};

6 changes: 3 additions & 3 deletions pkgs/tools/backup/duplicati/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "duplicati";
version = "2.0.4.5";
version = "2.0.4.23";
channel = "beta";
build_date = "2018-11-28";
build_date = "2019-07-14";

src = fetchzip {
url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip";
sha256 = "118rhzm8vk1092214vq7kxnmrnz4jl32lk8j90965a8pg05m53gn";
sha256 = "1m2448vgl1fc2hkxkyasvdfgl728rqv16b41niznv5rsxv5643w2";
stripRoot = false;
};

6 changes: 3 additions & 3 deletions pkgs/tools/package-management/disnix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintl, libiconv }:

stdenv.mkDerivation {
name = "disnix-0.9";
name = "disnix-0.9.1";

src = fetchurl {
url = https://github.com/svanderburg/disnix/releases/download/disnix-0.9/disnix-0.9.tar.gz;
sha256 = "1kc4520zjc1z72mknylfvrsyda9rbmm5c9mw8w13zhdwg3zbna06";
url = https://github.com/svanderburg/disnix/releases/download/disnix-0.9.1/disnix-0.9.1.tar.gz;
sha256 = "0bidln5xw3raqkvdks9aipis8aaza8asgyapmilnxkkrxgmw7rdf";
};

nativeBuildInputs = [ pkgconfig ];