Merge commit 'b47873026c7e356a340d0e1de7789d4e8428ac66'

54 files changed, 388 insertions, 580 deletions

diff --git a/nixpkgs/pkgs/development/libraries/agda/Agda-Sheaves/default.nix b/nixpkgs/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
deleted file mode 100644
index 513b79e63938..000000000000
--- a/nixpkgs/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, agda, fetchgit }:
-
-agda.mkDerivation (self: rec {
-  version = "8a06162a8f0f7df308458db91d720cf8f7345d69";
-  name = "Agda-Sheaves-${version}";
-  src = fetchgit {
-    url = "https://github.com/jonsterling/Agda-Sheaves.git";
-    rev = version;
-    sha256 = "1gjffyyi4gk9z380yw2wm0jg0a01zy8dnw7jrcc7222swisk5s2d";
-  };
-
-  everythingFile = "sheaves.agda";
-  topSourceDirectories = [ "../$sourceRoot" ];
-  sourceDirectories = [];
-
-  meta = {
-    homepage = "https://github.com/jonsterling/Agda-Sheaves";
-    description = "Sheaves in Agda";
-    license = stdenv.lib.licenses.cc-by-40;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ ];
-    broken = true;  # replaced by constructive-sheaf-semantics
-  };
-})
diff --git a/nixpkgs/pkgs/development/libraries/agda/TotalParserCombinators/contextfile b/nixpkgs/pkgs/development/libraries/agda/TotalParserCombinators/contextfile
deleted file mode 100644
index 46743cba3b67..000000000000
--- a/nixpkgs/pkgs/development/libraries/agda/TotalParserCombinators/contextfile
+++ /dev/null
@@ -1,259 +0,0 @@
-
-Context:
-
-[Updated the code in response to changes to Agda.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319181310
- Ignore-this: 52b9ff613d7f10b0c8f45591a0759d07
-] 
-
-[Rolled back most of "Updated the code in response to changes to Agda".
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319101420
- Ignore-this: c2ea7bdf79848235fa3ea64ebda116eb
- * One of the Agda changes has been reverted.
-] 
-
-[Removed an outdated comment.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217162945
- Ignore-this: 3ff7732335750305fe220e65693f0cbf
-] 
-
-[Added the simplification "nonempty (return x) → fail".
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217161718
- Ignore-this: 56ad6a68c314446d8986a8c1b49655d0
-] 
-
-[Added Nonempty.nonempty-return.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217161629
- Ignore-this: 68829d3f9a248272c46848daa05ccfe3
-] 
-
-[Updated the copyright year range.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150212154744
- Ignore-this: 3410a12ca1f9de825b00e692b136d500
-] 
-
-[Updated the code in response to changes to Agda.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150212152207
- Ignore-this: 683b5eeca5fa9c8490bceaf68c23a204
-] 
-
-[Updated the copyright year range.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128223227
- Ignore-this: 31d3f5e4fdd6fbfad9758d9bfd0d3a3e
-] 
-
-[Updated the code in response to changes to Agda and the library.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128223205
- Ignore-this: 6392ec67aab2c534a7195abed55be47
-] 
-
-[Updated code to reflect changes to Agda.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20140425121055
- Ignore-this: 54d80fd647cb897eef85f57e9172f7db
-] 
-
-[Workaround for (possible) Agda bug.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20140228200347
- Ignore-this: b17884ad17a3bdb7faff678622365a8
-] 
-
-[Updated code to reflect changes to library API.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130307134644
- Ignore-this: 50d070a22a6796b9acdf19d44ba5de16
-] 
-
-[Updated code to reflect changes to Agda and the library API.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130228122951
- Ignore-this: 761dc4d85683a59cc3667a8706c88093
-] 
-
-[Turned _◇_ into a constructor.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120316125431
- Ignore-this: 41b492c3106a575f28f146253f78a5ae
-] 
-
-[Updated code to reflect changes to Agda.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120316125416
- Ignore-this: e77d817d8b391c3b4806119d10848eb3
-] 
-
-[Updated code to reflect changes to Agda.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120215103344
- Ignore-this: 467716429d5553cd122722108ea82a08
-] 
-
-[Modified a comment.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120215103319
- Ignore-this: e57d4911f692f8a96a80017d910efc5f
-] 
-
-[Updated code to reflect change to library API.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20111006160229
- Ignore-this: 5359da54e7e6e0f92983fa3ecaccebf3
-] 
-
-[Updated code to reflect changes to Agda and the library API.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20111003170117
- Ignore-this: cbdd35172e372779e12642985cf17268
-] 
-
-[Rolled back addition of inversion lemmas.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110930150912
- Ignore-this: 9c9b083f0afcf95aaaa55a01d871274e
-] 
-
-[Added inversion lemmas, implemented other lemmas using these lemmas.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110930150842
- Ignore-this: 19b832c3f9e14d1e713b5911c094a130
- + This change was a response to a change to Agda's pattern matching
-   machinery. Subsequently the machinery was made more liberal again,
-   making this change unnecessary.
-] 
-
-[Updated code to reflect changes to library API.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110517220158
- Ignore-this: ea9771a5014a25cb20afc2118638f8b5
-] 
-
-[Updated code to reflect changes to Agda.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110512124425
- Ignore-this: 97b154661679f574f6ab914583b14580
-] 
-
-[Proved that many constructions preserve various preorders.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110313012617
- Ignore-this: 8008efaff967c228448baa33b82edb81
-] 
-
-[Updated code to reflect changes to library API.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110313002106
- Ignore-this: 94799ba1ae411e59fd8c6c7eac3b8dfb
-] 
-
-[Simplified TotalRecognisers.LeftRecursion.MatchingParentheses.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110118102159
- Ignore-this: 1e01a8092b0c0124979ffc5fe17a245c
-] 
-
-[Added TotalRecognisers.LeftRecursion.MatchingParentheses.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110118102146
- Ignore-this: 13a3bc91425364e26c3047561655bb25
-] 
-
-[Added a simplifying backend.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101229012716
- Ignore-this: 9ac7ae21cd44c099633678a994fb9a3
-] 
-
-[Fixed another "bug" in the deep simplifier.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101229010854
- Ignore-this: e258adf963436ef715242db23c6808e
- + Sometimes the first layer of bind's right-hand argument was not
-   simplified.
-] 
-
-[Made simplify₁ public and changed its type.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228235603
- Ignore-this: d39b8453a15089126261e098080223c6
-] 
-
-[Deep simplification no longer adds casts.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228192850
- Ignore-this: 2ba016825adfa3a1e36922869eabfd39
-] 
-
-[The first constructor in a simplified parser can no longer be a cast.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228175822
- Ignore-this: ce3e38cc0b9a096aa436655c9013ae97
-] 
-
-[Modified the outline.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228173414
- Ignore-this: f8866e69f6d1a344e79fb6f708dfa4c
-] 
-
-[Added an example: a right recursive expression grammar.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228173159
- Ignore-this: 9a4d732b451cca08ba19aac5d115c678
-] 
-
-[Rearranged the code.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228172209
- Ignore-this: 50fa29406d0f150669ff3feec4dbe513
-] 
-
-[Renamed same-bag/set to (initial-bag-)cong.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228170706
- Ignore-this: dd3ce43d77dde74cc2428d2568dd2d30
-] 
-
-[Added TotalParserCombinators.Force.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228153638
- Ignore-this: 3b6ff6ea20df0c1293494f06845d17eb
-] 
-
-[Proved that uses of subst can be erased.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228153621
- Ignore-this: f503ba495b923ae521718b6957167128
-] 
-
-[The deep simplifier no longer skips layers.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228141138
- Ignore-this: 733a4a4a9aa0f890ad1740ecfc6a599f
-] 
-
-[Documented that the deep simplifier misses every second layer.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228121910
- Ignore-this: 8a0baf25b12f63f8748dbc1d16affacf
-] 
-
-[The simplifier now applies the token-bind rule more often.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227165413
- Ignore-this: 40132fa6f19602886bbe29aadd8a683c
-] 
-
-[Switched back to deep simplification, now with a proper proof.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227125434
- Ignore-this: ccc46e82f6f9c6c2a27ddb43d315f7dd
-] 
-
-[Simplified the soundness proof.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227123839
- Ignore-this: fb6826dd9836e34fc3bfdce2928ba13d
-] 
-
-[Made some _≈[_]P_ constructors conditionally coinductive.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227123827
- Ignore-this: f521f70475403697229051b62343a080
- + The structure of the soundness proof was also changed.
-] 
-
-[Unified And, AsymmetricChoice and Not.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101225103109
- Ignore-this: 5ae8b80e1505fe6e707bb2307d22688c
-] 
-
-[Modified some comments.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101225101051
- Ignore-this: e812d8c3e9720895c368f7a286f8315c
-] 
-
-[Modified a comment.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101223202647
- Ignore-this: 16ea5dc01a4cbe0fe38714b2e4b7ff6
-] 
-
-[Updated code to reflect changes to library API.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101107162658
- Ignore-this: 9e38a10a9997c9825ece6ad9f871b673
-] 
-
-[Added an alternative backend for TotalRecognisers.Simple.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101020183743
- Ignore-this: a111a89e0c237e132b649561000f53d6
-] 
-
-[TAG Code corresponding to the paper "Total Parser Combinators" (4).
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20100928013815
- Ignore-this: 45ccc28373ed3974047315613eb14833
-] 
diff --git a/nixpkgs/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/nixpkgs/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
deleted file mode 100644
index 97cceebc1b64..000000000000
--- a/nixpkgs/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, agda, fetchdarcs, AgdaStdlib }:
-
-agda.mkDerivation (self: rec {
-  version = "2015-03-19";
-  name = "TotalParserCombinators-${version}";
-
-  src = fetchdarcs {
-    url = "http://www.cse.chalmers.se/~nad/repos/parser-combinators.code/";
-    context = ./contextfile;
-    sha256 = "0jlbz8yni6i7vb2qsd41bdkpchqirvc5pavckaf97z7p4gqi2mlj";
-  };
-
-  buildDepends = [ AgdaStdlib ];
-  everythingFile = "TotalParserCombinators.agda";
-  sourceDirectories = [];
-  topSourceDirectories = [ "../$sourceRoot" ];
-
-  meta = with stdenv.lib; {
-    homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-parser-combinators.html";
-    description = "A monadic parser combinator library which guarantees termination of parsing";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with maintainers; [ ];
-    broken = true;
-  };
-})
diff --git a/nixpkgs/pkgs/development/libraries/agda/agda-base/default.nix b/nixpkgs/pkgs/development/libraries/agda/agda-base/default.nix
deleted file mode 100644
index 678b3a28dc7e..000000000000
--- a/nixpkgs/pkgs/development/libraries/agda/agda-base/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, agda, fetchurl }:
-
-agda.mkDerivation (self: rec {
-  version = "0.1";
-  name = "agda-base-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/pcapriotti/agda-base/archive/v${version}.tar.gz";
-    sha256 = "124h06p7jdiqr2x6r46sfab9r0cgb0fznr2qs5i1psl5yf3z74h8";
-  };
-
-  sourceDirectories = [ "./." ];
-  everythingFile = "README.agda";
-
-  meta = {
-    homepage = "https://github.com/pcapriotti/agda-base";
-    description = "Base library for HoTT in Agda";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ ];
-    broken = true;  # largely replaced by HoTT-Agda
-  };
-})
diff --git a/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix b/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix
new file mode 100644
index 000000000000..9eb68b5a64ac
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix
@@ -0,0 +1,28 @@
+{ lib, mkDerivation, fetchFromGitHub, standard-library }:
+
+mkDerivation rec {
+  version = "0.1";
+  pname = "agda-categories";
+
+  src = fetchFromGitHub {
+    owner = "agda";
+    repo = "agda-categories";
+    rev = "release/v${version}";
+    sha256 = "0m4pjy92jg6zfziyv0bxv5if03g8k4413ld8c3ii2xa8bzfn04m2";
+  };
+
+  buildInputs = [ standard-library ];
+
+  meta = with lib; {
+    inherit (src.meta) homepage;
+    description = "A new Categories library";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    # agda categories takes a lot of memory to build.
+    # This can be removed if this is eventually fixed upstream.
+    hydraPlatforms = [];
+    # Waiting for release 0.2 for this to work
+    broken = true;
+    maintainers = with maintainers; [ alexarice turion ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix b/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix
index 86f21ad9b19c..2bec10c02dd1 100644
--- a/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix
@@ -1,23 +1,32 @@
-{ stdenv, agda, fetchgit }:
+{ stdenv, mkDerivation, fetchFromGitHub }:
 
-agda.mkDerivation (self: rec {
-  version = "eacc961c2c312b7443109a7872f99d55557df317";
-  name = "agda-prelude-${version}";
+mkDerivation rec {
+  version = "compat-2.6.0";
+  pname = "agda-prelude";
 
-  src = fetchgit {
-    url = "https://github.com/UlfNorell/agda-prelude.git";
+  src = fetchFromGitHub {
+    owner = "UlfNorell";
+    repo = "agda-prelude";
     rev = version;
-    sha256 = "0iql67hb1q0fn8dwkcx07brkdkxqfqrsbwjy71ndir0k7qzw7qv2";
+    sha256 = "0brg61qrf8izqav80qpx77dbdxvlnsxyy0v7hmlrmhg68b5lp38y";
   };
 
-  topSourceDirectories = [ "src" ];
-  everythingFile = "src/Prelude.agda";
+  preConfigure = ''
+    cd test
+    make everything
+    mv Everything.agda ..
+    cd ..
+  '';
+
+  everythingFile = "./Everything.agda";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/UlfNorell/agda-prelude";
     description = "Programming library for Agda";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
-    maintainers = with maintainers; [ mudri ];
+    # broken since Agda 2.6.1
+    broken = true;
+    maintainers = with maintainers; [ mudri alexarice turion ];
   };
-})
+}
diff --git a/nixpkgs/pkgs/development/libraries/agda/bitvector/default.nix b/nixpkgs/pkgs/development/libraries/agda/bitvector/default.nix
deleted file mode 100644
index bf9798557b10..000000000000
--- a/nixpkgs/pkgs/development/libraries/agda/bitvector/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, agda, fetchgit, AgdaStdlib }:
-
-agda.mkDerivation (self: rec {
-  version = "f1c173313f2a41d95a8dc6053f9365a24690e18d";
-  name = "bitvector-${version}";
-
-  src = fetchgit {
-    url = "https://github.com/copumpkin/bitvector.git";
-    rev = version;
-    sha256 = "0jb421lxvyxz26sxa81qjmn1gfcxfh0fmbq128f0kslqhiiaqfrh";
-  };
-
-  buildDepends = [ AgdaStdlib ];
-  sourceDirectories = [ "Data" ];
-
-  meta = {
-    homepage = "https://github.com/copumpkin/bitvector";
-    description = "Sequences of bits and common operations on them";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ ];
-    broken = true;
-  };
-})
diff --git a/nixpkgs/pkgs/development/libraries/agda/categories/default.nix b/nixpkgs/pkgs/development/libraries/agda/categories/default.nix
deleted file mode 100644
index fef01ee9be70..000000000000
--- a/nixpkgs/pkgs/development/libraries/agda/categories/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, agda, fetchgit, AgdaStdlib }:
-
-agda.mkDerivation (self: rec {
-  version = "33409120d071656f5198c658145889ae2e86249c";
-  name = "categories-${version}";
-
-  src = fetchgit {
-    url = "https://github.com/copumpkin/categories.git";
-    rev = version;
-    sha256 = "15x834f7jn2s816b9vz8nm8p424ppzv6v9nayaawyl43qmaaaa5p";
-  };
-
-  buildDepends = [ AgdaStdlib ];
-  sourceDirectories = [ "Categories" "Graphs" ];
-
-  meta = {
-    homepage = "https://github.com/copumpkin/categories";
-    description = "Categories parametrized by morphism equality, in Agda";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ ];
-    broken = true; # doesn't work due to new agdastdlib, see #9471
-  };
-})
diff --git a/nixpkgs/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/nixpkgs/pkgs/development/libraries/agda/iowa-stdlib/default.nix
index 23013bfbc324..55cd6a742e54 100644
--- a/nixpkgs/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/iowa-stdlib/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, agda, fetchFromGitHub }:
+{ stdenv, mkDerivation, fetchFromGitHub }:
 
