Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a456fbfeed62
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 524e16554bc4
Choose a head ref
  • 7 commits
  • 4 files changed
  • 2 contributors

Commits on Oct 21, 2019

  1. buildRustPackage: support checkFlags and checkFlagsArray

    @andir
    andir committed Oct 21, 2019
    Copy the full SHA
    7391a7d View commit details

  2. rust-cbindgen: skip expand tests 

    The expand tests require unstable rust features.
    @andir
    andir committed Oct 21, 2019
    Copy the full SHA
    2deef75 View commit details

  3. rust-cbdindgen: 0.9.0 -> 0.9.1

    @andir
    andir committed Oct 21, 2019
    Copy the full SHA
    f19920f View commit details

  4. nss: 3.46 -> 3.46.1

    @andir
    andir committed Oct 21, 2019

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    b4f278a View commit details

  5. sqlite: 3.28.0 -> 3.30.0 

    Also bumps sqlite3_analyze as those have to be kept in sync
    @andir
    andir committed Oct 21, 2019
    Copy the full SHA
    6101751 View commit details

  6. firefox: 69.0.2 -> 70.0

    @andir
    andir committed Oct 21, 2019
    Copy the full SHA
    1b2b476 View commit details

Commits on Oct 22, 2019

  1. Merge pull request #71580 from andir/firefox-70 

    firefox 70
    @FRidh
    FRidh authored Oct 22, 2019
    Copy the full SHA
    524e165 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -17,10 +17,10 @@ rec {

firefox = common rec {
pname = "firefox";
ffversion = "69.0.2";
ffversion = "70.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "2ag1syrvlkch7vl151hkq8abf86p9v6b6gmgcbh26b8wfva1p1ss1x09h4w50zmcc6jq4q5mcxgf1sd9zna552jl90k1y4rqvrrzwl6";
sha512 = "1rjji7w0rf4b7h6hyllwav1xcbaiv37jmf5s0n0c3cwf9b76yhf8nhygm1a97m26f6rvbmhcv0dx4l8bh06cz9mcbbxy4lhsn43sr62";
};

patches = [
4 changes: 2 additions & 2 deletions pkgs/development/libraries/nss/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ let
url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
version = "3.46";
version = "3.46.1";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;

in stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
sha256 = "1vqcl6wxn2nsm2fmlwzmxyagrsj1p1y9bc54b2i2nq45s94rcsbb";
sha256 = "0l9ns44rlkp1bpblplspfbqmyhb8rhvc89y56kqh725rgpny1xrv";
};

depsBuildBuild = [ buildPackages.stdenv.cc ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/sqlite/analyzer.nix
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@ in

stdenv.mkDerivation rec {
pname = "sqlite-analyzer";
version = "3.28.0";
version = "3.30.0";

src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2019/sqlite-src-${archiveVersion version}.zip";
sha256 = "15v57b113bpgcshfsx5jw93szar3da94rr03i053xhl15la7jllh";
sha256 = "0d4i87q0f618pmrgax0mr5x7m8bywikrwjvixag3biyhgl5rx7fd";
};

nativeBuildInputs = [ unzip ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/sqlite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,12 +10,12 @@ in

stdenv.mkDerivation rec {
pname = "sqlite";
version = "3.28.0";
version = "3.30.0";

# NB! Make sure to update analyzer.nix src (in the same directory).
src = fetchurl {
url = "https://sqlite.org/2019/sqlite-autoconf-${archiveVersion version}.tar.gz";
sha256 = "1hxpi45crbqp6lacl7z611lna02k956m9bsy2bjzrbb2y23546yn";
sha256 = "0n7w839y55dc3qqf2zv8xk6238cc6mpx24q4w5amwic7g96cza70";
};

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