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: 508a2c684964
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: 8f15b7065395
Choose a head ref

Commits on Mar 2, 2020

  1. gdal: 3.0.3 -> 3.0.4

    Update GDAL/OGR to 3.0.4
    
    GDAL 3.0.4 includes a fix for build failure due to poppler 0.85.0
    upgrade (change to parameters for setErrorCallback). See commit:
    
    OSGeo/gdal@6e9e51e
    tollb committed Mar 2, 2020
    Copy the full SHA
    bb46f89 View commit details

Commits on Mar 5, 2020

  1. scaff: 0.1.1 -> 0.1.2

    bhipple committed Mar 5, 2020
    Copy the full SHA
    4e49c40 View commit details
  2. Copy the full SHA
    6784c98 View commit details
  3. openiscsi: 2.1.0 -> 2.1.1

    r-ryantm committed Mar 5, 2020
    Copy the full SHA
    0072d12 View commit details

Commits on Mar 6, 2020

  1. cimg: 2.8.3 -> 2.8.4

    r-ryantm committed Mar 6, 2020
    Copy the full SHA
    e572b36 View commit details
  2. cfr: 0.148 -> 0.149

    r-ryantm committed Mar 6, 2020
    Copy the full SHA
    215e759 View commit details

Commits on Mar 7, 2020

  1. matomo: 3.13.2 -> 3.13.3

    Updated both matomo and matomo-beta to the latest version
    Kiwi committed Mar 7, 2020
    Copy the full SHA
    56a901b View commit details
  2. Copy the full SHA
    b446413 View commit details
  3. Copy the full SHA
    1068dd3 View commit details
  4. Copy the full SHA
    609650a View commit details
  5. containerd: 1.2.6 -> 1.2.13

    Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
    vdemeester committed Mar 7, 2020
    Copy the full SHA
    68d61b1 View commit details
  6. cvsq: 1.10 -> 1.11

    clkamp committed Mar 7, 2020
    Copy the full SHA
    8773488 View commit details
  7. heatseeker: 1.5.1 -> 1.7.1

    The build is currently broken on master; upgrading fixes it.
    bhipple committed Mar 7, 2020
    Copy the full SHA
    9044bde View commit details
  8. sit: mark as broken

    Dependencies in the Cargo.lock fail to build due to mutable self borrows.
    bhipple committed Mar 7, 2020
    Copy the full SHA
    a2514c2 View commit details
  9. amp: 0.6.1 -> 0.6.2

    The build also happens to be broken on master; this fixes it, along with
    upgrading the cargoSha256.
    bhipple committed Mar 7, 2020
    Copy the full SHA
    099b52d View commit details
  10. Copy the full SHA
    c4c936f View commit details

