flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1610051610,
+        "lastModified": 1605370193,
-        "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
+        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc",
+        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
         "type": "github"
       },
       "original": {
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1613761605,
+        "lastModified": 1611414562,
-        "narHash": "sha256-lUF6UPR96ZzQC0faNXBHLoLhNAdxZqYqDwz0PaIZ/7Y=",
+        "narHash": "sha256-u002KfYA7Uk3vffnnmLz88BmxOzixYFdh+8II6ZT+Kg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9816b99e71c3504b0b4c1f8b2e004148460029d4",
+        "rev": "9d6fd2ba135c5b5c85c3332604d39b43e93b8298",
         "type": "github"
       },
       "original": {

pkgs/applications/audio/mopidy/subidy.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , fetchFromGitHub
 , python3Packages
 
@@ -21,7 +20,7 @@ python3Packages.buildPythonApplication rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/Prior99/mopidy-subidy";
     description = "Mopidy extension for playing music from Subsonic servers";
     license = licenses.bsd3;

pkgs/applications/audio/psst/default.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , fetchFromGitHub
 , rustPlatform
 
@@ -15,7 +14,7 @@
 }:
 
 let
-  inherit (lib) optional optionals;
+  inherit (stdenv.lib) optional optionals;
 in
 
 assert withGui -> gtk3.meta.available;
@@ -64,7 +63,7 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Fast and multi-platform Spotify client with native GUI ";
     homepage = "https://github.com/jpochyla/psst";
     license = licenses.mit;

pkgs/applications/networking/protonmail-bridge/common.nix

@@ -1,54 +0,0 @@
-{ lib
-, fetchFromGitHub
-, buildGoModule
-, pkg-config
-, libsecret
-}:
-
-{ pname
-, tags
-, ...
-}@args:
-
-buildGoModule (lib.recursiveUpdate args rec {
-  inherit pname;
-  version = "1.5.6";
-
-  src = fetchFromGitHub {
-    owner = "ProtonMail";
-    repo = "proton-bridge";
-    rev = "br-${version}";
-    sha256 = "1na8min9cmn82lpad58abw6837k303fr09l6cvzswaxs73f231ig";
-  };
-
-  vendorSha256 = "1219xa1347877bfhnid15y6w9s4hf1czbrmll2iha4gpsmg066bb";
-
-  nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [
-    pkg-config
-  ];
-
-  buildInputs = (args.buildInputs or [ ]) ++ [
-    libsecret
-  ];
-
-  buildFlagsArray =
-    let
-      t = "github.com/ProtonMail/proton-bridge/pkg/constants";
-    in
-    [
-      "-tags=${tags}"
-      ''
-        -ldflags=
-          -X ${t}.Version=${version}
-          -X ${t}.Revision=unknown
-          -X ${t}.BuildDate=unknown
-      ''
-    ];
-
-  meta = with lib; {
-    description = "Integrate ProtonMail paid account with any program that supports IMAP and SMTP";
-    homepage = "https://protonmail.com";
-    license = licenses.gpl3;
-    plaforms = platforms.x86_64;
-  };
-})

pkgs/applications/networking/protonmail-bridge/default.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , fetchFromGitHub
 , buildGoModule
 
@@ -10,11 +9,60 @@
 , qtbase
 , qtdoc
 }:
+
 let