-agda.mkDerivation (self: rec {
+mkDerivation (rec {
   version = "1.5.0";
-  name = "agda-iowa-stdlib-${version}";
+  pname = "iowa-stdlib";
 
   src = fetchFromGitHub {
     owner = "cedille";
@@ -11,17 +11,21 @@ agda.mkDerivation (self: rec {
     sha256 = "0dlis6v6nzbscf713cmwlx8h9n2gxghci8y21qak3hp18gkxdp0g";
   };
 
-  sourceDirectories = [ "./." ];
+  libraryFile = "";
+  libraryName = "IAL-1.3";
+
   buildPhase = ''
     patchShebangs find-deps.sh
     make
   '';
 
   meta = {
-    homepage = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/";
+    homepage = "https://github.com/cedille/ial";
     description = "Agda standard library developed at Iowa";
     license = stdenv.lib.licenses.free;
     platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    # broken since Agda 2.6.1
+    broken = true;
+    maintainers = with stdenv.lib.maintainers; [ alexarice turion ];
   };
 })
diff --git a/nixpkgs/pkgs/development/libraries/agda/pretty/contextfile b/nixpkgs/pkgs/development/libraries/agda/pretty/contextfile
deleted file mode 100644
index 2ea20153bbcc..000000000000
--- a/nixpkgs/pkgs/development/libraries/agda/pretty/contextfile
+++ /dev/null
@@ -1,43 +0,0 @@
-
-Context:
-
-[Updated the code in response to a change to Agda.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319181428
- Ignore-this: f83c3dccfe25a2a5b9d0437d1dce0ec0
-] 
-
-[Rolled back most of "Updated the code in response to changes to Agda".
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319101413
- Ignore-this: 5a26cf9cf83d0d146cca0c15c857d20c
- * One of the Agda changes has been reverted.
-] 
-
-[Updated the code in response to changes to Agda.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217101656
- Ignore-this: a12921aebbe0fb575ef391ba5789a391
-] 
-
-[Modified the copyright year range.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150213144338
- Ignore-this: 1d1b22457dd6dadcb47f5d7f3eea062
-] 
-
-[Restored Grammar.Abstract and Grammar.Non-terminal.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130727225031
- Ignore-this: ddccb15caa7a3c26e973997ffdb4eec1
-] 
-
-[Modified the copyright year range.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128164015
- Ignore-this: b9c6dddc965738aa2a7670c4c18da67f
-] 
-
-[Updated the code to reflect changes to the library API.
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128163950
- Ignore-this: 8094c47f23cef0fcc596ad0c18a92b56
-] 
-
-[TAG Correct-by-Construction Pretty-Printing (2013-07-28)
-Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130727224432
- Ignore-this: 6aab9b2e6b638457767c8821f3c27cb4
-] 
diff --git a/nixpkgs/pkgs/development/libraries/agda/pretty/default.nix b/nixpkgs/pkgs/development/libraries/agda/pretty/default.nix
deleted file mode 100644
index de4cfaa6637b..000000000000
--- a/nixpkgs/pkgs/development/libraries/agda/pretty/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, agda, fetchdarcs, AgdaStdlib }:
-
-agda.mkDerivation (self: rec {
-  version = "2015-03-19";
-  name = "pretty-${version}";
-
-  src = fetchdarcs {
-    url = "http://www.cse.chalmers.se/~nad/repos/pretty/";
-    context = ./contextfile;
-    sha256 = "0zmwh9kln7ykpmkx1qhqz64qm2arq62b17vs5fswnxk7mqxsmrf0";
-  };
-
-  buildDepends = [ AgdaStdlib ];
-  everythingFile = "Pretty.agda";
-  sourceDirectories = [];
-  topSourceDirectories = [ "../$sourceRoot" ];
-
-  meta = with stdenv.lib; {
-    homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-correct-pretty.html";
-    description = "Correct-by-Construction Pretty-Printing";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with maintainers; [ ];
-    broken = true; # 2018-04-11
-  };
-})
diff --git a/nixpkgs/pkgs/development/libraries/agda/agda-stdlib/default.nix b/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix
index 6647677f71c0..4bff585ac3a9 100644
--- a/nixpkgs/pkgs/development/libraries/agda/agda-stdlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, agda, fetchFromGitHub, ghcWithPackages }:
+{ stdenv, mkDerivation, fetchFromGitHub, ghcWithPackages }:
 
-agda.mkDerivation (self: rec {
-  version = "1.1";
-  name = "agda-stdlib-${version}";
+mkDerivation rec {
+  pname = "standard-library";
+  version = "1.3";
 
   src = fetchFromGitHub {
     repo = "agda-stdlib";
     owner = "agda";
     rev = "v${version}";
-    sha256 = "190bxsy92ffmvwpmyyg3lxs91vyss2z25rqz1w79gkj56484cy64";
+    sha256 = "18kl20z3bjfgx5m3nvrdj5776qmpi7jl2p12pqybsls2lf86m0d5";
   };
 
   nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
@@ -16,13 +16,11 @@ agda.mkDerivation (self: rec {
     runhaskell GenerateEverything.hs
   '';
 
-  topSourceDirectories = [ "src" ];
-
   meta = with stdenv.lib; {
     homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
     description = "A standard library for use with the Agda compiler";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
-    maintainers = with maintainers; [ jwiegley mudri ];
+    maintainers = with maintainers; [ jwiegley mudri alexarice turion ];
   };
-})
+}
diff --git a/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix b/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix
index e415aa5e4f23..bb2645beda7f 100644
--- a/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lv2";
-  version = "1.16.0";
+  version = "1.18.0";
 
   src = fetchurl {
     url = "https://lv2plug.in/spec/${pname}-${version}.tar.bz2";
-    sha256 = "1ppippbpdpv13ibs06b0bixnazwfhiw0d0ja6hx42jnkgdyp5hyy";
+    sha256 = "0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh";
   };
 
   nativeBuildInputs = [ pkgconfig wafHook ];
diff --git a/nixpkgs/pkgs/development/libraries/cudd/cudd.patch b/nixpkgs/pkgs/development/libraries/cudd/cudd.patch
new file mode 100644
index 000000000000..152fa30997f9
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/cudd/cudd.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile.am b/Makefile.am
+index 45f216a..39c3c82 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,6 +3,9 @@ ACLOCAL_AMFLAGS = -I m4
+ include_HEADERS = cudd/cudd.h
+ if DDDMP
+ include_HEADERS += dddmp/dddmp.h
++include_HEADERS += util/util.h
++include_HEADERS += config.h
++include_HEADERS += mtr/mtr.h
+ endif
+ if OBJ
+ include_HEADERS += cplusplus/cuddObj.hh
diff --git a/nixpkgs/pkgs/development/libraries/cudd/default.nix b/nixpkgs/pkgs/development/libraries/cudd/default.nix
new file mode 100644
index 000000000000..6749d2e94c0f
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/cudd/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  pname = "cudd";
+  version = "3.0.0";
+
+  src = fetchurl {
+    url = "https://davidkebo.com/source/cudd_versions/cudd-3.0.0.tar.gz";
+    sha256 = "0sgbgv7ljfr0lwwwrb9wsnav7mw7jmr3k8mygwza15icass6dsdq";
+  };
+
+  configureFlags = [
+    "--enable-dddmp"
+    "--enable-obj"
+  ];
+
+  patches = [
+    ./cudd.patch
+  ];
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://davidkebo.com/cudd";
+    description = "Binary Decision Diagram (BDD) library";
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ chessai ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix
index 120a309b6561..089d5c4dcca0 100644
--- a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm
+{ stdenv, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm
 /*
  *  Licensing options (yes some are listed twice, filters and such are not listed)
  */
@@ -416,7 +416,7 @@ stdenv.mkDerivation rec {
     "--enable-cross-compile"
   ];
 
-  nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
+  nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ];
 
   buildInputs = [
     bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
@@ -444,6 +444,13 @@ stdenv.mkDerivation rec {
     cp -a tools/qt-faststart $out/bin/
   '';
 
+  postFixup = optionalString stdenv.isLinux ''
+    # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found.
+    # See the explanation in addOpenGLRunpath.
+    addOpenGLRunpath $out/lib/libavcodec.so
+    addOpenGLRunpath $out/lib/libavutil.so
+  '';
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/development/libraries/gamin/default.nix b/nixpkgs/pkgs/development/libraries/gamin/default.nix
index b1be17abf379..38451571d8b6 100644
--- a/nixpkgs/pkgs/development/libraries/gamin/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gamin/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (rec {
     ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch
     ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
       name = "fix-pthread-mutex.patch";
-      url = "https://git.alpinelinux.org/cgit/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8";
+      url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8";
       sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz";
     });
 
diff --git a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix
index 9689bf98b31c..882c9f8c3f54 100644
--- a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "glib-networking";
-  version = "2.64.1";
+  version = "2.64.2";
 
   outputs = [ "out" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0wmg5n2h0r1rcdmp4w48akqlsbpjrjrj6p59g5ylc5yqyzg4dhx4";
+    sha256 = "19wmyv7j355z1wk650fyygadbwwmmhqggr54845rn7smbiqz1pj5";
   };
 
   patches = [
diff --git a/nixpkgs/pkgs/development/libraries/glibmm/default.nix b/nixpkgs/pkgs/development/libraries/glibmm/default.nix
index 6dcb6b3296aa..dff122d38d12 100644
--- a/nixpkgs/pkgs/development/libraries/glibmm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glibmm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "glibmm";
-  version = "2.62.0";
+  version = "2.64.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n";
+    sha256 = "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
index c1fa8af1271c..6a94944e9f18 100644
--- a/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gsettings-desktop-schemas";
-  version = "3.36.0";
+  version = "3.36.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "19hfjqzddkmvxg80v23xpbd1my2pzjalx3d56d2k4dk5521vcjkn";
+    sha256 = "1nf97vq07gadwdla6kws8z510xlmv0a7wlyqwwnhyagq7kjdnjq0";
   };
 
   passthru = {
diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix
index 3d618f09e382..1db37bc78790 100644
--- a/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix
@@ -105,8 +105,10 @@ let
       kdbusaddons = callPackage ./kdbusaddons.nix {};
       kdnssd = callPackage ./kdnssd.nix {};
       kguiaddons = callPackage ./kguiaddons.nix {};
+      kholidays = callPackage ./kholidays.nix {};
       ki18n = callPackage ./ki18n.nix {};
       kidletime = callPackage ./kidletime.nix {};
+      kirigami2 = callPackage ./kirigami2.nix {};
       kitemmodels = callPackage ./kitemmodels.nix {};
       kitemviews = callPackage ./kitemviews.nix {};
       kplotting = callPackage ./kplotting.nix {};
@@ -117,12 +119,11 @@ let
       networkmanager-qt = callPackage ./networkmanager-qt.nix {};
       oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
       prison = callPackage ./prison.nix {};
+      qqc2-desktop-style = callPackage ./qqc2-desktop-style.nix {};
       solid = callPackage ./solid.nix {};
       sonnet = callPackage ./sonnet.nix {};
       syntax-highlighting = callPackage ./syntax-highlighting.nix {};
       threadweaver = callPackage ./threadweaver.nix {};
-      kirigami2 = callPackage ./kirigami2.nix {};
-      kholidays = callPackage ./kholidays.nix {};
 
     # TIER 2
       kactivities = callPackage ./kactivities.nix {};
diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix
new file mode 100644
index 000000000000..ed372e01aeb2
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix
@@ -0,0 +1,15 @@
+{ mkDerivation, lib
+, extra-cmake-modules
+, qtquickcontrols2
+, qtx11extras
+, kconfig
+, kiconthemes
+, kirigami2
+}:
+
+mkDerivation {
+  name = "qqc2-desktop-style";
+  meta = { maintainers = with lib.maintainers; [ ttuegel ]; };
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtx11extras qtquickcontrols2 kconfig kiconthemes kirigami2 ];
+}
diff --git a/nixpkgs/pkgs/development/libraries/libcello/default.nix b/nixpkgs/pkgs/development/libraries/libcello/default.nix
index 1ef749c1740d..908c9cb15dd2 100644
--- a/nixpkgs/pkgs/development/libraries/libcello/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcello/default.nix
@@ -1,17 +1,21 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libcello-0.9.2";
+  pname = "libcello";
+  version = "2.1.0";
 
   src = fetchurl {
-    url = "http://libcello.org/static/${name}.tar.gz";
-    sha256 = "cd82639cb9b133119fd89a77a5a505a55ea5fcc8decfc53bee0725358ec8bad0";
+    url = "http://libcello.org/static/libCello-${version}.tar.gz";
+    sha256 = "0a1b2x5ni07vd9ridnl7zv7h2s32070wsphjy94qr066b99gdb29";
   };
 
+  makeFlags = [ "PREFIX=$(out)" ];
+
   meta = {
     homepage = "http://libcello.org/";
     description = "Higher level programming in C";
     license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.MostAwesomeDude ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libdvdread/default.nix b/nixpkgs/pkgs/development/libraries/libdvdread/default.nix
index c28ca339a65e..997018a29709 100644
--- a/nixpkgs/pkgs/development/libraries/libdvdread/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdvdread/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libdvdread";
-  version = "6.1.0";
+  version = "6.1.1";
 
   src = fetchurl {
     url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "033mnhq3mx0qz3z85vw01rz5wzmx5ynadl7q1wm2spvx3ryvs6sh";
+    sha256 = "15hpwbw3nm84y432l0j61w0zmqxplsyymfc52dry6nvwl44p6d9y";
   };
 
   buildInputs = [libdvdcss];
diff --git a/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix b/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix
index cc1c4b48e788..147b213735db 100644
--- a/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix
@@ -12,17 +12,17 @@ stdenv.mkDerivation rec {
   patches = [
     (fetchpatch {
       name = "10-execinfo.patch";
-      url = "https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1";
+      url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1";
       sha256 = "0lnphrad4vspyljnvmm62dyxj98vgp3wabj4w3vfzfph7j8piw7g";
     })
     (fetchpatch {
       name = "20-define-gnu-source.patch";
-      url = "https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1";
+      url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1";
       sha256 = "1mp8mc639b0h2s69m5z6s2h3q3n1zl298j9j0plzj7f979j76302";
     })
     (fetchpatch {
       name = "30-linux-makefile.patch";
-      url = "https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1";
+      url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1";
       sha256 = "1jwjz22z5cjy5h2bfghn62yl9ar8jiqhdvbwrcfavv17ihbhwcaf";
     })
   ];
diff --git a/nixpkgs/pkgs/development/libraries/libfive/default.nix b/nixpkgs/pkgs/development/libraries/libfive/default.nix
index fa275c0d7805..2670f94fbc2f 100644
--- a/nixpkgs/pkgs/development/libraries/libfive/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfive/default.nix
@@ -1,30 +1,41 @@
-{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, eigen,
-zlib, libpng, boost, qt5, guile
+{ lib
+, mkDerivation
+, wrapQtAppsHook
+, fetchFromGitHub
+, cmake
+, ninja
+, pkgconfig
+, eigen
+, zlib
+, libpng
+, boost
+, guile
 }:
 
-stdenv.mkDerivation {
-  pname = "libfive";
-  version = "2018-07-01";
+mkDerivation {
+  pname = "libfive-unstable";
+  version = "2020-02-15";
 
   src = fetchFromGitHub {
-    owner  = "libfive";
-    repo   = "libfive";
-    rev    = "0f517dde9521d751310a22f85ee69b2c84690267";
-    sha256 = "0bfxysf5f4ripgcv546il8wnw5p0d4s75kdjlwvj32549537hlz0";
+    owner = "libfive";
+    repo = "libfive";
+    rev = "5b7717a25064478cd6bdb190683566eaf4c7afdd";
+    sha256 = "102zw2n3vzv84i323is4qrwwqqha8v1cniw54ss8f4bq6dmic0bg";
   };
-  nativeBuildInputs = [ cmake ninja pkgconfig ];
-  buildInputs = [ eigen zlib libpng boost qt5.qtimageformats guile ];
+
+  nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkgconfig ];
+  buildInputs = [ eigen zlib libpng boost guile ];
 
   # Link "Studio" binary to "libfive-studio" to be more obvious:
   postFixup = ''
     ln -s "$out/bin/Studio" "$out/bin/libfive-studio"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile";
     homepage = "https://libfive.com/";
-    maintainers = with maintainers; [ hodapp ];
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
+    maintainers = with maintainers; [ hodapp kovirobi ];
+    license = with licenses; [ mpl20 gpl2Plus ];
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libfm/default.nix b/nixpkgs/pkgs/development/libraries/libfm/default.nix
index 9145d8fd8929..94476984de00 100644
--- a/nixpkgs/pkgs/development/libraries/libfm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfm/default.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
     "sysconfdir=${placeholder "out"}/etc"
   ];
 
+  # libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm
+  postInstall = optional (!extraOnly) ''
+     rm $out/lib/libfm-extra.so $out/lib/libfm-extra.so.* $out/lib/libfm-extra.la $out/lib/pkgconfig/libfm-extra.pc
+  '';
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix b/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix
index 075742e31393..1ff02a8709d4 100644
--- a/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libgdiplus";
-  version = "6.0.4";
+  version = "6.0.5";
 
   src = fetchFromGitHub {
     owner = "mono";
     repo = "libgdiplus";
     rev = version;
-    sha256 = "1pf3yhwq9qk0w3yv9bb8qlwwqkffg7xb4sgc8yqdnn6pa56i3vmn";
+    sha256 = "1387lgph5r17viv3rkf5hbksdn435njzmra7s17q0nzk2mkkm68c";
   };
 
   NIX_LDFLAGS = "-lgif";
diff --git a/nixpkgs/pkgs/development/libraries/libgsf/default.nix b/nixpkgs/pkgs/development/libraries/libgsf/default.nix
index aa782ec3339d..34cb1ef3381f 100644
--- a/nixpkgs/pkgs/development/libraries/libgsf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgsf/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libgsf";
-  version = "1.14.46";
+  version = "1.14.47";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0bddmlzg719sjhlbzqlhb7chwk93qc7g68m2r9r8xz112jdradpa";
+    sha256 = "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i";
   };
 
   nativeBuildInputs = [ pkgconfig intltool libintl ];
diff --git a/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/nixpkgs/pkgs/development/libraries/libhandy/default.nix
index 2a5ad06455d2..28816ab13070 100644
--- a/nixpkgs/pkgs/development/libraries/libhandy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libhandy/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala
+{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43
-, gtk3, gnome3
+, gtk3, gnome3, glade
 , dbus, xvfb_run, libxml2
 , hicolor-icon-theme
 }:
@@ -20,11 +20,21 @@ stdenv.mkDerivation rec {
     sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5";
   };
 
+  patches = [
+    # Fix build with Glade 3.36.0
+    # https://source.puri.sm/Librem5/libhandy/merge_requests/451
+    (fetchpatch {
+      url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch";
+      sha256 = "ZW6qCtHhXMsLsxgcOjVAukgPAhOdvFhxx0iAQEEk8GE=";
+      excludes = [ "glade/glade-hdy-header-bar.c" ];
+    })
+  ];
+
   nativeBuildInputs = [
     meson ninja pkgconfig gobject-introspection vala libxml2
     gtk-doc docbook_xsl docbook_xml_dtd_43
   ];
-  buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ];
+  buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ];
   checkInputs = [ dbus xvfb_run hicolor-icon-theme ];
 
   mesonFlags = [
diff --git a/nixpkgs/pkgs/development/libraries/libiberty/default.nix b/nixpkgs/pkgs/development/libraries/libiberty/default.nix
index 3d50df3e56c7..ff26c1029ef5 100644
--- a/nixpkgs/pkgs/development/libraries/libiberty/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libiberty/default.nix
@@ -3,7 +3,8 @@
 let inherit (buildPackages.buildPackages) gcc; in
 
 stdenv.mkDerivation {
-  name = "libiberty-${gcc.cc.version}";
+  pname = "libiberty";
+  version = "${gcc.cc.version}";
 
   inherit (gcc.cc) src;
 
diff --git a/nixpkgs/pkgs/development/libraries/libinput/default.nix b/nixpkgs/pkgs/development/libraries/libinput/default.nix
index 8e3558fe1b16..f490dfbd23a2 100644
--- a/nixpkgs/pkgs/development/libraries/libinput/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libinput/default.nix
@@ -27,11 +27,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "libinput";
-  version = "1.15.4";
+  version = "1.15.5";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
-    sha256 = "1ha5qyak1ka5npy5i6hzqfpii8samkj389mkppj4wdsfv536i2ww";
+    sha256 = "15ww4jl3lcxyi8m8idg8canklbqv729gnwpkz7r98c1w8a7zq3m9";
   };
 
   outputs = [ "bin" "out" "dev" ];
diff --git a/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/nixpkgs/pkgs/development/libraries/libqmi/default.nix
index b1504fc95404..33b4983b015a 100644
--- a/nixpkgs/pkgs/development/libraries/libqmi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libqmi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libqmi";
-  version = "1.24.6";
+  version = "1.24.10";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
-    sha256 = "1jfq8jdjc9z5c0g7m377svdlniwkr4k9hs7s8fsb5rvdq5xja98k";
+    sha256 = "1rzxapr6hb18ccvqh5fizx7zk63l47bs0p3gizycz2ysnm1i44n2";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
diff --git a/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/nixpkgs/pkgs/development/libraries/librealsense/default.nix
index a8924ca47825..8fd90c60bdad 100644
--- a/nixpkgs/pkgs/development/libraries/librealsense/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librealsense/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "librealsense";
-  version = "2.33.1";
+  version = "2.34.0";
 
   outputs = [ "out" "dev" ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "IntelRealSense";
     repo = pname;
     rev = "v${version}";
-    sha256 = "04macplj3k2sdpf1wdjm6gsghak5dzfhi2pmr47qldh2sy2zz0a3";
+    sha256 = "0bi7pszrryz18aqna0z73mb1hzz2vqdb0m00pf93hnwc2hba7hwm";
   };
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/nixpkgs/pkgs/development/libraries/librsvg/default.nix
index ba8ef8e6a852..afd1df51e5be 100644
--- a/nixpkgs/pkgs/development/libraries/librsvg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librsvg/default.nix
@@ -4,14 +4,14 @@
 
 let
   pname = "librsvg";
-  version = "2.48.2";
+  version = "2.48.4";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1jmxd03fs8vkwycxpmx69kdfmgq52g64bhv82gmj3kjgw2h5h9i7";
+    sha256 = "0vlmgisf87dz4vcl1ypcw7g211wkyvhydv6ksf1p6mgdbkw3mdi8";
   };
 
   outputs = [ "out" "dev" "installedTests" ];
diff --git a/nixpkgs/pkgs/development/libraries/libsass/default.nix b/nixpkgs/pkgs/development/libraries/libsass/default.nix
index 99cd2fb1c531..cebfdfe38389 100644
--- a/nixpkgs/pkgs/development/libraries/libsass/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsass/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libsass";
-  version = "3.6.3";
+  version = "3.6.4";
 
   src = fetchFromGitHub {
     owner = "sass";
     repo = pname;
     rev = version;
-    sha256 = "1q6lvd8sj5k5an32qir918pa5khhcb8h08dzrg1bcxmw7a23j514";
+    sha256 = "074kvacdan85h4qrvsk97575ys9xgkc044gplz3m6vn4a8pcl2rn";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     extraPostFetch = ''
diff --git a/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/nixpkgs/pkgs/development/libraries/libsecret/default.nix
index 2dbff9614a7c..010a74eab3ca 100644
--- a/nixpkgs/pkgs/development/libraries/libsecret/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsecret/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libsecret";
-  version = "0.20.2";
+  version = "0.20.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1hzz34gmsxxf1jm1b7qin390rkwbg8sx198xdkwxqp3q6cw19sc1";
+    sha256 = "1r4habxdzmn02id324m0m4mg5isf22q1z436bg3vjjmcz1b3rjsg";
   };
 
   postPatch = ''
diff --git a/nixpkgs/pkgs/development/libraries/libuninameslist/default.nix b/nixpkgs/pkgs/development/libraries/libuninameslist/default.nix
index 2e29aafdbdd1..afae04cb6b23 100644
--- a/nixpkgs/pkgs/development/libraries/libuninameslist/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libuninameslist/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libuninameslist";
-  version = "20200313";
+  version = "20200413";
 
   src = fetchFromGitHub {
     owner = "fontforge";
     repo = pname;
     rev = version;
-    sha256 = "1rs4mrmfcw7864kssnk559ac1sdlpl8yrd10xspxrnfz08ynqxw8";
+    sha256 = "0jbg94z00f5vwqyjfrbill6cjvzp1zrki6m3d235jjxyw0hm3wr5";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/development/libraries/liburcu/default.nix b/nixpkgs/pkgs/development/libraries/liburcu/default.nix
index 5292ec9d7e0c..6046bcf8eab3 100644
--- a/nixpkgs/pkgs/development/libraries/liburcu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liburcu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  version = "0.11.1";
+  version = "0.12.1";
   pname = "liburcu";
 
   src = fetchurl {
     url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
-    sha256 = "0l1kxgzch4m8fxiz2hc8fwg56hrvzzspp7n0svnl7i7iycdrgfcj";
+    sha256 = "03nd1gy2c3fdb6xwdrd5lr1jcjxbzffqh3z91mzbjhjn6k8fmymv";
   };
 
   checkInputs = [ perl ];
diff --git a/nixpkgs/pkgs/development/libraries/libuv/default.nix b/nixpkgs/pkgs/development/libraries/libuv/default.nix
index d9f90306584c..9f6adeb65b0b 100644
--- a/nixpkgs/pkgs/development/libraries/libuv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libuv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "1.35.0";
+  version = "1.37.0";
   pname = "libuv";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "0pd94h10ay38r8fwj0qqgw908rrj83n768n8mbbpnd5w2c7wy9fz";
+    sha256 = "0iy25w4wy9f5y7i7aqidhqz93qi00lv7vhx6s521n0kphvaj8ijz";
   };
 
   postPatch = let
diff --git a/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/nixpkgs/pkgs/development/libraries/libvirt/default.nix
index c1b34879eef3..3c0cc9751e3b 100644
--- a/nixpkgs/pkgs/development/libraries/libvirt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvirt/default.nix
@@ -4,7 +4,7 @@
 , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
-, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode
+, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus
 , enableXen ? false, xen ? null
 , enableIscsi ? false, openiscsi
 , enableCeph ? false, ceph
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper pkgconfig docutils ] ++ optionals (!buildFromTarball) [ autoreconfHook ];
   buildInputs = [
     libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
-    libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
+    libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus
   ] ++ optionals stdenv.isLinux [
     libpciaccess lvm2 utillinux systemd libnl numad zfs
     libapparmor libcap_ng numactl attr parted
@@ -74,6 +74,7 @@ in stdenv.mkDerivation rec {
     "--with-test"
     "--with-esx"
     "--with-remote"
+    "--with-polkit"
   ] ++ optionals stdenv.isLinux [
     "QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper"
     "QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper"
diff --git a/nixpkgs/pkgs/development/libraries/packr/default.nix b/nixpkgs/pkgs/development/libraries/packr/default.nix
index 6a53743a10ea..ec2de274ccb2 100644
--- a/nixpkgs/pkgs/development/libraries/packr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/packr/default.nix
@@ -18,7 +18,7 @@ let p2 = buildGoModule rec {
 
   subPackages = [ "packr2" ];
 
-  modSha256 = "1xxqyn78074jna0iri7sks6b2l4sdnn5sg57n09vrrf6kh39h2y9";
+  vendorSha256 = "12yq121b0bn8z12091fyqhhz421kgx4z1nskrkvbxlhyc47bwyrp";
 
   meta = with stdenv.lib; {
     description = "The simple and easy way to embed static files into Go binaries";
@@ -40,7 +40,7 @@ p1 = buildGoModule rec {
 
   subPackages = [ "packr" ];
 
-  modSha256 = "045qfdi82yhpghjd0cimxhas4nkj7g30n9qyvkrl9ck01sahx76f";
+  vendorSha256 = "0m3yj8ww4a16j56p8d8w0sdnyx0g2bkd8zg0l4d8vb72mvg5asga";
 
   meta = with lib; {
     description = "The simple and easy way to embed static files into Go binaries";
@@ -53,4 +53,4 @@ in
 symlinkJoin{
     name = "packr";
     paths = [p1 p2];
-}
+}
\ No newline at end of file
diff --git a/nixpkgs/pkgs/development/libraries/pangomm/default.nix b/nixpkgs/pkgs/development/libraries/pangomm/default.nix
index 5651f552dfa3..b0488435ded6 100644
--- a/nixpkgs/pkgs/development/libraries/pangomm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pangomm/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pangomm";
-  version= "2.42.0";
+  version= "2.42.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0mmzxp3wniaafkxr30sb22mq9x44xckb5d60h1bl99lkzxks0vfa";
+    sha256 = "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/nixpkgs/pkgs/development/libraries/poppler/default.nix b/nixpkgs/pkgs/development/libraries/poppler/default.nix
index 7f7a115f877a..93b49524dc1d 100644
--- a/nixpkgs/pkgs/development/libraries/poppler/default.nix
+++ b/nixpkgs/pkgs/development/libraries/poppler/default.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "poppler-${suffix}-${version}";
-  version = "0.87.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
+  version = "0.88.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
 
   src = fetchurl {
     url = "${meta.homepage}/poppler-${version}.tar.xz";
-    sha256 = "b2ArnCTC0FeAvpPnMGIBAS5BRZ8om4J5onp5QxrUFQ4=";
+    sha256 = "1isns9s484irq9ir4hbhpyqf6af2xzswh2pfrvk1k9d5x423hidl";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.12.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.12.nix
new file mode 100644
index 000000000000..00d9ec7f96fc
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/protobuf/3.12.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... }:
+
+callPackage ./generic-v3.nix {
+  version = "3.12.0";
+  sha256 = "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a";
+}
diff --git a/nixpkgs/pkgs/development/libraries/protolock/default.nix b/nixpkgs/pkgs/development/libraries/protolock/default.nix
index f1eb3ae51f32..2bdaa3ab7b6f 100644
--- a/nixpkgs/pkgs/development/libraries/protolock/default.nix
+++ b/nixpkgs/pkgs/development/libraries/protolock/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "0qg26vcqdhgy91p6wiv16dq73ay0fymran3d8ylca9264zwi2vxw";
   };
 
-  modSha256 = "1q755ipqsfpr41s5fxzmx50lwcdqc5a7akwx6mzn789w2z07x8lg";
+  vendorSha256 = "0ap1iwcapvvvmwgdc4zbsp8mglrhbswkdgm4dw8baw8qk0nlci6y";
 
   postInstall = ''
     rm $out/bin/plugin*
@@ -23,4 +23,4 @@ buildGoModule rec {
     license = licenses.bsd3;
     maintainers = with maintainers; [ groodt ];
   };
-}
+}
\ No newline at end of file
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
index 78d711e969b5..afca6c7969b4 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -139,6 +139,7 @@ let
       qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
       qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
       qtdoc = callPackage ../modules/qtdoc.nix {};
+      qtgamepad = callPackage ../modules/qtgamepad.nix {};
       qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
       qtimageformats = callPackage ../modules/qtimageformats.nix {};
       qtlocation = callPackage ../modules/qtlocation.nix {};
@@ -171,7 +172,7 @@ let
 
       env = callPackage ../qt-env.nix {};
       full = env "qt-full-${qtbase.version}" ([
-        qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
+        qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects
         qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
         qtscript qtsensors qtserialport qtsvg qttools qttranslations
         qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix
new file mode 100644
index 000000000000..281f6e0b8ecd
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix
@@ -0,0 +1,9 @@
+{ qtModule, qtbase, qtdeclarative, pkgconfig }:
+
+qtModule {
+  name = "qtgamepad";
+  qtInputs = [ qtbase qtdeclarative ];
+  buildInputs = [ ];
+  nativeBuildInputs = [ pkgconfig ];
+  outputs = [ "out" "dev" "bin" ];
+}
diff --git a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix
index ee861c14ab44..016864abed8c 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix
@@ -1,4 +1,12 @@
-{ stdenvNoCC, fetchurl, rpmextract, undmg, darwin, enableStatic ? false }:
+{ stdenvNoCC
+, fetchurl
+, pkgconfig
+, rpmextract
+, undmg
+, darwin
+, enableStatic ? false
+}:
+
 /*
   For details on using mkl as a blas provider for python packages such as numpy,
   numexpr, scipy, etc., see the Python section of the NixPkgs manual.
@@ -20,6 +28,8 @@ let
   openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1";
   openmp-ver = "${openmp}.${spot}-${rel}-${openmp}.${spot}-${rel}";
 
+  shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary;
+
 in stdenvNoCC.mkDerivation {
   pname = "mkl";
   inherit version;
@@ -42,6 +52,10 @@ in stdenvNoCC.mkDerivation {
     else
       [ rpmextract ];
 
+  installCheckInputs = [ pkgconfig ];
+
+  doInstallCheck = true;
+
   buildPhase = if stdenvNoCC.isDarwin then ''
     for f in Contents/Resources/pkg/*.tgz; do
       tar xzvf $f
@@ -75,6 +89,7 @@ in stdenvNoCC.mkDerivation {
       bn=$(basename $f)
       substituteInPlace $f \
         --replace "prefix=<INSTALLDIR>/mkl" "prefix=$out" \
+        --replace $\{MKLROOT} "$out" \
         --replace "lib/intel64_lin" "lib"
     done
 
@@ -114,10 +129,15 @@ in stdenvNoCC.mkDerivation {
     '') + ''
 
     # Setup symlinks for blas / lapack
-    ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
-    ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
-    ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
-    ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
+    ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}
+    ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}
+    ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}
+    ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}
+  '' + stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
+    ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3"
+    ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3"
+    ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3"
+    ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}".3"
   '';
 
   # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the
@@ -132,6 +152,11 @@ in stdenvNoCC.mkDerivation {
     install_name_tool -change @rpath/libtbbmalloc.dylib $out/lib/libtbbmalloc.dylib $out/lib/libtbbmalloc_proxy.dylib
   '';
 
+  # Validate pkgconfig files, since they break often on updates.
+  installCheckPhase = ''
+    pkg-config --validate $out/lib/pkgconfig/*.pc
+  '';
+
   # Per license agreement, do not modify the binary
   dontStrip = true;
   dontPatchELF = true;
diff --git a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix
index 53c980469932..318922d7f25d 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix
@@ -93,6 +93,9 @@ let
     if !builtins.isBool val then toString val
     else if val then "1" else "0";
   mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}");
+
+  shlibExt = stdenv.hostPlatform.extensions.sharedLibrary;
+
 in
 stdenv.mkDerivation rec {
   pname = "openblas";
@@ -178,10 +181,15 @@ EOF
     done
 
     # Setup symlinks for blas / lapack
-    ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
-    ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
-    ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
-    ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}
+  '' + stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}.3
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}.3
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}.3
+    ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}.3
   '';
 
   meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix b/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix
index e67f61599b57..ae7a7c778de0 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix
@@ -9,7 +9,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.023.5";
+  version = "2.023.6";
   pname = "sympow";
 
   src = fetchFromGitLab {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner = "forks";
     repo = "sympow";
     rev = "v${version}";
-    sha256 = "1c5a2pizgqsf3pjkf7rfj20022ym4ixhrddp8ivs2nbzxwz6qvv9";
+    sha256 = "132l0xv00ld1svvv9wh99wfra4zzjv2885h2sq0dsl98wiyvi5zl";
   };
 
   postUnpack = ''
diff --git a/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix b/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix
index 52b39ddc25bf..f6969dcdb6f0 100644
--- a/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sentencepiece";
-  version = "0.1.86";
+  version = "0.1.90";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0r4z5n3dx0bg1pm2kgfllyj65s7ljn2ny7i7c5bz618r7h8bax9p";
+    sha256 = "10y16qkr2ibn8synmyzgwcbkszyfys1v0dx75p3mayh02yif4dx2";
   };
 
   nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools;
diff --git a/nixpkgs/pkgs/development/libraries/tracker/default.nix b/nixpkgs/pkgs/development/libraries/tracker/default.nix
index 50eb56ce2d1e..2224addf02ad 100644
--- a/nixpkgs/pkgs/development/libraries/tracker/default.nix
+++ b/nixpkgs/pkgs/development/libraries/tracker/default.nix
@@ -1,8 +1,33 @@
-{ stdenv, fetchurl, gettext, meson, ninja, pkgconfig, gobject-introspection, python3
-, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales
-, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer
-, gnome3, icu, libuuid, networkmanager, libsoup, json-glib, systemd, dbus
-, substituteAll }:
+{ stdenv
+, fetchurl
+, gettext
+, meson
+, ninja
+, pkgconfig
+, gobject-introspection
+, python3
+, gtk-doc
+, docbook_xsl
+, docbook_xml_dtd_412
+, docbook_xml_dtd_43
+, docbook_xml_dtd_45
+, libxml2
+, glib
+, wrapGAppsHook
+, vala
+, sqlite
+, libxslt
+, libstemmer
+, gnome3
+, icu
+, libuuid
+, networkmanager
+, libsoup
+, json-glib
+, systemd
+, dbus
+, substituteAll
+}:
 
 stdenv.mkDerivation rec {
   pname = "tracker";
@@ -15,34 +40,80 @@ stdenv.mkDerivation rec {
     sha256 = "V3lSJEq5d8eLC4ji9jxBl+q6FuTWa/9pK39YmT4GUW0=";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      gdbus = "${glib.bin}/bin/gdbus";
+    })
+  ];
+
   nativeBuildInputs = [
-    meson ninja vala pkgconfig gettext libxslt wrapGAppsHook gobject-introspection
-    gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales
+    meson
+    ninja
+    vala
+    pkgconfig
+    gettext
+    libxslt
+    wrapGAppsHook
+    gobject-introspection
+    gtk-doc
+    docbook_xsl
+    docbook_xml_dtd_412
+    docbook_xml_dtd_43
+    docbook_xml_dtd_45
     python3 # for data-generators
     systemd # used for checks to install systemd user service
     dbus # used for checks and pkgconfig to install dbus service/s
   ];
 
   buildInputs = [
-    glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib libstemmer
+    glib
+    libxml2
+    sqlite
+    icu
+    networkmanager
+    libsoup
+    libuuid
+    json-glib
+    libstemmer
+  ];
+
+  checkInputs = [
+    python3.pkgs.pygobject3
   ];
 
   mesonFlags = [
     # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
-    "-Dfunctional_tests=false"
+    # "-Dfunctional_tests=true"
     "-Ddocs=true"
   ];
 
-  patches = [
-    (substituteAll {
-      src = ./fix-paths.patch;
-      gdbus = "${glib.bin}/bin/gdbus";
-    })
-  ];
+  doCheck = true;
 
   postPatch = ''
     patchShebangs utils/g-ir-merge/g-ir-merge
     patchShebangs utils/data-generators/cc/generate
+    patchShebangs tests/functional-tests/test-runner.sh.in
+    patchShebangs tests/functional-tests/*.py
+  '';
+
+  preCheck = ''
+    # (tracker-store:6194): Tracker-CRITICAL **: 09:34:07.722: Cannot initialize database: Could not open sqlite3 database:'/homeless-shelter/.cache/tracker/meta.db': unable to open database file
+    export HOME=$(mktemp -d)
+
+    # Our gobject-introspection patches make the shared library paths absolute
+    # in the GIR files. When running functional tests, the library is not yet installed,
+    # though, so we need to replace the absolute path with a local one during build.
+    # We are using a symlink that will be overridden during installation.
+    mkdir -p $out/lib
+    ln -s $PWD/src/libtracker-sparql-backend/libtracker-sparql-2.0.so $out/lib/libtracker-sparql-2.0.so.0
+    ln -s $PWD/src/libtracker-miner/libtracker-miner-2.0.so $out/lib/libtracker-miner-2.0.so.0
+    ln -s $PWD/src/libtracker-data/libtracker-data.so $out/lib/libtracker-data.so
+  '';
+
+  postCheck = ''
+    # Clean up out symlinks
+    rm -r $out/lib
   '';
 
   postInstall = ''
@@ -60,7 +131,7 @@ stdenv.mkDerivation rec {
     homepage = "https://wiki.gnome.org/Projects/Tracker";
     description = "Desktop-neutral user information store, search tool and indexer";
     maintainers = teams.gnome.members;
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
index 84ffd2cd8130..4d968cc325ec 100644
--- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
@@ -178,7 +178,6 @@ stdenv.mkDerivation rec {
     homepage = "https://webkitgtk.org/";
     license = licenses.bsd2;
     platforms = platforms.linux;
-    hydraPlatforms = [];
     maintainers = teams.gnome.members;
   };
 }