Commits on Mar 8, 2020

  1. yarn: 1.22.0 -> 1.22.2

    r-ryantm committed Mar 8, 2020
    Copy the full SHA
    dac3a7e View commit details
  2. gitAndTools.git-bug: 0.6.0 -> 0.7.0

    Update to version 0.7.0. Includes switch to buildGoModule because Gopkg.toml
    has been removed upstream.
    royneary committed Mar 8, 2020
    Copy the full SHA
    1cd54c9 View commit details
  3. romdirfs: init at 1.2

    Bignaux Ronan committed Mar 8, 2020
    Copy the full SHA
    a201e3d View commit details
  4. borgbackup: 1.1.10 → 1.1.11

    Version 1.1.11 (2020-03-08)
    
    Compatibility notes:
    
        When upgrading from borg 1.0.x to 1.1.x, please note:
            read all the compatibility notes for 1.1.0*, starting from 1.1.0b1.
            borg upgrade: you do not need to and you also should not run it.
            borg might ask some security-related questions once after upgrading. You can answer them either manually or via environment variable. One known case is if you use unencrypted repositories, then it will ask about a unknown unencrypted repository one time.
            your first backup with 1.1.x might be significantly slower (it might completely read, chunk, hash a lot files) - this is due to the --files-cache mode change (and happens every time you change mode). You can avoid the one-time slowdown by using the pre-1.1.0rc4-compatible mode (but that is less safe for detecting changed files than the default). See the --files-cache docs for details.
        1.1.11 removes WSL autodetection (Windows 10 Subsystem for Linux). If WSL still has a problem with sync_file_range, you need to set BORG_WORKAROUNDS=basesyncfile in the borg process environment to work around the WSL issue.
    
    Fixes:
    
        fixed potential index corruption / data loss issue due to bug in hashindex_set, #4829 Please read and follow the more detailled notes close to the top of this document.
        upgrade bundled xxhash to 0.7.3, #4891 0.7.2 is the minimum requirement for correct operations on ARMv6 in non-fixup mode, where unaligned memory accesses cause bus errors. 0.7.3 adds some speedups and libxxhash 0.7.3 even has a pkg-config file now.
        upgrade bundled lz4 to 1.9.2
        upgrade bundled zstd to 1.4.4
        fix crash when upgrading erroneous hints file, #4922
        extract:
            fix KeyError for "partial" extraction, #4607
            fix "partial" extract for hardlinked contentless file types, #4725
            fix preloading for old (0.xx) remote servers, #4652
            fix confusing output of borg extract --list --strip-components, #4934
        delete: after double-force delete, warn about necessary repair, #4704
        create: give invalid repo error msg if repo config not found, #4411
        mount: fix FUSE mount missing st_birthtime, #4763 #4767
        check: do not stumble over invalid item key, #4845
        info: if the archive doesn't exist, print a pretty message, #4793
        SecurityManager.known(): check all files, #4614
        Repository.open: use stat() to check for repo dir, #4695
        Repository.check_can_create_repository: use stat() to check, #4695
        fix invalid archive error message
        fix optional/non-optional location arg, #4541
        commit-time free space calc: ignore bad compact map entries, #4796
        ignore EACCES (errno 13) when hardlinking the old config, #4730
        --prefix / -P: fix processing, avoid argparse issue, #4769
    
    New features:
    
        enable placeholder usage in all extra archive arguments
        new BORG_WORKAROUNDS mechanism, basesyncfile, #4710
        recreate: support --timestamp option, #4745
        support platforms without os.link (e.g. Android with Termux), #4901 if we don't have os.link, we just extract another copy instead of making a hardlink.
        support linux platforms without sync_file_range (e.g. Android 7 with Termux), #4905
    
    Other:
    
        ignore --stats when given with --dry-run, but continue, #4373
        add some ProgressIndicator msgids to code / fix docs, #4935
        elaborate on "Calculating size" message
        argparser: always use REPOSITORY in metavar, also use more consistent help phrasing.
        check: improve error output for matching index size, see #4829
        docs:
            changelog: add advisory about hashindex_set bug #4829
            better describe BORG_SECURITY_DIR, BORG_CACHE_DIR, #4919
            infos about cache security assumptions, #4900
            add FAQ describing difference between a local repo vs. repo on a server.
            document how to test exclusion patterns without performing an actual backup
            timestamps in the files cache are now usually ctime, #4583
            fix bad reference to borg compact (does not exist in 1.1), #4660
            create: borg 1.1 is not future any more
            extract: document limitation "needs empty destination", #4598
            how to supply a passphrase, use crypto devices, #4549
            fix osxfuse github link in installation docs
            add example of exclude-norecurse rule in help patterns
            update macOS Brew link
            add note about software for automating backups, #4581
            AUTHORS: mention copyright+license for bundled msgpack
            fix various code blocks in the docs, #4708
            updated docs to cover use of temp directory on remote, #4545
            add restore docs, #4670
            add a pull backup / push restore how-to, #1552
            add FAQ how to retain original paths, #4532
            explain difference between --exclude and --pattern, #4118
            add FAQs for SSH connection issues, #3866
            improve password FAQ, #4591
            reiterate that 'file cache names are absolute' in FAQ
        tests:
            cope with ANY error when importing pytest into borg.testsuite, #4652
            fix broken test that relied on improper zlib assumptions
            test_fuse: filter out selinux xattrs, #4574
        travis / vagrant:
            misc python versions removed / changed (due to openssl 1.1 compatibility) or added (3.7 and 3.8, for better borg compatibility testing)
            binary building is on python 3.5.9 now
        vagrant:
            add new boxes: ubuntu 18.04 and 20.04, debian 10
            update boxes: openindiana, darwin, netbsd
            remove old boxes: centos 6
            darwin: updated osxfuse to 3.10.4
            use debian/ubuntu pip/virtualenv packages
            rather use python 3.6.2 than 3.6.0, fixes coverage/sqlite3 issue
            use requirements.d/development.lock.txt to avoid compat issues
        travis:
            darwin: backport some install code / order from master
            remove deprecated keyword "sudo" from travis config
            allow osx builds to fail, #4955 this is due to travis-ci frequently being so slow that the OS X builds just fail because they exceed 50 minutes and get killed by travis.
    mweinelt committed Mar 8, 2020
    Copy the full SHA
    dbff9b5 View commit details
  5. Copy the full SHA
    bc21f7a View commit details
  6. libzdb: 3.1 -> 3.2.1

    r-ryantm committed Mar 8, 2020
    Copy the full SHA
    b4c65bc View commit details
  7. lxcfs: 3.1.2 -> 4.0.0

    r-ryantm committed Mar 8, 2020
    Copy the full SHA
    b99feeb View commit details
  8. Copy the full SHA
    e9d492a View commit details
  9. Copy the full SHA
    c1a78b7 View commit details
  10. Copy the full SHA
    df4ec15 View commit details
  11. Copy the full SHA
    d1cdeb7 View commit details
  12. Copy the full SHA
    0b933b4 View commit details
  13. Copy the full SHA
    fa353a0 View commit details
  14. cloudflare-wranger: upgrade cargoSha256 (#82022)

    General infrastructure improvement as part of #79975,
    no functional changes expected.
    bhipple authored Mar 8, 2020
    Copy the full SHA
    a38ad34 View commit details
  15. cargo-make: remove unnecessary attribute (#82071)

    The default value when left unspecified is now false, so no need to state this explicitly.
    bhipple authored Mar 8, 2020
    Copy the full SHA
    1cc9cb7 View commit details
  16. Merge pull request #82052 from mweinelt/pr/borgbackup/1.1.11

    borgbackup: 1.1.10 → 1.1.11
    flokli authored Mar 8, 2020
    Copy the full SHA
    a2aacb6 View commit details

Commits on Mar 9, 2020

  1. Merge pull request #82031 from r-ryantm/auto-update/yarn

    yarn: 1.22.0 -> 1.22.2
    marsam authored Mar 9, 2020
    Copy the full SHA
    858eadd View commit details
  2. Merge pull request #82050 from royneary/git-bug-0.7.0

    gitAndTools.git-bug: 0.6.0 -> 0.7.0
    marsam authored Mar 9, 2020
    Copy the full SHA
    d13fc7a View commit details
  3. Merge pull request #80013 from bignaux/romdirfs

    romdirfs: init at 1.2
    aanderse authored Mar 9, 2020
    Copy the full SHA
    2c61263 View commit details
  4. Merge pull request #81962 from marsam/udpate-docker-slim

    docker-slim: 1.27.0 -> 1.28.0
    marsam authored Mar 9, 2020
    Copy the full SHA
    e26941f View commit details
  5. Merge pull request #81968 from vdemeester/update-containerd

    containerd: 1.2.6 -> 1.2.13
    marsam authored Mar 9, 2020
    Copy the full SHA
    0623c70 View commit details
  6. perlPackages.TextBibTeX: fix on darwin

    Fixes: 6d8539c ('perl: Enable threading on darwin')
    cc #73819
    veprbl committed Mar 9, 2020
    Copy the full SHA
    2873950 View commit details
  7. Copy the full SHA
    a67fbc1 View commit details
  8. Copy the full SHA
    6331093 View commit details
  9. Copy the full SHA
    0757551 View commit details
  10. Merge pull request #81966 from edef1c/git-codereview

    git-codereview: init at 2020-01-15
    marsam authored Mar 9, 2020
    Copy the full SHA
    77c58e6 View commit details
  11. Merge pull request #82017 from bhipple/u/heatseeker

    heatseeker: 1.5.1 -> 1.7.1
    marsam authored Mar 9, 2020
    Copy the full SHA
    e54d71c View commit details
  12. Merge pull request #82012 from clkamp/cvsq-1.11

    cvsq: 1.10 -> 1.11
    marsam authored Mar 9, 2020
    Copy the full SHA
    7391412 View commit details
  13. Merge pull request #82063 from r-ryantm/auto-update/libzdb

    libzdb: 3.1 -> 3.2.1
    marsam authored Mar 9, 2020
    Copy the full SHA
    f613ff2 View commit details
  14. Copy the full SHA
    bfa084b View commit details
  15. Merge pull request #81537 from tollb/gdal-3.0.4

    gdal: 3.0.3 -> 3.0.4
    marsam authored Mar 9, 2020
    Copy the full SHA
    9760d23 View commit details
  16. Merge pull request #82058 from helsinki-systems/fix/bitwarden_rs-vault

    bitwarden_rs-vault: fix directory structure
    marsam authored Mar 9, 2020
    Copy the full SHA
    791a24d View commit details
  17. Merge pull request #82023 from zowoq/rkt-cve

    rkt: add CVEs
    marsam authored Mar 9, 2020
    Copy the full SHA
    65731ad View commit details
  18. Merge pull request #82018 from bhipple/broken/sit

    sit: mark as broken
    marsam authored Mar 9, 2020
    Copy the full SHA
    306d507 View commit details
Showing with 140 additions and 127 deletions.
  1. +3 −3 pkgs/applications/audio/zam-plugins/default.nix
  2. +3 −6 pkgs/applications/editors/amp/default.nix
  3. +3 −7 pkgs/applications/editors/neovim/gnvim/default.nix
  4. +2 −2 pkgs/applications/version-management/cvsq/default.nix
  5. +2 −0 pkgs/applications/version-management/git-and-tools/default.nix
  6. +10 −9 pkgs/applications/version-management/git-and-tools/git-bug/default.nix
  7. +21 −0 pkgs/applications/version-management/git-and-tools/git-codereview/default.nix
  8. +5 −5 pkgs/applications/version-management/sit/default.nix
  9. +2 −2 pkgs/applications/virtualization/containerd/default.nix
  10. +2 −2 pkgs/applications/virtualization/docker-slim/default.nix
  11. +5 −0 pkgs/applications/virtualization/rkt/default.nix
  12. +1 −4 pkgs/applications/window-managers/dwm/dwm-status.nix
  13. +3 −3 pkgs/development/libraries/cimg/default.nix
  14. +2 −2 pkgs/development/libraries/gdal/default.nix
  15. +3 −3 pkgs/development/libraries/libzdb/default.nix
  16. +4 −7 pkgs/development/tools/cloudflare-wrangler/default.nix
  17. +1 −4 pkgs/development/tools/git-series/default.nix
  18. +3 −3 pkgs/development/tools/java/cfr/default.nix
  19. +1 −4 pkgs/development/tools/rust/cargo-geiger/default.nix
  20. +0 −2 pkgs/development/tools/rust/cargo-make/default.nix
  21. +3 −3 pkgs/development/tools/rust/maturin/default.nix
  22. +3 −3 pkgs/development/tools/scaff/default.nix
  23. +3 −3 pkgs/development/tools/yarn/default.nix
  24. +3 −3 pkgs/os-specific/linux/lxcfs/default.nix
  25. +3 −3 pkgs/os-specific/linux/open-iscsi/default.nix
  26. +4 −4 pkgs/servers/web-apps/matomo/default.nix
  27. +1 −4 pkgs/tools/admin/intecture/agent.nix
  28. +1 −4 pkgs/tools/admin/intecture/auth.nix
  29. +1 −4 pkgs/tools/admin/intecture/cli.nix
  30. +3 −3 pkgs/tools/backup/borg/default.nix
  31. +24 −0 pkgs/tools/filesystems/romdirfs/default.nix
  32. +5 −10 pkgs/tools/misc/heatseeker/default.nix
  33. +2 −4 pkgs/tools/package-management/cargo-license/default.nix
  34. +1 −4 pkgs/tools/security/b3sum/default.nix
  35. +3 −2 pkgs/tools/security/bitwarden_rs/vault.nix
  36. +1 −4 pkgs/tools/security/ripasso/cursive.nix
  37. +2 −0 pkgs/top-level/all-packages.nix
  38. +1 −1 pkgs/top-level/perl-packages.nix
6 changes: 3 additions & 3 deletions pkgs/applications/audio/zam-plugins/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation {
pname = "zam-plugins";
version = "3.11";
version = "3.12";

src = fetchgit {
url = "https://github.com/zamaudio/zam-plugins.git";
deepClone = true;
rev = "af338057e42dd5d07cba1889bfc74eda517c6147";
sha256 = "1qbskhcvy2k2xv0f32lw13smz5g72v0yy47zv6vnhnaiaqf3f2d5";
rev = "87fdee6e87dbee75c1088e2327ea59c1ab1522e4";
sha256 = "0kz0xygff3ca1v9nqi0dvrzy9whbzqxrls5b7hydi808d795893n";
};

nativeBuildInputs = [ pkgconfig ];
9 changes: 3 additions & 6 deletions pkgs/applications/editors/amp/default.nix
Original file line number Diff line number Diff line change
@@ -3,19 +3,16 @@

rustPlatform.buildRustPackage rec {
pname = "amp";
version = "0.6.1";
version = "0.6.2";

src = fetchFromGitHub {
owner = "jmacdonald";
repo = pname;
rev = version;
sha256 = "0jhxyl27nwp7rp0lc3kic69g8x55d0azrwlwwhz3z74icqa8f03j";
sha256 = "0l1vpcfq6jrq2dkrmsa4ghwdpp7c54f46gz3n7nk0i41b12hnigw";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "0rk5c8knx8swqzmj7wd18hq2h5ndkzvcbq4lzggpavkk01a8hlb1";
cargoSha256 = "09v991rl2w4c4jh7ga7q1lk6wyl2vr71j5cpniij8mcvszrz78qf";

nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl python3 xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin
10 changes: 3 additions & 7 deletions pkgs/applications/editors/neovim/gnvim/default.nix
Original file line number Diff line number Diff line change
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "11gb59lhc1sp5dxj2fdm6072f4nxxay0war3kmchdwsk41nvxlrh";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "00r5jf5qdw02vcv3522qqrnwj14mip0l58prcncbvyg4pxlm2rb2";
cargoSha256 = "0ay7hx5bzchp772ywgxzia12c44kbyarrshl689cmqh59wphsrx5";

buildInputs = [ gtk webkitgtk ];

@@ -43,8 +40,7 @@ rustPlatform.buildRustPackage rec {
meta = with stdenv.lib; {
description = "GUI for neovim, without any web bloat";
homepage = "https://github.com/vhakulinen/gnvim";
license = licenses.mit;
maintainers = with maintainers; [ minijackson ];
inherit version;
license = licenses.mit;
maintainers = with maintainers; [ minijackson ];
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/cvsq/default.nix
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@

stdenv.mkDerivation rec {
pname = "cvsq";
version = "1.10";
version = "1.11";

src = fetchurl {
url = "http://www.linta.de/~aehlig/cvsq/cvsq-${version}.tgz";
sha256 = "1a2e5666d4d23f1eb673a505caeb771ac62a86ed69c9ab89c4e2696c2ccd0621";
sha256 = "0491k4skk3jyyd6plp2kcihmxxav9rsch7vd1yi697m2fqckp5ws";
};

nativeBuildInputs = [ makeWrapper ];
Original file line number Diff line number Diff line change
@@ -70,6 +70,8 @@ let

git-codeowners = callPackage ./git-codeowners { };

git-codereview = callPackage ./git-codereview { };

git-cola = callPackage ./git-cola { };

git-crypt = callPackage ./git-crypt { };
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub }:

buildGoPackage rec {
buildGoModule rec {
pname = "git-bug";
version = "0.6.0";
rev = "fc568209f073b9d775a09e0dbb8289cf9e5749bf";
version = "0.7.0";
rev = "71580c41a931a1ad2c04682e0fd701661b716c95";
goPackagePath = "github.com/MichaelMure/git-bug";

src = fetchFromGitHub {
inherit rev;
owner = "MichaelMure";
repo = "git-bug";
sha256 = "1s18lzip52qpf52ad6m20j306mr16vnwhz9f7rirsa6b7srmcgli";
sha256 = "0mhqvcwa6y3hrrv88vbp22k7swzr8xw6ipm80gdpx85yp8j2wdkh";
};

modSha256 = "1cfn49cijiarzzczrpd28x1k7ib98xyzlvn3zghwk2ngfgiah3ld";

buildFlagsArray = ''
-ldflags=
-X ${goPackagePath}/commands.GitCommit=${rev}
@@ -21,10 +23,9 @@ buildGoPackage rec {
'';

postInstall = ''
cd go/src/${goPackagePath}
install -D -m 0644 misc/bash_completion/git-bug "$bin/etc/bash_completion.d/git-bug"
install -D -m 0644 misc/zsh_completion/git-bug "$bin/share/zsh/site-functions/git-bug"
install -D -m 0644 -t "$bin/share/man/man1" doc/man/*
install -D -m 0644 misc/bash_completion/git-bug "$out/etc/bash_completion.d/git-bug"
install -D -m 0644 misc/zsh_completion/git-bug "$out/share/zsh/site-functions/git-bug"
install -D -m 0644 -t "$out/share/man/man1" doc/man/*
'';

meta = with stdenv.lib; {
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ lib, buildGoPackage, fetchFromGitHub }:

buildGoPackage {
pname = "git-codereview";
version = "2020-01-15";
goPackagePath = "golang.org/x/review";

src = fetchFromGitHub {
owner = "golang";
repo = "review";
rev = "f51a73253c4da005cfdf18a036e11185c04c8ce3";
sha256 = "0c4vsyy5zp7pngqn4q87xipndghxyw2x57dkv1kxnrffckx1s3pc";
};

meta = with lib; {
description = "Manage the code review process for Git changes using a Gerrit server";
homepage = "https://golang.org/x/review/git-codereview";
license = licenses.bsd3;
maintainers = [ maintainers.edef ];
};
}
10 changes: 5 additions & 5 deletions pkgs/applications/version-management/sit/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg,
{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg,
# Darwin
libiconv, CoreFoundation, Security }:

@@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec {
export HOME=$(mktemp -d)
'';

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "0kijx7s7zh6yisrsjz213h9x5jx43ixr44vy5rb3wwbn9dgsr528";
cargoSha256 = "092yfpr2svp1qy7xis1q0sdkbsjmmswmdwb0rklrc0yhydcsghp9";

meta = with stdenv.lib; {
description = "Serverless Information Tracker";
homepage = https://sit.fyi/;
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ dywedir yrashk ];
platforms = platforms.all;
# Upstream has not had a release in several years, and dependencies no
# longer compile with the latest Rust compiler.
broken = true;
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/containerd/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@ with lib;

buildGoPackage rec {
pname = "containerd";
version = "1.2.6";
version = "1.2.13";

src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
sha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357";
sha256 = "1rac3iak3jpz57yarxc72bxgxvravwrl0j6s6w2nxrmh2m3kxqzn";
};

goPackagePath = "github.com/containerd/containerd";
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/docker-slim/default.nix
Original file line number Diff line number Diff line change
@@ -6,15 +6,15 @@

buildGoPackage rec {
pname = "docker-slim";
version = "1.27.0";
version = "1.28.0";

goPackagePath = "github.com/docker-slim/docker-slim";

src = fetchFromGitHub {
owner = "docker-slim";
repo = "docker-slim";
rev = version;
sha256 = "1pd9sz981qgr5lx6ikrhdp0n21nyrnpjpnyl8i4r2jx35zr8b5q8";
sha256 = "1yqg7ngrgq1382clyaal40v7rg9p54hyf78mdrzql454yzxfa819";
};

subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
5 changes: 5 additions & 0 deletions pkgs/applications/virtualization/rkt/default.nix
Original file line number Diff line number Diff line change
@@ -69,5 +69,10 @@ in stdenv.mkDerivation rec {
license = licenses.asl20;
maintainers = with maintainers; [ ragge steveej ];
platforms = [ "x86_64-linux" ];
knownVulnerabilities = [
"CVE-2019-10144: processes run with `rkt enter` are given all capabilities during stage 2"
"CVE-2019-10145: processes run with `rkt enter` do not have seccomp filtering during stage 2"
"CVE-2019-10147: processes run with `rkt enter` are not limited by cgroups during stage 2"
];
};
}
5 changes: 1 addition & 4 deletions pkgs/applications/window-managers/dwm/dwm-status.nix
Original file line number Diff line number Diff line change
@@ -21,10 +21,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "0l6x59bzzilc78gsi5rlgq9zjvp8qjphfsds776ljzmkbdq8q4iz";
cargoSha256 = "0xybd6110b29ghl66kxfs64704qlhnn9jb5vl7lfk9sv62cs564i";

postInstall = lib.optionalString (bins != []) ''
wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}"
6 changes: 3 additions & 3 deletions pkgs/development/libraries/cimg/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "cimg";
version = "2.8.3";
version = "2.8.4";

src = fetchurl {
url = "http://cimg.eu/files/CImg_${version}.zip";
sha256 = "0k7cra95v46i1q3rvklrxxhz3z10yql1ysvfrapcas0m4z6f94ld";
sha256 = "1y4j2dmk4nnc5rx65c2px7r0nfq5117pmqpvi7klp9wmgcjs29gf";
};

nativeBuildInputs = [ unzip ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "A small, open source, C++ toolkit for image processing";
homepage = http://cimg.eu/;
homepage = "http://cimg.eu/";
license = licenses.cecill-c;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.unix;
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gdal/default.nix
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "gdal";
version = "3.0.3";
version = "3.0.4";

src = fetchFromGitHub {
owner = "OSGeo";
repo = "gdal";
rev = "v${version}";
sha256 = "1rbyxmgmp27a5wvm4g70jr79bazhdl8q9rcch2b78m73njdv73xa";
sha256 = "00a7q9wv8s1bmdhqxvixkq2afr8aibg3pkc76gg50r8lavf6j84c";
};

sourceRoot = "source/gdal";
6 changes: 3 additions & 3 deletions pkgs/development/libraries/libzdb/default.nix
Original file line number Diff line number Diff line change
@@ -2,20 +2,20 @@

stdenv.mkDerivation rec
{
version = "3.1";
version = "3.2.1";
pname = "libzdb";

src = fetchurl
{
url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz";
sha256 = "1596njvy518x7vsvsykmnk1ky82x8jxd6nmmp551y6hxn2qsn08g";
sha256 = "1w9zzpgw3qzirsy5g4aaq1469kdq46gr2nhvrs3xqlwz1adbb9xr";
};

buildInputs = [ sqlite ];

meta =
{
homepage = http://www.tildeslash.com/libzdb/;
homepage = "http://www.tildeslash.com/libzdb/";
description = "A small, easy to use Open Source Database Connection Pool Library";
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
11 changes: 4 additions & 7 deletions pkgs/development/tools/cloudflare-wrangler/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin
}:
{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }:

rustPlatform.buildRustPackage rec {
pname = "cloudflare-wrangler";
@@ -8,13 +7,11 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "cloudflare";
repo = "wrangler";
rev = "v" + version;
rev = "v${version}";
sha256 = "0lh06cnjddmy5h5xvbkg8f97vw2v0wr5fi7vrs3nnidiz7x4rsja";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
cargoSha256 = "0s07143vsrb2vwj4rarx5w3wcz1zh0gi8al6cdrfqyl7nhm1mshm";
cargoSha256 = "1q7vilh0bynhdz5bbpig5ibaqvk2153n07gmc715qb80w92sjw7w";

nativeBuildInputs = [ pkg-config ];

@@ -29,7 +26,7 @@ rustPlatform.buildRustPackage rec {
doCheck = false;

meta = with stdenv.lib; {
description = "A CLI tool designed for folks who are interested in using Cloudflare Workers.";
description = "A CLI tool designed for folks who are interested in using Cloudflare Workers";
homepage = "https://github.com/cloudflare/wrangler";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ ];
5 changes: 1 addition & 4 deletions pkgs/development/tools/git-series/default.nix
Original file line number Diff line number Diff line change
@@ -15,10 +15,7 @@ buildRustPackage rec {
sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "16qjbvppc01yxk8x9jk7gs8jaag5nkfl30j3lyv3dc27vv9mckjv";
cargoSha256 = "0ijgx8fksg2najb336dhddxlqfzc338f9ylydkpw6b39k72mm00d";

cargoPatches = [
(fetchpatch {
6 changes: 3 additions & 3 deletions pkgs/development/tools/java/cfr/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "cfr";
version = "0.148";
version = "0.149";

src = fetchurl {
url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
sha256 = "04nhbzcb0n5xckkbl1rz4xa2bz53hrlm938wrh0gfkzrwwgzj1ql";
sha256 = "1jksjr1345wj42nfad7k6skvpg5qsm4xgjdwzb90zhn27ddkns6v";
};

nativeBuildInputs = [ makeWrapper ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
Java beta 103 changes), Java 7 String switches etc, but is written
entirely in Java 6.
'';
homepage = http://www.benf.org/other/cfr/;
homepage = "http://www.benf.org/other/cfr/";
license = licenses.mit;
platforms = platforms.all;
};
5 changes: 1 addition & 4 deletions pkgs/development/tools/rust/cargo-geiger/default.nix
Original file line number Diff line number Diff line change
@@ -15,10 +15,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0kvmjahyx5dcjhry2hkvcshi0lbgipfj0as74a3h3bllfvdfkkg0";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "0aykhhxk416p237safmqh5dhwjgrhvgc6zikkmxi9rq567ypp914";
cargoSha256 = "0v50fkyf0a77l7whxalwnfqfi8lxy82z2gpd0fa0ib80qjla2n5z";
cargoPatches = [ ./cargo-lock.patch ];

# Multiple tests require internet connectivity, so they are disabled here.
2 changes: 0 additions & 2 deletions pkgs/development/tools/rust/cargo-make/default.nix
Original file line number Diff line number Diff line change
@@ -24,8 +24,6 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];

legacyCargoFetcher = false;

cargoSha256 = "1x0lb68d47nhggnj7jf90adz7shb0cg305mavgqvxizd2s9789dx";

# Some tests fail because they need network access.
Loading