-  builder = import ./common.nix {
+
-    inherit lib fetchFromGitHub buildGoModule libsecret pkg-config;
+  builder =
+    { pname
+    , tags
+    , ...
+    }@args:
+
+    buildGoModule (stdenv.lib.recursiveUpdate args rec {
+      inherit pname;
+      version = "1.5.6";
+
+      src = fetchFromGitHub {
+        owner = "ProtonMail";
+        repo = "proton-bridge";
+        rev = "br-${version}";
+        sha256 = "1na8min9cmn82lpad58abw6837k303fr09l6cvzswaxs73f231ig";
       };
+
+      vendorSha256 = "1219xa1347877bfhnid15y6w9s4hf1czbrmll2iha4gpsmg066bb";
+
+      nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [
+        pkg-config
+      ];
+
+      buildInputs = (args.buildInputs or [ ]) ++ [
+        libsecret
+      ];
+
+      buildFlagsArray =
+        let
+          t = "github.com/ProtonMail/proton-bridge/pkg/constants";
+        in
+        [
+          "-tags=${tags}"
+          ''
+            -ldflags=
+              -X ${t}.Version=${version}
+              -X ${t}.Revision=unknown
+              -X ${t}.BuildDate=unknown
+          ''
+        ];
+
+      meta = with stdenv.lib; {
+        description = "Integrate ProtonMail paid account with any program that supports IMAP and SMTP";
+        homepage = "https://protonmail.com";
+        license = licenses.gpl3;
+        plaforms = platforms.x86_64;
+      };
+    });
+
 in
+
 {
   protonmail-bridge = builder (import ./app.nix { inherit qtbase go goModules; });
   protonmail-bridge-headless = builder (import ./headless.nix { });

pkgs/applications/window-managers/cardboard/default.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , fetchFromGitLab
 , fetchzip
 
@@ -63,10 +62,10 @@ stdenv.mkDerivation rec {
 
   passthru.providedSessions = [ "cardboard" ];
 
-  meta = with lib; {
+  meta = {
     description = "Scrollable tiling Wayland compositor designed with laptops in mind";
     homepage = "https://gitlab.com/cardboardwm/cardboard";
-    license = licenses.gpl3;
+    license = stdenv.lib.licenses.gpl3;
     platforms = wlroots.meta.platforms;
   };
 }

pkgs/development/go-modules/qt/default.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , fetchFromGitHub
 , buildGoModule
 , makeWrapper
@@ -60,7 +59,7 @@ buildGoModule rec {
     done
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/therecipe/qt";
     description = "Qt bindings for Go";
     license = licenses.lgpl3;

pkgs/development/libraries/libhl/default.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , fetchFromGitHub
 
 , coreutils
@@ -27,7 +26,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/include $out/lib
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/xant/libhl";
     description = "Simple and fast C library implementing a thread-safe API to manage hash-tables, linked lists, lock-free ring buffers and queues ";
     license = licenses.lgpl3;

pkgs/development/python-modules/py-sonic/default.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , buildPythonPackage
 , fetchPypi
 }:
@@ -15,9 +14,9 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://stuffivelearned.org/doku.php?id=programming:python:py-sonic";
-    license = licenses.gpl3;
+    license = stdenv.lib.licenses.gpl3;
     description = "A python wrapper library for the Subsonic REST API";
   };
 }

pkgs/os-specific/linux/pam_gnupg/default.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , fetchFromGitHub
 
 , autoreconfHook
@@ -26,10 +25,10 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-moduledir=\${out}/lib/security" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/cruegge/pam-gnupg";
     description = "Unlock GnuPG keys on login";
     license = licenses.gpl3;
-    platforms = pam.meta.platforms;
+    inherit (pam.meta) platforms;
   };
 }

pkgs/shells/zsh/zsh-z/default.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , fetchFromGitHub
 , installShellFiles
 
