nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #117661 from siraben/stdenv-cleanup2

Browse Source 
treewide: remove redundant stdenv
This commit is contained in:
Sandro 2021-03-26 09:52:33 +01:00 committed by GitHub
commit 7cf32af12f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/neovim/neovim-qt.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper { lib, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
, msgpack, neovim, pythonPackages, qtbase }: , msgpack, neovim, pythonPackages, qtbase }:
mkDerivation rec { mkDerivation rec {

4
pkgs/applications/networking/cluster/helm/wrapper.nix
View File

@ -1,6 +1,4 @@
{ stdenv, symlinkJoin, lib, makeWrapper { symlinkJoin, lib, makeWrapper, writeText }:
, writeText
}:
helm: helm:

2
pkgs/applications/networking/sync/rsync/base.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl }: { lib, fetchurl }:
rec { rec {
version = "3.2.3"; version = "3.2.3";

2
pkgs/applications/networking/sync/rsync/default.nix
View File

@ -15,7 +15,7 @@ assert enableXXHash -> xxHash != null;
assert enableZstd -> zstd != null; assert enableZstd -> zstd != null;
let let
base = import ./base.nix { inherit lib stdenv fetchurl; }; base = import ./base.nix { inherit lib fetchurl; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rsync-${base.version}"; name = "rsync-${base.version}";

2
pkgs/applications/networking/sync/rsync/rrsync.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, perl, rsync }: { lib, stdenv, fetchurl, perl, rsync }:
let let
base = import ./base.nix { inherit stdenv lib fetchurl; }; base = import ./base.nix { inherit lib fetchurl; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "rrsync-${base.version}"; name = "rrsync-${base.version}";

1
pkgs/development/gnuradio-modules/ais/default.nix
View File

@ -1,5 +1,4 @@
{ lib { lib
, stdenv
, mkDerivation , mkDerivation
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake

1
pkgs/development/python-modules/urllib3/2.nix
View File

@ -1,5 +1,4 @@
{ lib { lib
, stdenv
, brotli , brotli
, buildPythonPackage , buildPythonPackage
, certifi , certifi

1
pkgs/development/python-modules/urllib3/default.nix
View File

@ -1,5 +1,4 @@
{ lib { lib
, stdenv
, brotli , brotli
, buildPythonPackage , buildPythonPackage
, certifi , certifi

2
pkgs/tools/X11/xkeysnail/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, python3Packages }: { lib, fetchFromGitHub, makeWrapper, python3Packages }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "xkeysnail"; pname = "xkeysnail";

2
pkgs/tools/networking/s6-networking/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, skawarePackages { lib, skawarePackages
# Whether to build the TLS/SSL tools and what library to use # Whether to build the TLS/SSL tools and what library to use
# acceptable values: "bearssl", "libressl", false # acceptable values: "bearssl", "libressl", false