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: db4ccde60dcb
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: 08cc4cd7028c
Choose a head ref
  • 9 commits
  • 6 files changed
  • 9 contributors

Commits on Feb 19, 2020

  1. Copy the full SHA
    4478766 View commit details

Commits on Mar 6, 2020

  1. notable: update license to unfree

    Notable used to be released under AGPL-v3 until v1.5.x but is is now
    nonfree.
    
    See https://github.com/notable/notable/blob/master/SOURCE_CODE.md
    lsix committed Mar 6, 2020
    Copy the full SHA
    08edf7f View commit details
  2. newlib: 3.1.0 -> 3.3.0

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

Commits on Mar 7, 2020

  1. Copy the full SHA
    4a2f72f View commit details
  2. Copy the full SHA
    88b1611 View commit details
  3. Merge pull request #81935 from r-ryantm/auto-update/newlib

    newlib: 3.1.0 -> 3.3.0
    nlewo authored Mar 7, 2020
    Copy the full SHA
    ae68f39 View commit details
  4. Merge pull request #80497 from lopsided98/bootstrap-libssp

    make-bootstrap-tools: add libssp to allow stack protector to work
    grahamc authored Mar 7, 2020
    Copy the full SHA
    47a7741 View commit details
  5. Merge pull request #81987 from bhipple/u/rust-cargo-gir-rs

    gir-rs: upgrade cargo fetcher and cargoSha256
    Ekleog authored Mar 7, 2020
    Copy the full SHA
    7d514da View commit details

Commits on Mar 8, 2020

  1. Merge pull request #81932 from lsix/update-notable-license

    notable: update license to unfree
    rnhmjoj authored Mar 8, 2020
    Copy the full SHA
    08cc4cd View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/misc/notable/default.nix
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ appimageTools.wrapType2 rec {
meta = with lib; {
description = "The markdown-based note-taking app that doesn't suck";
homepage = "https://github.com/notable/notable";
license = licenses.agpl3;
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ dtzWill ];
};
4 changes: 2 additions & 2 deletions pkgs/development/misc/newlib/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, buildPackages }:

let version = "3.1.0";
let version = "3.3.0";
in stdenv.mkDerivation {
pname = "newlib";
inherit version;
src = fetchurl {
url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz";
sha256 = "0ahh3n079zjp7d9wynggwrnrs27440aac04340chf1p9476a2kzv";
sha256 = "0ricyx792ig2cb2x31b653yb7w7f7mf2111dv5h96lfzmqz9xpaq";
};

depsBuildBuild = [ buildPackages.stdenv.cc ];
5 changes: 1 addition & 4 deletions pkgs/development/tools/gir/default.nix
Original file line number Diff line number Diff line change
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1kn5kgdma9j6dwpmv6jmydak7ajlgdkw9sfkh3q7h8c2a8yikvxr";
};

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

cargoSha256 = "1ybd9h2f13fxmnkzbacd39rcyzjcjd2ra52y8kncg1s0dc0m8rjb";
cargoSha256 = "048qhlc4f5khxi7dnakgqkhgww44r6h3mlx2fm7y2wqivr3rj8p1";

meta = with stdenv.lib; {
description = "Tool to generate rust bindings and user API for glib-based libraries";
Loading