@@ -26,10 +25,10 @@ stdenv.mkDerivation {
     installShellCompletion --zsh _zshz
   '';
 
-  meta = with lib; {
+  meta = {
     description = ''Jump quickly to directories that you have visited "frecently." A native ZSH port of z.sh.'';
     homepage = "https://github.com/agkozak/zsh-z";
-    license = licenses.mit;
+    license = stdenv.lib.licenses.mit;
     platforms = zsh.meta.platforms;
   };
 }

pkgs/tools/misc/amdgpu-fan/default.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , fetchFromGitHub
 
 , python3Packages
@@ -21,7 +20,7 @@ python3Packages.buildPythonApplication rec {
     pyyaml
   ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Fan controller for AMD graphics cards running the amdgpu driver on Linux";
     homepage = "https://github.com/chestm007/amdgpu-fan";
     license = licenses.gpl2;

pkgs/tools/misc/radeon-profile-daemon/default.nix

@@ -1,18 +1,16 @@
 { stdenv
-, lib
 , fetchFromGitHub
 
 , qtbase
 , qmake
-, wrapQtAppsHook
 }:
 
 stdenv.mkDerivation rec {
   pname = "radeon-profile-daemon";
   version = "20190603.g06qxq2h";
 
+  nativeBuildInputs = [ qmake ];
   buildInputs = [ qtbase ];
-  nativeBuildInputs = [ qmake wrapQtAppsHook ];
 
   src = (
     fetchFromGitHub {
@@ -28,7 +26,7 @@ stdenv.mkDerivation rec {
       --replace "/usr/" "$out/"
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "System daemon for reading current clocks of AMD Radeon cards";
     homepage = "https://github.com/marazmista/radeon-profile-daemon";
     license = licenses.gpl2Plus;

pkgs/tools/misc/samrewritten/default.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , fetchFromGitHub
 , makeWrapper
 
@@ -41,7 +40,7 @@ stdenv.mkDerivation rec {
       --replace /usr/bin/samrewritten $out/bin/samrewritten
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Steam Achievement Manager For Linux";
     homepage = "https://github.com/PaulCombal/SamRewritten";
     license = licenses.gpl3;

pkgs/tools/misc/spotify-ripper/default.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , fetchFromGitHub
 
 , python2Packages
@@ -49,7 +48,7 @@ python2Packages.buildPythonApplication rec {
   # Remove impure executables.
   patches = [ ./fix-setup.patch ];
 
-  meta = with lib; {
+  meta = {
     description = "Rip Spotify URIs to audio files, including ID3 tags and cover art";
     longDescription = ''
       Spotify-ripper is a small ripper script for Spotify that rips Spotify URIs
@@ -59,6 +58,6 @@ python2Packages.buildPythonApplication rec {
     '';
     homepage = "https://github.com/hbashton/spotify-ripper";
     # spotify-ripper itself is MIT, but the upstream libspotify is unfree.
-    license = licenses.unfree;
+    license = stdenv.lib.licenses.unfree;
   };
 }

pkgs/top-level/all-packages.nix

@@ -10,14 +10,14 @@ rec {
       owner = "zenixls2";
       repo = "alacritty";
       fetchSubmodules = true;
-      rev = "df24940a9ccf7ba897fa3167046ee8b181342d8f";
+      rev = "ada2680e79a8f53cd350263c8cc91d2e2a264d81";
-      sha256 = "sha256-2Th2aojTN36MgYSFXiACcBkTpTou/X1Ub5JR2sgZa34=";
+      sha256 = "0c0k1ib1dl35731zyjb32apyn28xc63mhbwsig5mz3hnkyk5nisr";
     };
 
     cargoDeps = oldAttrs.cargoDeps.overrideAttrs (pkgs.lib.const {
       name = "${pname}-${version}-vendor.tar.gz";
       inherit src;
-      outputHash = "sha256-weGYh5qeaOHFfq2nf0UdsuIZud+7/8SCD0g0BAjoJIc=";
+      outputHash = "1d1yz4xmal0f3c0pcn59lxfh5a3532nv7dv7s95svvi8qsvnk9gv";
     });
 
     ligatureInputs = [
@@ -34,7 +34,7 @@ rec {
     # and I can't work out a better way to push it to the RPATH.
     postInstall = pkgs.lib.optional (!pkgs.stdenv.isDarwin) ''
       patchelf \
-        --set-rpath ${pkgs.lib.makeLibraryPath ligatureInputs}:"$(patchelf --print-rpath $out/bin/alacritty)" \
+        --set-rpath ${pkgs.lib.makeLibraryPath ligatureInputs}:"$(patchelf --show-rpath $out/bin/alacritty)" \
         $out/bin/alacritty
     '';