From 90ad0fd74312ad6f10071739557223cfdfaa4a5e Mon Sep 17 00:00:00 2001 From: Free Potion <42352817+freepotion@users.noreply.github.com> Date: Sat, 25 May 2019 13:57:43 +0300 Subject: [PATCH 001/106] boohu: switching to termbox-go build This is necessary for a better user experience. File with go dependencies (deps.nix) was added. Minor changes: name replaced by pname, quotes for url. --- pkgs/games/boohu/default.nix | 10 +++++----- pkgs/games/boohu/deps.nix | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 pkgs/games/boohu/deps.nix diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix index 1e70a92066da..e658ef9f5cba 100644 --- a/pkgs/games/boohu/default.nix +++ b/pkgs/games/boohu/default.nix @@ -2,29 +2,29 @@ buildGoPackage rec { - name = "boohu-${version}"; + pname = "boohu"; version = "0.12.0"; goPackagePath = "git.tuxfamily.org/boohu/boohu.git"; src = fetchurl { - url = "https://download.tuxfamily.org/boohu/downloads/boohu-${version}.tar.gz"; + url = "https://download.tuxfamily.org/boohu/downloads/${pname}-${version}.tar.gz"; sha256 = "0nf3xj3lda8279cqvjv5c3vpsb7d2kynwwna5yrsy7gq8c9n4rh8"; }; - buildFlags = "--tags ansi"; + goDeps = ./deps.nix; postInstall = "mv $bin/bin/boohu.git $bin/bin/boohu"; meta = with stdenv.lib; { - description = "A new roguelike game"; + description = "A new coffee-break roguelike game"; longDescription = '' Break Out Of Hareka's Underground (Boohu) is a roguelike game mainly inspired from DCSS and its tavern, with some ideas from Brogue, but aiming for very short games, almost no character building, and a simplified inventory. ''; - homepage = https://download.tuxfamily.org/boohu/index.html; + homepage = "https://download.tuxfamily.org/boohu/index.html"; license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [freepotion]; diff --git a/pkgs/games/boohu/deps.nix b/pkgs/games/boohu/deps.nix new file mode 100644 index 000000000000..a785567adddf --- /dev/null +++ b/pkgs/games/boohu/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "288510b9734e30e7966ec2f22b87c5f8e67345e3"; + sha256 = "0hdyisfaf8yb55h3p03p4sbq19546mp9fy28f2kn659mycmhxqk4"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211"; + sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w"; + }; + } +] From eac62f61d17181a82292a18fa1bfb46bafe33487 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 26 May 2019 22:02:43 +0300 Subject: [PATCH 002/106] nixos/kvmgt: fix starting condition --- nixos/modules/virtualisation/kvmgt.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix index 132815a0ad63..bfcf51d09c45 100644 --- a/nixos/modules/virtualisation/kvmgt.nix +++ b/nixos/modules/virtualisation/kvmgt.nix @@ -46,22 +46,24 @@ in { message = "KVMGT is not properly supported for kernels older than 4.16"; }; boot.kernelParams = [ "i915.enable_gvt=1" ]; + systemd.paths = mapAttrs' (name: value: + nameValuePair "kvmgt-${name}" { + description = "KVMGT VGPU ${name} path"; + wantedBy = [ "multi-user.target" ]; + pathConfig = { + PathExists = "/sys/bus/pci/devices/${cfg.device}/mdev_supported_types/${name}/create"; + }; + } + ) cfg.vgpus; systemd.services = mapAttrs' (name: value: nameValuePair "kvmgt-${name}" { description = "KVMGT VGPU ${name}"; serviceConfig = { - Type = "forking"; + Type = "oneshot"; RemainAfterExit = true; - Restart = "on-failure"; - RestartSec = 5; ExecStart = "${pkgs.runtimeShell} -c 'echo ${value.uuid} > /sys/bus/pci/devices/${cfg.device}/mdev_supported_types/${name}/create'"; ExecStop = "${pkgs.runtimeShell} -c 'echo 1 > /sys/bus/pci/devices/${cfg.device}/${value.uuid}/remove'"; }; - unitConfig = { - StartLimitBurst = 5; - StartLimitIntervalSec = 30; - }; - wantedBy = [ "multi-user.target" ]; } ) cfg.vgpus; }; From 93a680605d88b1742860080b19874a8c813863e4 Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 5 Jun 2019 14:36:04 +0200 Subject: [PATCH 003/106] nomachine-client: 6.6.8 -> 6.7.6 --- pkgs/tools/admin/nomachine-client/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index f73104422c1b..716ffef0ce52 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.6"; - versionMinor = "8"; - versionBuild_x86_64 = "5"; - versionBuild_i686 = "5"; + versionMajor = "6.7"; + versionMinor = "6"; + versionBuild_x86_64 = "11"; + versionBuild_i686 = "11"; in stdenv.mkDerivation rec { pname = "nomachine-client"; @@ -14,12 +14,12 @@ in if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; - sha256 = "0hsx1nd9m1l35pj4jri88jib1hgf2wh1f42s650y2br2h6bhaixs"; + sha256 = "1mka0a7p03y53zsf0srrcj4f7sigda5vndrwqhr0vncc2qws03k0"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; - sha256 = "1hrp8s17pcqkb4jcnayx81qmm7c1njjp69fkpyqgcnv9vshias1b"; + sha256 = "1g94s65bp99nfmzvwv1wasvjhgjbfg9jkc089qimi0lvr8ajabkx"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; From 39eb49c9f0767de08b0a87e41993aa99c66826b6 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Mon, 10 Jun 2019 14:13:04 -0700 Subject: [PATCH 004/106] bundlerApp: Set up passthru properly The manual documents both bundlerEnv and bundlerApp as providing `env` and `wrappedRuby` attributes on the resulting derivations. However only bundlerEnv actually had these attributes. Update bundlerApp to provide the same passthru that bundlerEnv does. --- pkgs/development/ruby-modules/bundler-app/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index d1b8e87aaebe..f8843c615821 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -36,10 +36,15 @@ let basicEnv = (callPackage ../bundled-common {}) args; - cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" ] // { + cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" ] // { inherit preferLocalBuild allowSubstitutes; # pass the defaults buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper; + + passthru = basicEnv.passthru // { + inherit basicEnv; + inherit (basicEnv) env; + } // passthru; }; in runCommand basicEnv.name cmdArgs '' From 95bfb9938fb0c95703e7f4c503e9cedcf1c26883 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Sun, 9 Jun 2019 22:35:11 -0700 Subject: [PATCH 005/106] macvim: 7.4.909 -> 8.1.1517 Fix up the macvim package to build again, with the latest snapshot. The patchfile has been recreated by manually reapplying all of the changes from the old patchfile, and the other changes in here were figured out by trial and error (such as the need to unset `LD`). Also tweak the package to use python37 by default, and add an option to go back to python27 if desired. Disable Sparkle so the user isn't prompted to update a readonly package. --- .../editors/vim/macvim-sparkle.patch | 106 +++++++++ pkgs/applications/editors/vim/macvim.nix | 86 +++++--- pkgs/applications/editors/vim/macvim.patch | 201 +++++++++--------- 3 files changed, 259 insertions(+), 134 deletions(-) create mode 100644 pkgs/applications/editors/vim/macvim-sparkle.patch diff --git a/pkgs/applications/editors/vim/macvim-sparkle.patch b/pkgs/applications/editors/vim/macvim-sparkle.patch new file mode 100644 index 000000000000..e0ba5145b3e5 --- /dev/null +++ b/pkgs/applications/editors/vim/macvim-sparkle.patch @@ -0,0 +1,106 @@ +diff --git a/src/MacVim/English.lproj/MainMenu.nib/designable.nib b/src/MacVim/English.lproj/MainMenu.nib/designable.nib +index bdbcfdb9e..5efc78ab6 100644 +--- a/src/MacVim/English.lproj/MainMenu.nib/designable.nib ++++ b/src/MacVim/English.lproj/MainMenu.nib/designable.nib +@@ -24,11 +24,6 @@ + + + +- +- +- +- +- + + + +@@ -206,6 +201,5 @@ + + + +- + + +diff --git a/src/MacVim/English.lproj/Preferences.nib/designable.nib b/src/MacVim/English.lproj/Preferences.nib/designable.nib +index 889450913..38afc3416 100644 +--- a/src/MacVim/English.lproj/Preferences.nib/designable.nib ++++ b/src/MacVim/English.lproj/Preferences.nib/designable.nib +@@ -88,14 +88,10 @@ + + + Checks for updates and presents a dialog box showing the release notes and prompt for whether you want to install the new version. +- ++ + + + +- +- +- +- + + + +@@ -186,16 +182,13 @@ + + + MacVim will automatically download and install updates without prompting. The updated version will be used the next time MacVim starts. +- ++ + + + + + + +- +- +- + + + +diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj +index 648c4290d..c7dd99d1e 100644 +--- a/src/MacVim/MacVim.xcodeproj/project.pbxproj ++++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj +@@ -66,8 +66,6 @@ + 1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; }; + 52818B031C1C08CE00F59085 /* QLStephen.qlgenerator in Copy QuickLookPlugin */ = {isa = PBXBuildFile; fileRef = 52818AFF1C1C075300F59085 /* QLStephen.qlgenerator */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 528DA66A1426D4F9003380F1 /* macvim-askpass in Copy Scripts */ = {isa = PBXBuildFile; fileRef = 528DA6691426D4EB003380F1 /* macvim-askpass */; }; +- 52A364731C4A5789005757EC /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52A364721C4A5789005757EC /* Sparkle.framework */; }; +- 52A364761C4A57C1005757EC /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 52A364721C4A5789005757EC /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 52B7ED9B1C4A4D6900AFFF15 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 52B7ED9A1C4A4D6900AFFF15 /* dsa_pub.pem */; }; + 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; }; + 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; +@@ -124,7 +122,6 @@ + dstPath = ""; + dstSubfolderSpec = 10; + files = ( +- 52A364761C4A57C1005757EC /* Sparkle.framework in Copy Frameworks */, + 1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */, + ); + name = "Copy Frameworks"; +@@ -250,7 +247,6 @@ + 32CA4F630368D1EE00C91783 /* MacVim_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacVim_Prefix.pch; sourceTree = ""; }; + 52818AFA1C1C075300F59085 /* QuickLookStephen.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = QuickLookStephen.xcodeproj; path = qlstephen/QuickLookStephen.xcodeproj; sourceTree = ""; }; + 528DA6691426D4EB003380F1 /* macvim-askpass */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "macvim-askpass"; sourceTree = ""; }; +- 52A364721C4A5789005757EC /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = ""; }; + 52B7ED9A1C4A4D6900AFFF15 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = ""; }; + 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; + 8D1107320486CEB800E47090 /* MacVim.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacVim.app; sourceTree = BUILT_PRODUCTS_DIR; }; +@@ -264,7 +260,6 @@ + 1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */, + 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, + 1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */, +- 52A364731C4A5789005757EC /* Sparkle.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -443,7 +438,6 @@ + 29B97323FDCFA39411CA2CEA /* Frameworks */ = { + isa = PBXGroup; + children = ( +- 52A364721C4A5789005757EC /* Sparkle.framework */, + 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */, + 1D493DB30C52533B00AB718C /* PSMTabBarControl.xcodeproj */, + 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */, diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index c97b17bd9af1..ec2d75ffaf66 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -1,55 +1,73 @@ -{ stdenv, fetchFromGitHub, ncurses, gettext -, pkgconfig, python, ruby, tcl, perl, luajit +{ stdenv, fetchFromGitHub, runCommand, ncurses, gettext +, pkgconfig, cscope, ruby, tcl, perl, luajit , darwin + +, usePython27 ? false +, python27 ? null, python37 ? null }: +let + python = if usePython27 + then { pkg = python27; name = "python"; } + else { pkg = python37; name = "python3"; }; +in +assert python.pkg != null; + +let + # Building requires a few system tools to be in PATH. + # Some of these we could patch into the relevant source files (such as xcodebuild and + # qlmanage) but some are used by Xcode itself and we have no choice but to put them in PATH. + # Symlinking them in this way is better than just putting all of /usr/bin in there. + buildSymlinks = runCommand "macvim-build-symlinks" {} '' + mkdir -p $out/bin + ln -s /usr/bin/xcrun /usr/bin/xcodebuild /usr/bin/tiffutil /usr/bin/qlmanage $out/bin + ''; +in + stdenv.mkDerivation rec { name = "macvim-${version}"; - version = "7.4.909"; + version = "8.1.1517"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "75aa7774645adb586ab9010803773bd80e659254"; - sha256 = "0k04jimbms6zffh8i8fjm2y51q01m5kga2n4djipd3pxij1qy89y"; + rev = "snapshot-156"; + sha256 = "17plmqcn49gqwr1km77mkxflrg0f4sn06r3n0fbxa8zcz9zmb1q2"; }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig buildSymlinks ]; buildInputs = [ - gettext ncurses luajit ruby tcl perl python + gettext ncurses cscope luajit ruby tcl perl python.pkg ]; - patches = [ ./macvim.patch ]; + patches = [ ./macvim.patch ./macvim-sparkle.patch ]; + # The sparkle patch modified the nibs, so we have to recompile them postPatch = '' - substituteInPlace src/MacVim/mvim --replace "# VIM_APP_DIR=/Applications" "VIM_APP_DIR=$out/Applications" - - # Don't create custom icons. - substituteInPlace src/MacVim/icons/Makefile --replace '$(MAKE) -C makeicns' "" - substituteInPlace src/MacVim/icons/make_icons.py --replace "dont_create = False" "dont_create = True" - - # Full path to xcodebuild - substituteInPlace src/Makefile --replace "xcodebuild" "/usr/bin/xcodebuild" + for nib in MainMenu Preferences; do + /usr/bin/ibtool --compile src/MacVim/English.lproj/$nib.nib/keyedobjects.nib src/MacVim/English.lproj/$nib.nib + done ''; configureFlags = [ - #"--enable-cscope" # TODO: cscope doesn't build on Darwin yet + "--enable-cscope" "--enable-fail-if-missing" "--with-features=huge" "--enable-gui=macvim" "--enable-multibyte" "--enable-nls" "--enable-luainterp=dynamic" - "--enable-pythoninterp=dynamic" + "--enable-${python.name}interp=dynamic" "--enable-perlinterp=dynamic" "--enable-rubyinterp=dynamic" "--enable-tclinterp=yes" "--without-local-dir" "--with-luajit" "--with-lua-prefix=${luajit}" + "--with-${python.name}-command=${python.pkg}/bin/${python.name}" "--with-ruby-command=${ruby}/bin/ruby" "--with-tclsh=${tcl}/bin/tclsh" "--with-tlib=ncurses" @@ -58,8 +76,8 @@ stdenv.mkDerivation rec { makeFlags = ''PREFIX=$(out) CPPFLAGS="-Wno-error"''; - # This is unfortunate, but we need to use the same compiler as XCode, - # but XCode doesn't provide a way to configure the compiler. + # This is unfortunate, but we need to use the same compiler as Xcode, + # but Xcode doesn't provide a way to configure the compiler. # # If you're willing to modify the system files, you can do this: # http://hamelot.co.uk/programming/add-gcc-compiler-to-xcode-6/ @@ -72,10 +90,18 @@ stdenv.mkDerivation rec { configureFlagsArray+=( "--with-developer-dir=$DEV_DIR" ) - ''; + '' + # For some reason having LD defined causes PSMTabBarControl to fail at link-time as it + # passes arguments to ld that it meant for clang. + + '' + unset LD + '' + ; postConfigure = '' substituteInPlace src/auto/config.mk --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include" + + substituteInPlace src/MacVim/vimrc --subst-var-by CSCOPE ${cscope}/bin/cscope ''; postInstall = '' @@ -83,13 +109,11 @@ stdenv.mkDerivation rec { cp -r src/MacVim/build/Release/MacVim.app $out/Applications rm -rf $out/MacVim.app - rm $out/bin/{Vimdiff,Vimtutor,Vim,ex,rVim,rview,view} + rm $out/bin/* - cp src/MacVim/mvim $out/bin cp src/vimtutor $out/bin - - for prog in "vimdiff" "vi" "vim" "ex" "rvim" "rview" "view"; do - ln -s $out/bin/mvim $out/bin/$prog + for prog in mvim ex vi vim vimdiff view rvim rvimdiff rview; do + ln -s $out/Applications/MacVim.app/Contents/bin/mvim $out/bin/$prog done # Fix rpaths @@ -97,17 +121,19 @@ stdenv.mkDerivation rec { libperl=$(dirname $(find ${perl} -name "libperl.dylib")) install_name_tool -add_rpath ${luajit}/lib $exe install_name_tool -add_rpath ${tcl}/lib $exe - install_name_tool -add_rpath ${python}/lib $exe + install_name_tool -add_rpath ${python.pkg}/lib $exe install_name_tool -add_rpath $libperl $exe install_name_tool -add_rpath ${ruby}/lib $exe + + # Remove manpages from tools we aren't providing + find $out/share/man \( -name eVim.1 -or -name xxd.1 \) -delete ''; meta = with stdenv.lib; { - broken = true; # needs ruby 2.2 description = "Vim - the text editor - for macOS"; - homepage = https://github.com/b4winckler/macvim; + homepage = https://github.com/macvim-dev/macvim; license = licenses.vim; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan lilyball ]; platforms = platforms.darwin; }; } diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index e8f34aba537d..8cb96a9ebbad 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -1,65 +1,98 @@ diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj -index c384bf7..bf1ce96 100644 +index e519018de..556a4127d 100644 --- a/src/MacVim/MacVim.xcodeproj/project.pbxproj +++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj -@@ -437,6 +437,8 @@ - /* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { - isa = PBXProject; -+ attributes = { -+ }; - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */; - compatibilityVersion = "Xcode 2.4"; - developmentRegion = English; -@@ -632,6 +634,7 @@ - INSTALL_PATH = "$(HOME)/Applications"; +@@ -1007,6 +1007,7 @@ + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = ""; ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = "-headerpad_max_install_names"; + PRODUCT_BUNDLE_IDENTIFIER = org.vim.MacVim; PRODUCT_NAME = MacVim; VERSIONING_SYSTEM = "apple-generic"; - WARNING_CFLAGS = "-Wall"; -@@ -662,6 +665,7 @@ - INSTALL_PATH = "$(HOME)/Applications"; +@@ -1039,6 +1040,7 @@ + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = ""; ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = "-headerpad_max_install_names"; + PRODUCT_BUNDLE_IDENTIFIER = org.vim.MacVim; PRODUCT_NAME = MacVim; VERSIONING_SYSTEM = "apple-generic"; - WRAPPER_EXTENSION = app; +diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc +index 23a06bf37..dfb10fe94 100644 +--- a/src/MacVim/vimrc ++++ b/src/MacVim/vimrc +@@ -14,35 +14,5 @@ set backspace+=indent,eol,start + " translated to English). + set langmenu=none + +-" Python2 +-" MacVim is configured by default to use the pre-installed System python2 +-" version. However, following code tries to find a Homebrew, MacPorts or +-" an installation from python.org: +-if exists("&pythondll") && exists("&pythonhome") +- if filereadable("/usr/local/Frameworks/Python.framework/Versions/2.7/Python") +- " Homebrew python 2.7 +- set pythondll=/usr/local/Frameworks/Python.framework/Versions/2.7/Python +- elseif filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python") +- " MacPorts python 2.7 +- set pythondll=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python +- elseif filereadable("/Library/Frameworks/Python.framework/Versions/2.7/Python") +- " https://www.python.org/downloads/mac-osx/ +- set pythondll=/Library/Frameworks/Python.framework/Versions/2.7/Python +- endif +-endif +- +-" Python3 +-" MacVim is configured by default to use Homebrew python3 version +-" If this cannot be found, following code tries to find a MacPorts +-" or an installation from python.org: +-if exists("&pythonthreedll") && exists("&pythonthreehome") && +- \ !filereadable(&pythonthreedll) +- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.7/Python") +- " MacPorts python 3.7 +- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.7/Python +- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.7/Python") +- " https://www.python.org/downloads/mac-osx/ +- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.7/Python +- endif +-endif +- ++" Default cscopeprg to the Nix-installed path ++set cscopeprg=@CSCOPE@ diff --git a/src/Makefile b/src/Makefile -index 84a93f7..e23196d 100644 +index 32810d0a7..13a05f349 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -1306,7 +1306,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ +@@ -1385,7 +1385,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ MacVim/MacVim.m - MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o objects/pty.o \ + MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \ objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o -MACVIMGUI_DEFS = -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe -+MACVIMGUI_DEFS = -DMACOS_X_UNIX -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe ++MACVIMGUI_DEFS = -DMACOS_X_DARWIN -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe MACVIMGUI_IPATH = MACVIMGUI_LIBS_DIR = MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon diff --git a/src/auto/configure b/src/auto/configure -index cdc0819..8e2fd16 100755 +index 9e6a82f4a..3c6d1a89b 100755 --- a/src/auto/configure +++ b/src/auto/configure -@@ -5383,10 +5383,7 @@ $as_echo "no" >&6; } +@@ -5829,10 +5829,7 @@ $as_echo "not found" >&6; } + + for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do + if test "X$path" != "X"; then +- if test "x$MACOS_X" = "xyes"; then +- MZSCHEME_LIBS="-framework Racket" +- MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" +- elif test -f "${path}/libmzscheme3m.a"; then ++ if test -f "${path}/libmzscheme3m.a"; then + MZSCHEME_LIBS="${path}/libmzscheme3m.a" + MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" + elif test -f "${path}/libracket3m.a"; then +@@ -6217,23 +6214,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi - if test "X$vi_cv_path_mzscheme_pfx" != "X"; then -- if test "x$MACOSX" = "xyes"; then -- MZSCHEME_LIBS="-framework Racket" -- MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" -- elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then -+ if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then - MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a" - MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" - elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"; then -@@ -5731,23 +5728,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } - fi - - if test "x$MACOSX" = "xyes"; then + if test "x$MACOS_X" = "xyes"; then - dir=/System/Library/Perl - darwindir=$dir/darwin - if test -d $darwindir; then @@ -80,21 +113,22 @@ index cdc0819..8e2fd16 100755 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` fi -@@ -5954,13 +5934,6 @@ __: +@@ -6456,13 +6436,7 @@ __: eof eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" -- if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \ +- if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \ - "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then - vi_cv_path_python_plibs="-framework Python" - if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then - vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" - fi - else - if test "${vi_cv_var_python_version}" = "1.4"; then - vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" - else -@@ -5979,7 +5952,6 @@ eof ++ + vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" + if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then + python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` +@@ -6477,7 +6451,6 @@ eof fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` @@ -102,7 +136,7 @@ index cdc0819..8e2fd16 100755 fi -@@ -6055,13 +6027,6 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -6556,13 +6529,6 @@ rm -f core conftest.err conftest.$ac_objext \ $as_echo "no" >&6; } fi @@ -116,11 +150,11 @@ index cdc0819..8e2fd16 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS -@@ -6919,11 +6884,7 @@ $as_echo "$tclver - OK" >&6; }; +@@ -7456,11 +7422,7 @@ $as_echo "$tclver - OK" >&6; }; { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 $as_echo_n "checking for location of Tcl include... " >&6; } -- if test "x$MACOSX" != "xyes"; then +- if test "x$MACOS_X" != "xyes"; then tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" - else - tclinc="/System/Library/Frameworks/Tcl.framework/Headers" @@ -128,104 +162,63 @@ index cdc0819..8e2fd16 100755 TCL_INC= for try in $tclinc; do if test -f "$try/tcl.h"; then -@@ -6941,12 +6902,8 @@ $as_echo "" >&6; } +@@ -7478,12 +7440,8 @@ $as_echo "" >&6; } if test -z "$SKIP_TCL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 $as_echo_n "checking for location of tclConfig.sh script... " >&6; } -- if test "x$MACOSX" != "xyes"; then +- if test "x$MACOS_X" != "xyes"; then tclcnf=`echo $tclinc | sed s/include/lib/g` tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" - else - tclcnf="/System/Library/Frameworks/Tcl.framework" - fi for try in $tclcnf; do - if test -f $try/tclConfig.sh; then + if test -f "$try/tclConfig.sh"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 -@@ -7120,10 +7077,6 @@ $as_echo "$rubyhdrdir" >&6; } +@@ -7673,10 +7631,6 @@ $as_echo "$rubyhdrdir" >&6; } if test -f "$rubylibdir/$librubya"; then librubyarg="$librubyarg" RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" -- elif test -d "/System/Library/Frameworks/Ruby.framework"; then +- elif test "$vi_cv_path_ruby" = "/usr/bin/ruby" -a -d "/System/Library/Frameworks/Ruby.framework"; then - RUBY_LIBS="-framework Ruby" -- RUBY_CFLAGS="-DRUBY_VERSION=$rubyversion" +- RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion" - librubyarg= fi if test "X$librubyarg" != "X"; then -diff --git a/src/if_python.c b/src/if_python.c -index 1d87cac..9d28df0 100644 ---- a/src/if_python.c -+++ b/src/if_python.c -@@ -55,11 +55,7 @@ - - #define PY_SSIZE_T_CLEAN - --#ifdef FEAT_GUI_MACVIM --# include --#else --# include --#endif -+#include - - #if !defined(PY_VERSION_HEX) || PY_VERSION_HEX < 0x02050000 - # undef PY_SSIZE_T_CLEAN -diff --git a/src/if_ruby.c b/src/if_ruby.c -index 1deb83e..ac23878 100644 ---- a/src/if_ruby.c -+++ b/src/if_ruby.c -@@ -106,17 +106,9 @@ - # define rb_check_type rb_check_type_stub - #endif - --#ifdef FEAT_GUI_MACVIM --# include --#else --# include --#endif -+#include - #ifdef RUBY19_OR_LATER --# ifdef FEAT_GUI_MACVIM --# include --# else --# include --# endif -+# include - #endif - - #undef off_t /* ruby defines off_t as _int64, Mingw uses long */ diff --git a/src/vim.h b/src/vim.h -index 4c93908..edc6bd7 100644 +index cb5be6c97..b703b31cd 100644 --- a/src/vim.h +++ b/src/vim.h -@@ -308,18 +308,6 @@ - # define UNUSED +@@ -241,18 +241,6 @@ + # define SUN_SYSTEM #endif --/* if we're compiling in C++ (currently only KVim), the system +-/* If we're compiling in C++ (currently only KVim), the system - * headers must have the correct prototypes or nothing will build. -- * conversely, our prototypes might clash due to throw() specifiers and +- * Conversely, our prototypes might clash due to throw() specifiers and - * cause compilation failures even though the headers are correct. For - * a concrete example, gcc-3.2 enforces exception specifications, and - * glibc-2.2.5 has them in their system headers. - */ -#if !defined(__cplusplus) && defined(UNIX) \ -- && !defined(MACOS_X) /* MACOS_X doesn't yet support osdef.h */ +- && !defined(MACOS_X) /* MACOS_X doesn't yet support osdef.h */ -# include "auto/osdef.h" /* bring missing declarations in */ -#endif - - #ifdef __EMX__ - # define getcwd _getcwd2 - # define chdir _chdir2 + #ifdef AMIGA + # include "os_amiga.h" + #endif diff --git a/src/vimtutor b/src/vimtutor -index 70d9ec7..b565a1a 100755 +index 1e8769b25..47078b0e7 100755 --- a/src/vimtutor +++ b/src/vimtutor -@@ -16,7 +16,7 @@ seq="vim vim8 vim75 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" +@@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" if test "$1" = "-g"; then # Try to use the GUI version of Vim if possible, it will fall back # on Vim if Gvim is not installed. -- seq="gvim gvim8 gvim75 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" -+ seq="mvim gvim gvim8 gvim75 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" +- seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" ++ seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" shift fi From dca70ab1e105e1974f45b3b8af9f025ed0bbd0a9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 11 Jun 2019 21:50:30 -0500 Subject: [PATCH 006/106] skype: 8.46.0.60 -> 8.47.0.59 --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 92416dce6c8a..8f15c08cfc69 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.46.0.60"; + version = "8.47.0.59"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -58,7 +58,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "0v7a28zmgx1mxqgyfrj8byvjs9ibnirqplly8ll221gns8qjvrls"; + sha256 = "0haiccmimbj1nyyyj556b0a181walmxwbbr0m18m2w67wi5z783r"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; From 4affff7f3d0be83044854d4d665142f54ddc4a38 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 11 Jun 2019 08:50:21 -0500 Subject: [PATCH 007/106] txr: 216 -> 217 --- pkgs/tools/misc/txr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index 4618324a75ab..316dc8e09c1e 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "txr"; - version = "216"; + version = "217"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "07cxdpc9zsqd0c2668g00dqjpd6zc4mfdn74aarr6d2hpzdhh937"; + sha256 = "0q4v7zsbflzvw1xskacdnj0z8qng8c9pcvaa54f2jnnq7crkrd4q"; }; nativeBuildInputs = [ bison flex ]; From 66fffe99d85f7d1f7d7a7f655b35bf8b13f93811 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Wed, 12 Jun 2019 23:33:13 +0200 Subject: [PATCH 008/106] winePackages.fonts: init at 4.0 "Wine's fonts should be a natural candidate for their own subpackage" https://wiki.winehq.org/Packaging They are a replacement for some Microsoft fonts not available in other replacement packages. --- pkgs/misc/emulators/wine/fonts.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/wine-packages.nix | 1 + 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/misc/emulators/wine/fonts.nix diff --git a/pkgs/misc/emulators/wine/fonts.nix b/pkgs/misc/emulators/wine/fonts.nix new file mode 100644 index 000000000000..0ee1b3973d86 --- /dev/null +++ b/pkgs/misc/emulators/wine/fonts.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, callPackage }: +let src = (callPackage ./sources.nix {}).stable; +in +stdenv.mkDerivation { + pname = "wine-fonts"; + inherit (src) version; + + sourceRoot = "wine-${src.version}/fonts"; + inherit src; + + installPhase = '' + install *.ttf -Dt $out/share/fonts/wine + ''; + + meta = { + description = "Microsoft replacement fonts by the Wine project"; + homepage = "https://wiki.winehq.org/Create_Fonts"; + license = with lib.licenses; [ lgpl21Plus ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ avnik raskin bendlas johnazoidberg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30163fe7ec77..c5420809e6c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23918,7 +23918,7 @@ in inherit wineBuild; inherit (callPackage ./wine-packages.nix {}) - minimal base full stable unstable staging; + minimal base full stable unstable staging fonts; }); winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32")); diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 3a81a3d99bce..2c47a362c9a1 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -1,6 +1,7 @@ { stdenv, config, callPackage, wineBuild }: rec { + fonts = callPackage ../misc/emulators/wine/fonts.nix {}; minimal = callPackage ../misc/emulators/wine { wineRelease = config.wine.release or "stable"; inherit wineBuild; From 3303bc1fd70f75226dadf2113a1f038aca14dc77 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Wed, 12 Jun 2019 23:36:10 +0200 Subject: [PATCH 009/106] wine: Use proper license attribute --- pkgs/misc/emulators/wine/base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 4c3a2b2d588f..6e11eaaa5b57 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -114,8 +114,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { passthru = { inherit pkgArches; }; meta = { inherit version platforms; - homepage = http://www.winehq.org/; - license = "LGPL"; + homepage = "https://www.winehq.org/"; + license = with stdenv.lib.licenses; [ lgpl21Plus ]; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; maintainers = with stdenv.lib.maintainers; [ avnik raskin bendlas ]; }; From 42170cbf58d45b76ca38d67380f8523386a1e5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Thu, 13 Jun 2019 02:23:15 +0200 Subject: [PATCH 010/106] gitlab: add link to nixos test in passthru.tests --- pkgs/applications/version-management/gitlab/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 2ffe1141b5a0..584006db1007 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv -, ruby, tzdata, git, procps, nettools +, ruby, tzdata, git, procps, nettools, nixosTests , gitlabEnterprise ? false }: @@ -95,6 +95,9 @@ stdenv.mkDerivation rec { GITLAB_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION; GITLAB_SHELL_VERSION = data.passthru.GITLAB_SHELL_VERSION; GITLAB_WORKHORSE_VERSION = data.passthru.GITLAB_WORKHORSE_VERSION; + tests = { + nixos-test-passes = nixosTests.gitlab; + }; }; meta = with lib; { From 6063569f0a546b3c22f1fa01791e4652615054a9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 14 Jun 2019 16:20:00 -0500 Subject: [PATCH 011/106] timescaledb: disable telemetry --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 17270e34f759..7fa128baabce 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { sha256 = "1q3c4qsy4vb00a4p15km4w5d5xcppigf7rp4mqr3wln7i4d4lvnx"; }; + cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" ]; + # Fix the install phase which tries to install into the pgsql extension dir, # and cannot be manually overridden. This is rather fragile but works OK. patchPhase = '' From d8bb988dd00e7e7430d5ee4984f4496c6162e7a5 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Fri, 14 Jun 2019 15:22:48 +0200 Subject: [PATCH 012/106] perlPackages.SysCPU: remove broken attribute Still not back on CPAN but on metacpan. --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9bb86da861e2..aaca6ddc333b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14624,7 +14624,6 @@ let sha256 = "1r6976bs86j7zp51m5vh42xlyah951jgdlkimv202413kjvqc2i5"; }; buildInputs = stdenv.lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon; - meta.broken = true; # src.url is 404 }; SysHostnameLong = buildPerlPackage rec { From 05f7301a9e962f67da5be2a845d14b55dd6a5397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 15 Jun 2019 08:16:06 +0100 Subject: [PATCH 013/106] zfs: 0.8.0 -> 0.8.1 --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index b422fe2c3222..8708afd1fb00 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -174,9 +174,9 @@ in { # this package should point to a version / git revision compatible with the latest kernel release # This is now "stable". Move to zfsStable after it's tested more. - version = "0.8.0"; + version = "0.8.1"; - sha256 = "1lqb9q2im5bbm4l8kfb31cb6rvy37h5ni6rnqlki127ynilymkj8"; + sha256 = "0wlbziijx08a9bmbyq4gfz4by9l5jrx44g18i99qnfm78k2q8a84"; isUnstable = true; extraPatches = [ From b916d11a6e5e30c6d105bae4b37fdb001ab58266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 15 Jun 2019 08:16:35 +0100 Subject: [PATCH 014/106] zfsUnstable: 0.8.0 -> 0.8.1 --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 8708afd1fb00..62b347ee7354 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -159,9 +159,9 @@ in { # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "0.8.0"; + version = "0.8.1"; - sha256 = "1lqb9q2im5bbm4l8kfb31cb6rvy37h5ni6rnqlki127ynilymkj8"; + sha256 = "0wlbziijx08a9bmbyq4gfz4by9l5jrx44g18i99qnfm78k2q8a84"; extraPatches = [ ./build-fixes-unstable.patch From d20e963e91f9f70a3f814fd8d045722cd31d4116 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Jun 2019 13:25:53 -0700 Subject: [PATCH 015/106] pythonPackages.pydocumentdb: init at 2.3.3 --- .../python-modules/pydocumentdb/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/pydocumentdb/default.nix diff --git a/pkgs/development/python-modules/pydocumentdb/default.nix b/pkgs/development/python-modules/pydocumentdb/default.nix new file mode 100644 index 000000000000..4413f9eef2e7 --- /dev/null +++ b/pkgs/development/python-modules/pydocumentdb/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, lib +, fetchPypi +, six +, requests +}: + +buildPythonPackage rec { + version = "2.3.3"; + pname = "pydocumentdb"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fcp3g62pc9hpa0r6vdjhaln4h0azywjqfzi8bd4414ja0mxmj3p"; + }; + + propagatedBuildInputs = [ six requests ]; + + # requires an active Azure Cosmos service + doCheck = false; + + meta = with lib; { + description = "Azure Cosmos DB API"; + homepage = https://github.com/Azure/azure-cosmos-python; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 61801eee1581..4e4182e2c953 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -704,6 +704,8 @@ in { pydocstyle = callPackage ../development/python-modules/pydocstyle { }; + pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; + pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 {})); py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; From cd730d57f09bcaff075184ba750bff645187e9c9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Jun 2019 13:53:58 -0700 Subject: [PATCH 016/106] pythonPackages.azure-cosmos: init at 3.1.0 --- .../python-modules/azure-cosmos/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/azure-cosmos/default.nix diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix new file mode 100644 index 000000000000..2b7c7ded276c --- /dev/null +++ b/pkgs/development/python-modules/azure-cosmos/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, lib +, fetchPypi +, six +, requests +}: + +buildPythonPackage rec { + version = "3.1.0"; + pname = "azure-cosmos"; + + src = fetchPypi { + inherit pname version; + sha256 = "1955kpn2y16k5mil90bnnyscnh1hyh4d5l5v5b90ms969p61i9zl"; + }; + + propagatedBuildInputs = [ six requests ]; + + # requires an active Azure Cosmos service + doCheck = false; + + meta = with lib; { + description = "Azure Cosmos DB API"; + homepage = https://github.com/Azure/azure-cosmos-python; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 61801eee1581..2a51428713ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -254,6 +254,8 @@ in { azure-common = callPackage ../development/python-modules/azure-common { }; + azure-cosmos = callPackage ../development/python-modules/azure-cosmos { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; From 5141948ba9ad7be183455b1c66ed02cbb1b2e7fd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 22 May 2019 00:21:21 -0400 Subject: [PATCH 017/106] gthumb: 3.6.2 -> 3.8.0 * enable clutter-gtk support Upstream defaults to it so we probably should as well. --- pkgs/applications/graphics/gthumb/default.nix | 93 +++++++++++++++---- 1 file changed, 77 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 6f4ddf27b90d..6bcee18651b0 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,32 +1,93 @@ -{ stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool, - exiv2, libjpeg, libtiff, gst_all_1, libraw, libsoup, libsecret, - glib, gtk3, gsettings-desktop-schemas, - libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison, - flex, wrapGAppsHook, shared-mime-info }: +{ stdenv +, fetchurl +, fetchpatch +, gnome3 +, pkgconfig +, meson +, ninja +, exiv2 +, libjpeg +, libtiff +, gst_all_1 +, libraw +, libsoup +, libsecret +, glib +, gtk3 +, gsettings-desktop-schemas +, libchamplain +, librsvg +, libwebp +, json-glib +, webkitgtk +, lcms2 +, bison +, flex +, clutter-gtk +, wrapGAppsHook +, shared-mime-info +, python3 +, desktop-file-utils +, itstool +}: stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.6.2"; + version = "3.8.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rjb0bsjhn7nyl5jyjgrypvr6qdr9dc2g586j3lzan96a2vnpgy9"; + sha256 = "1l2s1facq1r6yvqjqc34aqfzlvb3nhkhn79xisxbbdlgrrxdq52f"; }; - nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ]; + nativeBuildInputs = [ + bison + desktop-file-utils + flex + itstool + meson + ninja + pkgconfig + python3 + wrapGAppsHook + ]; buildInputs = [ - glib gtk3 gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base - exiv2 libjpeg libtiff libraw libsoup libsecret libchamplain - librsvg libwebp json-glib webkitgtk lcms2 gnome3.adwaita-icon-theme + clutter-gtk + exiv2 + glib + gnome3.adwaita-icon-theme + gsettings-desktop-schemas + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + gtk3 + json-glib + lcms2 + libchamplain + libjpeg + libraw + librsvg + libsecret + libsoup + libtiff + libwebp + webkitgtk ]; - enableParallelBuilding = true; - - configureFlags = [ - "--enable-libchamplain" + mesonFlags = [ + "-Dlibchamplain=true" ]; + postPatch = '' + chmod +x gthumb/make-gthumb-h.py + + patchShebangs data/gschemas/make-enums.py \ + gthumb/make-gthumb-h.py \ + po/make-potfiles-in.py \ + postinstall.py \ + gthumb/make-authors-tab.py + ''; + preFixup = '' gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; @@ -41,7 +102,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Gthumb"; description = "Image browser and viewer for GNOME"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.mimadrid ]; }; } From 28070039aea7972f19c2264c1d8406e6a754165f Mon Sep 17 00:00:00 2001 From: Chris Rendle-Short Date: Sun, 16 Jun 2019 07:57:09 +1000 Subject: [PATCH 018/106] gnome-mpv: 0.13 -> 0.16 --- .../video/gnome-mpv/appdata-validate.patch | 11 +++++++++++ pkgs/applications/video/gnome-mpv/default.nix | 19 ++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/video/gnome-mpv/appdata-validate.patch diff --git a/pkgs/applications/video/gnome-mpv/appdata-validate.patch b/pkgs/applications/video/gnome-mpv/appdata-validate.patch new file mode 100644 index 000000000000..45721d2b72e9 --- /dev/null +++ b/pkgs/applications/video/gnome-mpv/appdata-validate.patch @@ -0,0 +1,11 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -43,7 +43,7 @@ configure_file( + + appstream_util = find_program('appstream-util', required: false) + if appstream_util.found() +- test('Validate appstream file', appstream_util, args: ['validate', appdata]) ++ test('Validate appstream file', appstream_util, args: ['validate', '--nonet', appdata]) + endif + + desktop_file_validate = find_program('desktop-file-validate', required: false) diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix index 75a299d46c7d..e734922b1c78 100644 --- a/pkgs/applications/video/gnome-mpv/default.nix +++ b/pkgs/applications/video/gnome-mpv/default.nix @@ -4,21 +4,22 @@ }: stdenv.mkDerivation rec { - name = "gnome-mpv-${version}"; - version = "0.13"; + pname = "gnome-mpv"; + version = "0.16"; src = fetchFromGitHub { - owner = "gnome-mpv"; - repo = "gnome-mpv"; - rev = "0d73b33d60050fd32bf8fae77d831548970a0b69"; # upstream forgot to update appdata - # rev = "v${version}"; - sha256 = "1cjhw3kz163iwj2japhnv354i1lr112xyyfkxw82cwy2554cfim4"; + owner = "celluloid-player"; + repo = "celluloid"; + rev = "v${version}"; + sha256 = "1fj5mr1dwd07jpnigk7z85xdm6yaf7spbvf60aj3mz12m05b1b2w"; }; nativeBuildInputs = [ meson ninja python3 appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ]; buildInputs = [ epoxy glib gtk3 mpv ]; - enableParallelBuilding = true; + patches = [ + ./appdata-validate.patch + ]; postPatch = '' patchShebangs meson_post_install.py @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { allowing access to mpv's powerful playback capabilities through an easy-to-use user interface. ''; - homepage = https://github.com/gnome-mpv/gnome-mpv; + homepage = "https://github.com/celluloid-player/celluloid"; license = licenses.gpl3Plus; platforms = platforms.linux; }; From aa2f3eb8b102ffed4258a7e7fbc0a7d17b7ba319 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 15 Jun 2019 20:36:21 +0200 Subject: [PATCH 019/106] mutt: 1.12.0 -> 1.12.1 --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 8bdba1893e2d..f259fdebf228 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "13zr2fpql33sdbsjsiaa952js5bvphc1x4lqsj36qyzdhj3l84na"; + sha256 = "0311sip2q90aqaxn7h3cck1zl98b4vifqi8bp5fsizy4dr06bi81"; }; patches = optional smimeSupport (fetchpatch { From dc1228d1b124488fd557ba20834486a1aaac5d47 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 16 Jun 2019 12:02:41 +0200 Subject: [PATCH 020/106] afew: 1.3.0 -> 2.0.0 --- .../networking/mailreaders/afew/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index bdf39de0651c..29f44e53333a 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "afew"; - version = "1.3.0"; + version = "2.0.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0105glmlkpkjqbz350dxxasvlfx9dk0him9vwbl86andzi106ygz"; + sha256 = "0j60501nm242idf2ig0h7p6wrg58n5v2p6zfym56v9pbvnbmns0s"; }; nativeBuildInputs = with pythonPackages; [ sphinx setuptools_scm ]; @@ -15,20 +15,23 @@ pythonPackages.buildPythonApplication rec { pythonPackages.notmuch chardet dkimpy ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32; - postBuild = '' - make -C docs man - ''; - - postInstall = '' - mandir="$out/share/man/man1" - mkdir -p "$mandir" - cp docs/build/man/* "$mandir" - ''; - makeWrapperArgs = [ ''--prefix PATH ':' "${notmuch}/bin"'' ]; + outputs = [ "out" "doc" ]; + + postBuild = '' + python setup.py build_sphinx -b html,man + ''; + + postInstall = '' + install -D -v -t $out/share/man/man1 build/sphinx/man/* + mkdir -p $out/share/doc/afew + cp -R build/sphinx/html/* $out/share/doc/afew + ''; + + meta = with stdenv.lib; { homepage = https://github.com/afewmail/afew; description = "An initial tagging script for notmuch mail"; From 856d601b64f35b5a1cb1cf3f713b6d95c85f39de Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 16 Jun 2019 12:05:23 +0200 Subject: [PATCH 021/106] gns3Packages.{server,gui}Preview: 2.2.0b2 -> 2.2.0b3 --- pkgs/applications/networking/gns3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index d1f4b4d21818..7e8601dd723b 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.1.21"; - previewVersion = "2.2.0b2"; + previewVersion = "2.2.0b3"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "0hb22z7vd69dq6nayyyndlyqsnxb3lzgw3ac6m3fnxkv18n1nm6v"; + sha256Hash = "1bzy95zqinwrrga7qj6gvpzvz34w4ddhvgmpgq3p1lwzixpqg1w7"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "1a6ki0asai9x8xm724kha9phr2z8vkqfjwv067p860dpv2d2crxc"; + sha256Hash = "1bq4ww6qhhl0qw6yj7cf7yg54yb4y8mxlnwss6hgbyfv5fz9rxjp"; }; } From 9e480c5dfa1909c58f80ab855a3d5a267aad83c1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 16 Jun 2019 12:15:10 +0200 Subject: [PATCH 022/106] gnome-mpv: use external patch --- .../video/gnome-mpv/appdata-validate.patch | 11 ----------- pkgs/applications/video/gnome-mpv/default.nix | 9 +++++++-- 2 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 pkgs/applications/video/gnome-mpv/appdata-validate.patch diff --git a/pkgs/applications/video/gnome-mpv/appdata-validate.patch b/pkgs/applications/video/gnome-mpv/appdata-validate.patch deleted file mode 100644 index 45721d2b72e9..000000000000 --- a/pkgs/applications/video/gnome-mpv/appdata-validate.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/data/meson.build -+++ b/data/meson.build -@@ -43,7 +43,7 @@ configure_file( - - appstream_util = find_program('appstream-util', required: false) - if appstream_util.found() -- test('Validate appstream file', appstream_util, args: ['validate', appdata]) -+ test('Validate appstream file', appstream_util, args: ['validate', '--nonet', appdata]) - endif - - desktop_file_validate = find_program('desktop-file-validate', required: false) diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix index e734922b1c78..a04eebfcc407 100644 --- a/pkgs/applications/video/gnome-mpv/default.nix +++ b/pkgs/applications/video/gnome-mpv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, python3 +{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, python3 , gettext, pkgconfig, desktop-file-utils, wrapGAppsHook , appstream-glib, epoxy, glib, gtk3, mpv }: @@ -18,7 +18,12 @@ stdenv.mkDerivation rec { buildInputs = [ epoxy glib gtk3 mpv ]; patches = [ - ./appdata-validate.patch + # fix appstream validation in sandbox + # https://github.com/celluloid-player/celluloid/pull/437 + (fetchpatch { + url = https://github.com/celluloid-player/celluloid/commit/5a0b2e892bb715278d309c859a7e521d64433d85.patch; + sha256 = "0naci8lr6128yilal39h46yvq9x3la7g7fhvr5xlwyh30iqrbm3i"; + }) ]; postPatch = '' From 3aa8f9448cfdf24d6322b31805a969af5b9cfdcd Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sun, 16 Jun 2019 12:14:08 +0200 Subject: [PATCH 023/106] zziplib: patch CVE-2018-17828 Fixes https://github.com/NixOS/nixpkgs/issues/61961 Close https://github.com/NixOS/nixpkgs/pull/63189 vcunat amended some nitpicks into the original commit. --- pkgs/development/libraries/zziplib/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 6aede4e9653f..010c73336b92 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,4 +1,4 @@ -{ docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib }: +{ docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib, fetchpatch }: stdenv.mkDerivation rec { name = "zziplib-${version}"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0i052a7shww0fzsxrdp3rd7g4mbzx7324a8ysbc0br7frpblcql4"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-17828.patch"; + url = "https://github.com/gdraheim/zziplib/commit/f609ae8971f3c0ce6.diff"; + sha256 = "0jhiz4fgr93wzh6q03avn95b2nsf6402jaki6hxirxyhs5v9ahry"; + }) + ]; postPatch = '' sed -i -e s,--export-dynamic,, configure ''; From b0ccba1a2da2aa2460fbbf51aaba455e46bd1e27 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 16 Jun 2019 14:24:36 +0200 Subject: [PATCH 024/106] maintainers: add GPG key for rycee --- maintainers/maintainer-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 12c663170600..d9508ed7337e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4443,6 +4443,10 @@ email = "robert@rycee.net"; github = "rycee"; name = "Robert Helgesson"; + keys = [{ + longkeyid = "rsa4096/0x3573356C25C424D4"; + fingerprint = "36CA CF52 D098 CC0E 78FB 0CB1 3573 356C 25C4 24D4"; + }]; }; ryneeverett = { email = "ryneeverett@gmail.com"; From 9e45f6feac633fdc41eaaaa1ad65d77bda252472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 10 Jun 2019 20:27:04 +0200 Subject: [PATCH 025/106] nixos-generate-config: don't generate swapDevices for *files* Up until now, the output has been the same for swap devices and swap files: { device = "/var/swapfile"; } Whereas for swap *files* it's easier to manage them declaratively in configuration.nix: { device = "/var/swapfile"; size = 8192; } (NixOS will create the swapfile, and later resize it, if the size attribute is changed.) With the assumption that swap files are specified in configuration.nix, it's silly to output them to hardware-configuration.nix. --- .../installer/tools/nixos-generate-config.pl | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 0ccdac30d915..9a1157d95013 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -324,10 +324,19 @@ my @swapDevices; if (@swaps) { shift @swaps; foreach my $swap (@swaps) { - $swap =~ /^(\S+)\s/; - next unless -e $1; - my $dev = findStableDevPath $1; - push @swapDevices, "{ device = \"$dev\"; }"; + my @fields = split ' ', $swap; + my $swapFilename = $fields[0]; + my $swapType = $fields[1]; + next unless -e $swapFilename; + my $dev = findStableDevPath $swapFilename; + if ($swapType =~ "partition") { + push @swapDevices, "{ device = \"$dev\"; }"; + } elsif ($swapType =~ "file") { + # swap *files* are more likely specified in configuration.nix, so + # ignore them here. + } else { + die "Unsupported swap type: $swapType\n"; + } } } From 4213e48dd9779e2ad770dc48c25e5eae0dfb3fbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 10 Jun 2019 21:59:01 +0200 Subject: [PATCH 026/106] nixos-generate-config: add dm-snapshot module if LVM is detected Without this, the system becomes unbootable if the user creates a LVM snapshot and reboots. Fixes https://github.com/NixOS/nixpkgs/issues/33646 (The same kind of problem was fixed in RHEL a few years back: https://bugzilla.redhat.com/show_bug.cgi?id=1287940) --- nixos/modules/installer/tools/nixos-generate-config.pl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 9a1157d95013..4c255ad47869 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -264,6 +264,11 @@ if (scalar @bcacheDevices > 0) { push @initrdAvailableKernelModules, "bcache"; } +# Prevent unbootable systems if LVM snapshots are present at boot time. +if (`lsblk -o TYPE` =~ "lvm") { + push @initrdKernelModules, "dm-snapshot"; +} + my $virt = `systemd-detect-virt`; chomp $virt; @@ -526,6 +531,7 @@ sub multiLineList { } my $initrdAvailableKernelModules = toNixStringList(uniq @initrdAvailableKernelModules); +my $initrdKernelModules = toNixStringList(uniq @initrdKernelModules); my $kernelModules = toNixStringList(uniq @kernelModules); my $modulePackages = toNixList(uniq @modulePackages); @@ -545,6 +551,7 @@ my $hwConfig = < Date: Sun, 16 Jun 2019 06:33:37 -0700 Subject: [PATCH 027/106] armadillo: 9.400.4 -> 9.500.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/armadillo/versions --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index c65689136646..10649092d20d 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "9.400.4"; + version = "9.500.2"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1wv08i8mq16hswxkll3kmbfih4hz4d8v7apszm76lwxpya2bm65l"; + sha256 = "17npgyavzrbf4d3m28f9j7j8hk2pc91ai9nkkp39hkdflq3kw6hb"; }; nativeBuildInputs = [ cmake ]; From c7239f3aae123461a14398903ac31cc6bc7acf1f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 06:16:52 -0700 Subject: [PATCH 028/106] ammonite: 1.6.7 -> 1.6.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ammonite/versions --- pkgs/development/tools/ammonite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index a7c94601dd88..d4edbf44a798 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.6.7"; + version = "1.6.8"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "0d7iqgyvsyl8m02bwcsvp11q73xcsvzwwipjzlbqrgi0jivf34pw"; + sha256 = "1lqc071v5f8dy1da669l0bfw9p8l6yavzlizzig9m441zcrmbj5d"; }; propagatedBuildInputs = [ jre ] ; From 66add9f141a6612cf9b361fb2c4ce3c54049d61f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 11 May 2019 20:19:30 -0400 Subject: [PATCH 029/106] slack: Generalize theming Split out dark theme Fixes #61155 --- .../instant-messengers/slack/dark-theme.nix | 22 +++++++++++++++++++ .../instant-messengers/slack/default.nix | 10 ++++----- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/slack/dark-theme.nix diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix new file mode 100644 index 000000000000..11e2e5baed87 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +let + rev = "56d2007b5ba9f1628a44af6edf5dbdf74cf92278"; + sha256 = "1v264mpf9ddiz8zb7fcyjwy1a2yr5f4xs520gf63kl9378v721da"; + version = "2019-03-15"; +in stdenv.mkDerivation { + inherit version; + + name = "slack-theme-black"; + src = fetchurl { + url = "https://raw.githubusercontent.com/laCour/slack-night-mode/${rev}/css/raw/black.css"; + inherit sha256; + }; + + unpackPhase = "true"; + + buildCommand = '' + mkdir $out + cp $src $out/theme.css + ''; +} diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index a48cd2cad0fb..bd1a39565592 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,9 +1,7 @@ -{ stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, +{ theme ? null, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk_pixbuf, libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg, -at-spi2-atk, libuuid, -darkMode ? false, -darkModeCssUrl ? "https://cdn.rawgit.com/laCour/slack-night-mode/master/css/raw/black.css" +at-spi2-atk, libuuid }: let @@ -94,12 +92,12 @@ in stdenv.mkDerivation { substituteInPlace $out/share/applications/slack.desktop \ --replace /usr/bin/ $out/bin/ \ --replace /usr/share/ $out/share/ - '' + stdenv.lib.optionalString darkMode '' + '' + stdenv.lib.optionalString (theme != null) '' cat <> $out/lib/slack/resources/app.asar.unpacked/src/static/ssb-interop.js document.addEventListener('DOMContentLoaded', function() { let tt__customCss = ".menu ul li a:not(.inline_menu_link) {color: #fff !important;}" $.ajax({ - url: '${darkModeCssUrl}', + url: '${theme}/theme.css', success: function(css) { \$("").appendTo('head').html(css + tt__customCss); \$("").appendTo('head').html('#reply_container.upload_in_threads .inline_message_input_container {background: padding-box #545454}'); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ab395f091b4..dddd9041f274 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18371,7 +18371,8 @@ in leftwm = callPackage ../applications/window-managers/leftwm { }; slack = callPackage ../applications/networking/instant-messengers/slack { }; - slack-dark = pkgs.slack.override { darkMode = true; }; + slack-theme-black = callPackage ../applications/networking/instant-messengers/slack/dark-theme.nix { }; + slack-dark = pkgs.slack.override { theme = slack-theme-black; }; slack-cli = callPackage ../tools/networking/slack-cli { }; From 8f551be9356e3b9a8da528ecfd6f96e5ebde7981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 16 Jun 2019 16:16:34 +0200 Subject: [PATCH 030/106] nixos-generate-config: don't emit tmpfs entry for /tmp Because it most likely comes from the boot.tmpOnTmpfs option in configuration.nix (managed declaratively). --- nixos/modules/installer/tools/nixos-generate-config.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 4c255ad47869..c09def1fceae 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -441,6 +441,10 @@ EOF } } + # Don't emit tmpfs entry for /tmp, because it most likely comes from the + # boot.tmpOnTmpfs option in configuration.nix (managed declaratively). + next if ($mountPoint eq "/tmp" && $fsType eq "tmpfs"); + # Emit the filesystem. $fileSystems .= < Date: Sun, 16 Jun 2019 22:51:51 +0800 Subject: [PATCH 031/106] cargo-make: 0.19.5 -> 0.20.0 --- pkgs/development/tools/rust/cargo-make/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index da42e819ced6..03c3a75bc1a3 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.19.5"; + version = "0.20.0"; src = let @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "0xjyzsi3n3lb5g4gl6v0s4p87nazkqgjf244m792iji9i568ynjb"; + sha256 = "0hf8g91iv4c856whaaqrv5s8z56gi3086pva6vdwmn75gwxkw7zk"; }; cargo-lock = fetchurl { - url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/285cf8f9b0ab33db0d656fdc8e759feed55c0167/cargo-make-Cargo.lock"; - sha256 = "0l2i2hq43k482m2w6hpapaq53r8bjljfcszp6csljj4fvxcl62yj"; + url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/8b4ca42376199d4e4781473b4112ef8f18bbd1cc/cargo-make-Cargo.lock"; + sha256 = "1zffq7r1cnzdqw4d3vdvlwj56pfak9gj14ibn1g0j7lncwxw2dgs"; }; in runCommand "cargo-make-src" {} '' @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1rmdmvr5wc2m0yv3dy07cv9y1xrwlfri3hk97zjwv5f73wgncspy"; + cargoSha256 = "1r2fiwcjf739rkprrwidgsd9i5pjgk723ipazmlccz2jpwbrk7zr"; # Some tests fail because they need network access. # However, Travis ensures a proper build. From 22671c79280bc534693a4609085d9dcb31faa0a4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 08:31:18 -0700 Subject: [PATCH 032/106] btrfs-progs: 5.1 -> 5.1.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/btrfs-progs/versions --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index b4539eb2f009..d78cdff2273a 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; - version = "5.1"; + version = "5.1.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0dgh56pamav8wb9nmabjwdlpcazvqc9pgzwablxn77mqh0qrhkaq"; + sha256 = "06xybs7rglxjqkbzl2409acb3rgmnc5zc0xhyaxsc2p1x5yipfcw"; }; nativeBuildInputs = [ From 49ec880303b6300fa9d6c95b1ed82768df08fff9 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Mon, 10 Jun 2019 10:42:21 +0800 Subject: [PATCH 033/106] alacritty: 0.3.2 -> 0.3.3 --- pkgs/applications/misc/alacritty/default.nix | 47 ++++++++++---------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index dfd1ddf8503f..c69a523691f2 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -2,23 +2,27 @@ lib, fetchFromGitHub, rustPlatform, + cmake, + gzip, makeWrapper, ncurses, - expat, pkgconfig, - freetype, + python3, + + expat, fontconfig, + freetype, + libGL, libX11, - gzip, libXcursor, - libXxf86vm, libXi, libXrandr, - libGL, - xclip, - wayland, + libXxf86vm, + libxcb, libxkbcommon, + wayland, + # Darwin Frameworks cf-private, AppKit, @@ -34,37 +38,39 @@ with rustPlatform; let rpathLibs = [ expat - freetype fontconfig + freetype + libGL libX11 libXcursor - libXxf86vm - libXrandr - libGL libXi + libXrandr + libXxf86vm + libxcb ] ++ lib.optionals stdenv.isLinux [ - wayland libxkbcommon + wayland ]; in buildRustPackage rec { pname = "alacritty"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "jwilm"; repo = pname; rev = "v${version}"; - sha256 = "16lhxfpwysd5ngw8yq76vbzjdmfzs9plsvairf768hnl290jcpbh"; + sha256 = "1h9zid7bi19qga3a8a2d4x3ma9wf1njmj74s4xnw7nzqqf3dh750"; }; - cargoSha256 = "02q5kkr0zygpm9i2hd1sr246f18pyia1lq9dwjagqk7d2x3xlc7p"; + cargoSha256 = "1rxb5ljgvn881jkxm8772kf815mmp08ci7sqmn2x1jwdcrphhxr1"; nativeBuildInputs = [ cmake - makeWrapper - pkgconfig - ncurses gzip + makeWrapper + ncurses + pkgconfig + python3 ]; buildInputs = rpathLibs @@ -76,11 +82,6 @@ in buildRustPackage rec { outputs = [ "out" "terminfo" ]; - postPatch = '' - substituteInPlace copypasta/src/x11.rs \ - --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\) - ''; - postBuild = lib.optionalString stdenv.isDarwin "make app"; installPhase = '' From 599ec878499fd05bc364e93ec649e8a651a88c58 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 09:05:55 -0700 Subject: [PATCH 034/106] antibody: 4.1.1 -> 4.1.2 (#63210) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/antibody/versions --- pkgs/shells/zsh/antibody/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index fb8a1802e950..0ea3c8d158d0 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "antibody"; - version = "4.1.1"; + version = "4.1.2"; goPackagePath = "github.com/getantibody/antibody"; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "getantibody"; repo = "antibody"; rev = "v${version}"; - sha256 = "1qfic9prdbldvjw0n15jfc9qr4p5h87mjripq2pc4c6x8244phfw"; + sha256 = "1csanmvix7b2sa7nsy8nh3jq6gmhp8i51xivsabm1lj2y30c0ly3"; }; modSha256 = "1p9cw92ivwgpkvjxvwd9anbd1vzhpicm9il4pg37z2kgr2ihhnyh"; From c6830326b21063e9b30782d1d395953cac5a05f8 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 16 Jun 2019 01:26:09 -0500 Subject: [PATCH 035/106] theft: 0.4.4 -> 0.4.5, fix pkg-config file The libtheft.pc file was using prefix=/usr/local for its own relative -L/-l/-I parameters for GCC, giving incorrect results. (This is really more of an upstream bug.) This also adds myself to the maintainer list, and enables builds on non-Linux platforms. Signed-off-by: Austin Seipp --- pkgs/development/libraries/theft/default.nix | 30 +++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index 881f9c033a38..8d72d9a7d8ec 100644 --- a/pkgs/development/libraries/theft/default.nix +++ b/pkgs/development/libraries/theft/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.4.4"; + version = "0.4.5"; name = "theft-${version}"; src = fetchFromGitHub { - owner = "silentbicycle"; - repo = "theft"; - rev = "v${version}"; - sha256 = "1csdhnb10k7vsyd44vjpg430nf6a909wj8af2zawdkbvnxn5wxc4"; + owner = "silentbicycle"; + repo = "theft"; + rev = "v${version}"; + sha256 = "1n2mkawfl2bpd4pwy3mdzxwlqjjvb5bdrr2x2gldlyqdwbk7qjhd"; }; preConfigure = "patchShebangs ./scripts/mk_bits_lut"; @@ -17,13 +17,21 @@ stdenv.mkDerivation rec { checkTarget = "test"; installFlags = [ "PREFIX=$(out)" ]; - postInstall = "install -m644 vendor/greatest.h $out/include/"; + + # fix the libtheft.pc file to use the right installation + # directory. should be fixed upstream, too + postInstall = '' + install -m644 vendor/greatest.h $out/include/ + + substituteInPlace $out/lib/pkgconfig/libtheft.pc \ + --replace "/usr/local" "$out" + ''; - meta = { + meta = with stdenv.lib; { description = "A C library for property-based testing"; - platforms = stdenv.lib.platforms.linux; - homepage = "https://github.com/silentbicycle/theft/"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.kquick ]; + homepage = "https://github.com/silentbicycle/theft/"; + platforms = platforms.unix; + license = licenses.isc; + maintainers = with maintainers; [ kquick thoughtpolice ]; }; } From d67d182b4ccaccf13087fe1a543819108c458c80 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 16 Jun 2019 13:49:23 +0100 Subject: [PATCH 036/106] pythonPackages.django-sites: fix build, flesh out comments --- .../python-modules/django-sites/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix index 63c61131261d..2882e1dc2b93 100644 --- a/pkgs/development/python-modules/django-sites/default.nix +++ b/pkgs/development/python-modules/django-sites/default.nix @@ -4,6 +4,23 @@ buildPythonPackage rec { pname = "django-sites"; version = "0.10"; + src = fetchPypi { + inherit pname version; + sha256 = "f6f9ae55a05288a95567f5844222052b6b997819e174f4bde4e7c23763be6fc3"; + }; + # LICENSE file appears to be missing from pypi package, but expected by the installer + # https://github.com/niwinz/django-sites/issues/11 + postPatch = '' + touch LICENSE + ''; + + propagatedBuildInputs = [ django ]; + + # required files for test don't seem to be included in pypi package, full source for 0.10 + # version doesn't appear to be present on github + # https://github.com/niwinz/django-sites/issues/9 + doCheck = false; + meta = { description = '' Alternative implementation of django "sites" framework @@ -12,14 +29,4 @@ buildPythonPackage rec { homepage = https://github.com/niwinz/django-sites; license = lib.licenses.bsd3; }; - - src = fetchPypi { - inherit pname version; - sha256 = "f6f9ae55a05288a95567f5844222052b6b997819e174f4bde4e7c23763be6fc3"; - }; - - propagatedBuildInputs = [ django ]; - - # django.core.exceptions.ImproperlyConfigured: Requested settings, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. - doCheck = false; } From b058153ec9d8f94f63736d16abc03dce98805b4b Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 16 Jun 2019 13:11:47 +0200 Subject: [PATCH 037/106] hwinfo: 21.64 -> 21.66 --- pkgs/tools/system/hwinfo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 4b0150735e8f..ff9376380569 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, libx86emu, flex, perl }: +{ stdenv, fetchFromGitHub, libx86emu, flex, perl, libuuid }: stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.64"; + version = "21.66"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "0jdwd6xvcsyyk03hv0kyz6pn4nzmgn2ynj8gqai1fxh3l8hv48w8"; + sha256 = "1f841hzh9ik02690h9b1k3ysqv91avsb0zir2ykqz8qj39c5qsxz"; }; patchPhase = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ flex ]; - buildInputs = [ libx86emu perl ]; + buildInputs = [ libx86emu perl libuuid ]; makeFlags = [ "LIBDIR=/lib" ]; #enableParallelBuilding = true; From ad2a9cdd8f55b5106ddf0d361876870d819d8eb9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 05:56:45 -0700 Subject: [PATCH 038/106] abcmidi: 2019.04.22 -> 2019.06.06 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/abcmidi/versions --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index d4107d678019..9082ac329eb3 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2019.04.22"; + version = "2019.06.06"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "18w6sny8hc9yswqxqw5rvv5j07a50q8aaih73d74asm3nwf71rl1"; + sha256 = "1vmz2vj6asvy254y2ap89ah46lxr4pcw7bb827wrs3rzcysmcwjf"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase From 902952d3a3c1f579a6a68da54c4d1403f30ccfdc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 16 Jun 2019 12:27:43 +0200 Subject: [PATCH 039/106] doc: describe pname This was forgotten when RFC 0035 was implemented. --- doc/stdenv.xml | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index a14d78afe71a..d89c368d284b 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -31,9 +31,28 @@ stdenv.mkDerivation { separate Nix expression from pkgs/all-packages.nix, you need to pass it as a function argument.) Specifying a name and a src is the absolute minimum - you need to do. Many packages have dependencies that are not provided in the - standard environment. It’s usually sufficient to specify those - dependencies in the buildInputs attribute: + Nix requires. For convenience, you can also use pname and + version attributes and mkDerivation + will automatically set name to + "${pname}-${version}" by default. Since + RFC 0035, + this is preferred for packages in Nixpkgs, as it allows us to reuse the + version easily: + +stdenv.mkDerivation rec { + name = "libfoo"; + version = "1.2.3"; + src = fetchurl { + url = "http://example.org/libfoo-source-${version}.tar.bz2"; + sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m"; + }; +} + + + + Many packages have dependencies that are not provided in the standard + environment. It’s usually sufficient to specify those dependencies in the + buildInputs attribute: stdenv.mkDerivation { name = "libfoo-1.2.3"; From d1f8e6037107e91adbec26e9ebecd501cfe7c625 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 16 Jun 2019 20:48:44 +0200 Subject: [PATCH 040/106] doc/stdenv: fix typo --- doc/stdenv.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index d89c368d284b..2447dc451301 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -40,7 +40,7 @@ stdenv.mkDerivation { version easily: stdenv.mkDerivation rec { - name = "libfoo"; + pname = "libfoo"; version = "1.2.3"; src = fetchurl { url = "http://example.org/libfoo-source-${version}.tar.bz2"; From ccee4117be08f0474640e06f76a7881389fb7b47 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 16 Jun 2019 14:24:15 -0500 Subject: [PATCH 041/106] bmake: fix version/url, fix tests, remove unneeded deps As noted by @jameysharp in #63181. Signed-off-by: Austin Seipp --- .../build-managers/bmake/bootstrap-fix.patch | 10 ++++++++ .../tools/build-managers/bmake/default.nix | 25 ++++++------------- .../bmake/fix-unexport-env-test.patch | 13 ++++++++++ 3 files changed, 31 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch create mode 100644 pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch diff --git a/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch b/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch new file mode 100644 index 000000000000..9b1267257ad1 --- /dev/null +++ b/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch @@ -0,0 +1,10 @@ +--- bmake/make-bootstrap.sh.in.orig 2019-02-19 10:55:21.733606117 -0800 ++++ bmake/make-bootstrap.sh.in 2019-02-19 10:56:02.150771541 -0800 +@@ -4,6 +4,7 @@ + + srcdir=@srcdir@ + ++prefix="@prefix@" + DEFAULT_SYS_PATH="@default_sys_path@" + + case "@use_meta@" in diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index e101eea0cd39..f71b877c8c52 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -1,31 +1,22 @@ { stdenv, fetchurl -, gnugrep, coreutils, getopt +, getopt }: stdenv.mkDerivation rec { name = "bmake-${version}"; - version = "20121212"; + version = "20181221"; src = fetchurl { - # really wish this URL was versioned. if this changes for some - # update in the future, we'll have to backport those updates to - # any stable branches so builds can continue to work. :( - url = "http://www.crufty.net/ftp/pub/sjg/bmake.tar.gz"; + url = "http://www.crufty.net/ftp/pub/sjg/${name}.tar.gz"; sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw"; }; - nativeBuildInputs = - [ gnugrep coreutils getopt - ]; + nativeBuildInputs = [ getopt ]; - # unexport-env sets PATH to a bogus value that won't be - # possible to use inside the build sandbox. nuke that test; - # we could also re-construct the PATH variable a bit based on - # nativeBuildInputs, but not for now - patchPhase = '' - substituteInPlace ./unit-tests/Makefile.in \ - --replace "unexport-env" "" - ''; + patches = [ + ./bootstrap-fix.patch + ./fix-unexport-env-test.patch + ]; meta = with stdenv.lib; { description = "Portable version of NetBSD 'make'"; diff --git a/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch b/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch new file mode 100644 index 000000000000..339348f37c32 --- /dev/null +++ b/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch @@ -0,0 +1,13 @@ +--- bmake/unit-tests/unexport-env.mk.orig 2019-02-19 10:24:14.356713136 -0800 ++++ bmake/unit-tests/unexport-env.mk 2019-02-19 10:25:43.838775388 -0800 +@@ -3,8 +3,8 @@ + # pick up a bunch of exported vars + .include "export.mk" + +-# an example of setting up a minimal environment. +-PATH = /bin:/usr/bin:/sbin:/usr/sbin ++# preserve PATH so commands used in the "all" target are still available ++PATH := ${PATH} + + # now clobber the environment to just PATH and UT_TEST + UT_TEST = unexport-env From 72ffc46275cd5f5ba48843e66d97b3ce22f3ac77 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 12:35:37 -0700 Subject: [PATCH 042/106] dbeaver: 6.0.5 -> 6.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dbeaver-ce/versions --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 1ffb3e37728e..77a25f2755f0 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "6.0.5"; + version = "6.1.0"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "19gn6vkjl8dpmqpn26llhvc3yahjwj00wqvvimfsrqd32wgj2and"; + sha256 = "0ngfv5pcj8hs7zcddwk0jw0l7hnm768wp76yrfyk38wkijk9f412"; }; installPhase = '' From f3282c8d1e0ce6ba5d9f6aeddcfad51d879c7a4a Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 16 Jun 2019 19:59:06 +0000 Subject: [PATCH 043/106] treewide: remove unused variables (#63177) * treewide: remove unused variables * making ofborg happy --- lib/systems/parse.nix | 2 +- nixos/modules/hardware/video/nvidia.nix | 2 +- .../cd-dvd/installation-cd-graphical-base.nix | 2 +- .../cd-dvd/installation-cd-graphical-gnome.nix | 2 +- nixos/modules/misc/nixops-autoluks.nix | 1 - nixos/modules/misc/version.nix | 2 +- nixos/modules/services/audio/snapserver.nix | 1 - .../modules/services/cluster/kubernetes/default.nix | 7 ------- .../modules/services/cluster/kubernetes/kubelet.nix | 7 ------- nixos/modules/services/cluster/kubernetes/pki.nix | 1 - nixos/modules/services/hardware/triggerhappy.nix | 2 +- nixos/modules/services/mail/rspamd.nix | 1 - nixos/modules/services/monitoring/alerta.nix | 2 +- .../modules/services/monitoring/grafana-reporter.nix | 2 +- nixos/modules/services/monitoring/kapacitor.nix | 2 +- nixos/modules/services/networking/bitcoind.nix | 2 +- nixos/modules/services/system/kerberos/default.nix | 2 +- nixos/modules/services/system/kerberos/heimdal.nix | 2 +- nixos/modules/services/system/kerberos/mit.nix | 2 +- nixos/modules/services/web-apps/limesurvey.nix | 2 +- nixos/modules/services/web-apps/nextcloud.nix | 2 +- nixos/modules/services/web-apps/tt-rss.nix | 1 - nixos/modules/services/web-servers/nginx/default.nix | 11 ----------- nixos/modules/services/x11/xserver.nix | 2 -- nixos/modules/system/boot/kernel_config.nix | 1 - nixos/modules/virtualisation/anbox.nix | 7 +------ nixos/modules/virtualisation/cloudstack-config.nix | 2 +- nixos/modules/virtualisation/docker-containers.nix | 2 +- .../modules/virtualisation/google-compute-config.nix | 1 - pkgs/applications/altcoins/btc1.nix | 2 +- pkgs/applications/altcoins/default.nix | 2 +- pkgs/applications/altcoins/exodus/default.nix | 2 +- pkgs/applications/audio/ams-lv2/default.nix | 2 +- .../audio/bitwig-studio/bitwig-studio2.nix | 4 ++-- pkgs/applications/audio/cadence/default.nix | 2 -- pkgs/applications/audio/calf/default.nix | 2 +- pkgs/applications/audio/cantata/default.nix | 2 +- pkgs/applications/audio/carla/default.nix | 4 ++-- pkgs/applications/audio/chuck/default.nix | 1 - pkgs/applications/audio/cozy-audiobooks/default.nix | 2 -- pkgs/applications/audio/gnome-podcasts/default.nix | 2 +- pkgs/applications/audio/mixxx/default.nix | 2 +- pkgs/applications/audio/parlatype/default.nix | 2 +- pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix | 1 - pkgs/applications/audio/reaper/default.nix | 2 +- pkgs/applications/audio/vocal/default.nix | 1 - pkgs/applications/editors/android-studio/default.nix | 2 +- pkgs/applications/editors/atom/default.nix | 2 +- .../editors/emacs-modes/elpa-packages.nix | 2 +- pkgs/applications/editors/emacs/default.nix | 4 ++-- pkgs/applications/editors/featherpad/default.nix | 2 +- pkgs/applications/editors/gobby/default.nix | 2 +- pkgs/applications/editors/quilter/default.nix | 2 +- pkgs/applications/editors/retext/default.nix | 2 +- pkgs/applications/editors/texmacs/default.nix | 2 +- pkgs/applications/editors/vim/configurable.nix | 2 +- pkgs/applications/editors/vscode/generic.nix | 2 +- pkgs/applications/editors/vscode/vscode.nix | 2 +- pkgs/applications/editors/vscode/vscodium.nix | 2 +- pkgs/applications/editors/vscode/with-extensions.nix | 2 +- pkgs/applications/editors/xmlcopyeditor/default.nix | 2 +- pkgs/applications/gis/qgis/default.nix | 2 +- pkgs/applications/graphics/animbar/default.nix | 2 +- pkgs/applications/graphics/freecad/default.nix | 4 ++-- pkgs/applications/graphics/gcolor3/default.nix | 2 +- pkgs/applications/graphics/gscan2pdf/default.nix | 2 +- pkgs/applications/graphics/image_optim/default.nix | 2 +- pkgs/applications/graphics/jpeg-archive/default.nix | 2 +- pkgs/applications/graphics/krita/default.nix | 1 - pkgs/applications/graphics/shotwell/default.nix | 1 - pkgs/applications/graphics/tesseract/tesseract3.nix | 2 +- pkgs/applications/kde/knotes.nix | 2 +- pkgs/applications/misc/buku/default.nix | 2 +- pkgs/applications/misc/cardpeek/default.nix | 2 +- pkgs/applications/misc/curaengine/default.nix | 2 +- pkgs/applications/misc/ddgr/default.nix | 2 +- pkgs/applications/misc/digitalbitbox/default.nix | 1 - pkgs/applications/misc/electron-cash/default.nix | 6 ------ pkgs/applications/misc/font-manager/default.nix | 2 +- pkgs/applications/misc/gImageReader/default.nix | 4 ++-- pkgs/applications/misc/ganttproject-bin/default.nix | 2 +- pkgs/applications/misc/gremlin-console/default.nix | 2 +- pkgs/applications/misc/k2pdfopt/default.nix | 2 +- pkgs/applications/misc/kitty/default.nix | 2 +- pkgs/applications/misc/lutris/default.nix | 4 ++-- pkgs/applications/misc/taskell/default.nix | 2 +- pkgs/applications/misc/termite/wrapper.nix | 2 +- pkgs/applications/misc/ulauncher/default.nix | 3 --- pkgs/applications/misc/xcruiser/default.nix | 2 +- pkgs/applications/misc/yubioath-desktop/default.nix | 6 +++--- pkgs/applications/misc/zathura/pdf-mupdf/default.nix | 2 +- .../networking/browsers/chromium/common.nix | 2 +- .../networking/browsers/chromium/default.nix | 2 +- .../networking/browsers/firefox-bin/update.nix | 3 +-- .../networking/browsers/firefox/packages.nix | 2 +- .../networking/browsers/firefox/update.nix | 1 - .../networking/browsers/midori/default.nix | 2 +- .../browsers/tor-browser-bundle/default.nix | 2 -- pkgs/applications/networking/charles/default.nix | 3 +-- .../networking/cluster/docker-machine/kvm2.nix | 2 +- .../networking/cluster/kubectl/default.nix | 2 +- .../networking/cluster/minikube/default.nix | 2 +- .../cluster/terraform-landscape/default.nix | 5 ++--- .../applications/networking/cluster/tilt/default.nix | 2 +- .../networking/feedreaders/feedreader/default.nix | 4 ++-- .../networking/feedreaders/newsboat/default.nix | 2 +- pkgs/applications/networking/gns3/default.nix | 2 +- pkgs/applications/networking/gns3/server.nix | 2 +- .../instant-messengers/fractal/default.nix | 2 +- .../networking/instant-messengers/gitter/default.nix | 2 +- .../networking/instant-messengers/nheko/default.nix | 2 +- .../instant-messengers/quaternion/default.nix | 2 +- .../networking/instant-messengers/riot/yarn2nix.nix | 3 +-- .../networking/instant-messengers/sky/default.nix | 4 ++-- .../telegram/telegram-cli/default.nix | 2 +- .../networking/instant-messengers/utox/default.nix | 2 +- .../networking/irc/konversation/default.nix | 1 - pkgs/applications/networking/irc/weechat/default.nix | 3 +-- pkgs/applications/networking/irc/weechat/wrapper.nix | 2 +- .../networking/mailreaders/astroid/default.nix | 2 +- .../networking/mailreaders/sup/default.nix | 2 +- .../networking/mailreaders/thunderbird/default.nix | 2 +- .../networking/modem-manager-gui/default.nix | 2 +- pkgs/applications/networking/mpop/default.nix | 2 +- pkgs/applications/networking/ndppd/default.nix | 2 +- .../networking/newsreaders/pan/default.nix | 2 +- .../networking/nextcloud-client/default.nix | 2 +- .../networking/remote/remmina/default.nix | 2 +- pkgs/applications/networking/sync/rclone/default.nix | 2 +- pkgs/applications/networking/sync/rsync/rrsync.nix | 2 +- pkgs/applications/networking/syncthing/default.nix | 2 +- .../networking/weather/meteo/default.nix | 4 ++-- pkgs/applications/office/aesop/default.nix | 2 +- pkgs/applications/office/bookworm/default.nix | 2 +- pkgs/applications/office/kexi/default.nix | 2 +- pkgs/applications/office/kmymoney/default.nix | 1 - pkgs/applications/office/mendeley/default.nix | 2 +- pkgs/applications/office/mendeley/update.nix | 2 +- pkgs/applications/office/paperless/default.nix | 2 -- pkgs/applications/office/paperwork/default.nix | 2 +- pkgs/applications/office/qownnotes/default.nix | 2 +- pkgs/applications/office/todoman/default.nix | 2 +- pkgs/applications/office/vnote/default.nix | 8 -------- pkgs/applications/office/zotero/default.nix | 2 -- pkgs/applications/radio/rtl-sdr/default.nix | 2 +- .../science/biology/niftyreg/default.nix | 2 +- .../science/biology/niftyseg/default.nix | 2 +- .../science/biology/sumatools/default.nix | 3 +++ .../science/chemistry/openmolcas/default.nix | 2 +- .../science/electronics/dsview/default.nix | 4 ++-- .../applications/science/electronics/eagle/eagle.nix | 4 ++-- .../applications/science/logic/clprover/clprover.nix | 2 +- .../science/logic/cryptominisat/default.nix | 2 +- .../science/machine-learning/sc2-headless/maps.nix | 2 +- pkgs/applications/science/math/caffe/default.nix | 2 +- pkgs/applications/science/math/gap/default.nix | 1 - pkgs/applications/science/math/sage/default.nix | 2 +- pkgs/applications/science/math/sage/sagenb.nix | 1 - .../applications/science/math/scilab-bin/default.nix | 2 -- .../robotics/betaflight-configurator/default.nix | 2 +- pkgs/applications/video/bombono/default.nix | 2 +- pkgs/applications/video/kodi/plugins.nix | 2 +- pkgs/applications/video/lightworks/default.nix | 2 +- pkgs/applications/video/obs-studio/default.nix | 1 - pkgs/applications/video/qstopmotion/default.nix | 2 +- pkgs/applications/video/subtitleeditor/default.nix | 2 +- pkgs/applications/video/vdr/plugins.nix | 2 +- pkgs/applications/video/vlc/default.nix | 1 - .../virtualization/containerd/default.nix | 2 +- pkgs/applications/virtualization/docker/proxy.nix | 2 +- .../virtualization/nvidia-docker/default.nix | 2 +- pkgs/applications/virtualization/railcar/default.nix | 2 +- pkgs/applications/virtualization/runc/default.nix | 2 +- .../virtualization/singularity/default.nix | 2 -- .../virtualization/virtualbox/extpack.nix | 2 +- .../applications/window-managers/compton/default.nix | 4 ++-- .../window-managers/stumpish/default.nix | 2 +- pkgs/build-support/appimage/default.nix | 2 +- pkgs/build-support/closure-info.nix | 2 +- pkgs/build-support/docker/default.nix | 1 - pkgs/build-support/fetchzip/default.nix | 2 +- pkgs/build-support/ocaml/dune.nix | 2 +- .../rust/build-rust-crate/test/default.nix | 2 +- pkgs/build-support/rust/default.nix | 2 +- pkgs/build-support/singularity-tools/default.nix | 3 +-- pkgs/build-support/skaware/build-skaware-package.nix | 2 +- pkgs/data/fonts/arkpandora/default.nix | 2 +- pkgs/data/fonts/baekmuk-ttf/default.nix | 2 +- pkgs/data/fonts/bakoma-ttf/default.nix | 2 +- pkgs/data/fonts/d2coding/default.nix | 2 +- pkgs/data/fonts/lmodern/default.nix | 2 +- pkgs/data/fonts/lmodern/lmmath.nix | 2 +- pkgs/data/fonts/mph-2b-damase/default.nix | 2 +- pkgs/desktops/deepin/dde-api/default.nix | 1 - pkgs/desktops/deepin/dde-daemon/default.nix | 2 +- pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix | 2 +- pkgs/desktops/deepin/deepin-terminal/default.nix | 2 +- pkgs/desktops/deepin/go-gir-generator/default.nix | 2 +- pkgs/desktops/deepin/qcef/default.nix | 9 ++++----- pkgs/desktops/deepin/qt5integration/default.nix | 4 ++-- pkgs/desktops/deepin/udisks2-qt5/default.nix | 2 +- pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix | 2 +- pkgs/desktops/gnome-3/apps/accerciser/default.nix | 1 - .../gnome-3/apps/gnome-documents/default.nix | 2 +- .../gnome-3/apps/gnome-sound-recorder/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-todo/default.nix | 1 - pkgs/desktops/gnome-3/core/gdm/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 2 +- pkgs/desktops/gnome-3/core/gucharmap/default.nix | 2 +- pkgs/desktops/gnome-3/core/mutter/3.28.nix | 2 +- pkgs/desktops/gnome-3/core/tracker/default.nix | 2 +- pkgs/desktops/gnome-3/games/iagno/default.nix | 2 +- .../gnome-3/misc/gnome-flashback/default.nix | 2 -- .../gnome-3/misc/gnome-screensaver/default.nix | 2 -- pkgs/desktops/gnome-3/misc/gpaste/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/gtkhtml/default.nix | 2 +- pkgs/desktops/gnustep/default.nix | 2 +- pkgs/desktops/mate/default.nix | 2 +- pkgs/desktops/mate/engrampa/default.nix | 2 +- pkgs/desktops/mate/eom/default.nix | 2 +- pkgs/desktops/mate/libmatekbd/default.nix | 2 +- pkgs/desktops/mate/mate-media/default.nix | 2 +- .../mate/mate-notification-daemon/default.nix | 2 +- .../pantheon/apps/elementary-code/default.nix | 2 +- .../pantheon/apps/elementary-music/default.nix | 2 +- .../pantheon/apps/elementary-photos/default.nix | 2 +- .../apps/elementary-screenshot-tool/default.nix | 2 +- .../switchboard-plugs/mouse-touchpad/default.nix | 2 +- .../apps/switchboard-plugs/power/default.nix | 2 +- .../switchboard-plugs/security-privacy/default.nix | 2 +- pkgs/desktops/pantheon/apps/switchboard/wrapper.nix | 2 +- .../desktop/elementary-default-settings/default.nix | 2 +- .../pantheon/desktop/elementary-greeter/default.nix | 4 ++-- .../desktop/elementary-session-settings/default.nix | 2 +- .../wingpanel-indicators/datetime/default.nix | 2 +- .../services/elementary-dpms-helper/default.nix | 2 +- .../services/pantheon-agent-geoclue2/default.nix | 2 +- pkgs/desktops/pantheon/update.nix | 2 +- pkgs/desktops/plasma-5/plasma-workspace/default.nix | 2 +- pkgs/desktops/xfce/applications/orage.nix | 2 +- pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 2 +- pkgs/development/androidndk-pkgs/default.nix | 3 +-- pkgs/development/arduino/arduino-mk/default.nix | 2 +- pkgs/development/beam-modules/fetch-rebar-deps.nix | 3 ++- pkgs/development/beam-modules/rebar3-release.nix | 6 ++---- pkgs/development/compilers/chicken/5/eggs.nix | 2 +- pkgs/development/compilers/compcert/default.nix | 2 +- pkgs/development/compilers/dmd/default.nix | 4 ++-- pkgs/development/compilers/elm/default.nix | 4 ++-- pkgs/development/compilers/factor-lang/default.nix | 7 ++----- pkgs/development/compilers/ghc/8.8.1.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 2 +- .../compilers/ghcjs-ng/8.6/dep-overrides.nix | 2 +- pkgs/development/compilers/ghcjs/base.nix | 2 +- pkgs/development/compilers/glslang/default.nix | 2 +- pkgs/development/compilers/go-jsonnet/default.nix | 2 +- pkgs/development/compilers/go/1.10.nix | 2 +- pkgs/development/compilers/go/1.11.nix | 4 ++-- pkgs/development/compilers/go/1.12.nix | 4 ++-- pkgs/development/compilers/graalvm/default.nix | 4 ---- pkgs/development/compilers/ispc/default.nix | 2 +- pkgs/development/compilers/julia/shared.nix | 2 +- pkgs/development/compilers/llvm/5/llvm.nix | 1 - pkgs/development/compilers/llvm/8/clang/default.nix | 2 +- pkgs/development/compilers/llvm/8/libunwind.nix | 2 +- pkgs/development/compilers/llvm/8/llvm.nix | 1 - pkgs/development/compilers/nim/default.nix | 1 - pkgs/development/compilers/openjdk/11.nix | 2 +- pkgs/development/compilers/openspin/default.nix | 2 +- pkgs/development/compilers/rust/default.nix | 4 ++-- pkgs/development/compilers/rust/rustc.nix | 4 ++-- pkgs/development/compilers/swi-prolog/default.nix | 4 ++-- pkgs/development/compilers/swift/default.nix | 1 - pkgs/development/compilers/vala/default.nix | 4 ++-- pkgs/development/compilers/x11basic/default.nix | 2 +- pkgs/development/coq-modules/StructTact/default.nix | 2 +- pkgs/development/coq-modules/ssreflect/default.nix | 2 +- pkgs/development/haskell-modules/generic-builder.nix | 2 +- .../development/haskell-modules/make-package-set.nix | 2 +- .../interpreters/clojurescript/lumo/default.nix | 1 - .../interpreters/lua-5/build-lua-package.nix | 1 - pkgs/development/interpreters/lua-5/default.nix | 2 +- pkgs/development/interpreters/lua-5/wrapper.nix | 1 - pkgs/development/interpreters/luajit/2.1.nix | 2 +- pkgs/development/interpreters/luajit/default.nix | 2 +- pkgs/development/interpreters/perl/wrapper.nix | 2 -- .../interpreters/python/build-python-package.nix | 2 +- .../interpreters/python/cpython/2.7/default.nix | 1 - .../interpreters/python/cpython/default.nix | 1 - .../interpreters/python/mk-python-derivation.nix | 1 - .../development/interpreters/python/pypy/default.nix | 2 +- .../interpreters/python/pypy/prebuilt.nix | 2 -- pkgs/development/interpreters/racket/default.nix | 2 +- pkgs/development/interpreters/ruby/default.nix | 6 +++--- .../interpreters/ruby/rubygems/default.nix | 2 +- pkgs/development/interpreters/spidermonkey/52.nix | 2 +- .../development/java-modules/build-maven-package.nix | 2 +- pkgs/development/java-modules/maven-minimal.nix | 2 +- pkgs/development/libraries/appstream/default.nix | 2 +- pkgs/development/libraries/arb/default.nix | 2 +- pkgs/development/libraries/aws-c-common/default.nix | 2 +- pkgs/development/libraries/boehm-gc/default.nix | 2 +- pkgs/development/libraries/boost/generic.nix | 2 +- pkgs/development/libraries/catch2/default.nix | 2 +- pkgs/development/libraries/cyrus-sasl/default.nix | 2 +- pkgs/development/libraries/czmq/4.x.nix | 2 +- .../libraries/dleyna-renderer/default.nix | 1 - pkgs/development/libraries/eclib/default.nix | 1 - pkgs/development/libraries/editline/default.nix | 2 +- pkgs/development/libraries/eigen/default.nix | 2 +- pkgs/development/libraries/exiv2/default.nix | 2 +- pkgs/development/libraries/flatpak/default.nix | 2 +- pkgs/development/libraries/fmt/default.nix | 2 +- pkgs/development/libraries/gdk-pixbuf/default.nix | 2 +- pkgs/development/libraries/gegl/4.0.nix | 2 +- pkgs/development/libraries/glib/default.nix | 2 +- pkgs/development/libraries/gmp/5.1.x.nix | 2 +- pkgs/development/libraries/gmp/6.x.nix | 2 +- .../libraries/gobject-introspection/default.nix | 2 +- .../libraries/gsettings-desktop-schemas/default.nix | 2 +- pkgs/development/libraries/gsignond/default.nix | 2 +- .../development/libraries/gsignond/plugins/oauth.nix | 2 +- pkgs/development/libraries/gsignond/plugins/sasl.nix | 2 +- pkgs/development/libraries/gsignond/wrapper.nix | 2 +- pkgs/development/libraries/ldacbt/default.nix | 1 - pkgs/development/libraries/leptonica/default.nix | 2 +- pkgs/development/libraries/libao/default.nix | 2 +- pkgs/development/libraries/libaom/default.nix | 2 +- pkgs/development/libraries/libaosd/default.nix | 2 +- pkgs/development/libraries/libbladeRF/default.nix | 2 +- pkgs/development/libraries/libcsptr/default.nix | 2 +- pkgs/development/libraries/libevent/default.nix | 2 +- pkgs/development/libraries/libfaketime/default.nix | 2 +- pkgs/development/libraries/libgdamm/default.nix | 4 ++-- pkgs/development/libraries/libgpg-error/default.nix | 2 +- .../libraries/libhttpseverywhere/default.nix | 2 +- pkgs/development/libraries/libical/default.nix | 2 +- pkgs/development/libraries/libjpeg-turbo/default.nix | 2 +- pkgs/development/libraries/libmikmod/default.nix | 2 +- pkgs/development/libraries/libndctl/default.nix | 2 +- pkgs/development/libraries/libosinfo/default.nix | 2 +- pkgs/development/libraries/libssh/default.nix | 2 +- .../libraries/libtorrent-rasterbar/default.nix | 2 +- pkgs/development/libraries/libuv/default.nix | 2 +- pkgs/development/libraries/libxml2/default.nix | 2 +- pkgs/development/libraries/linbox/default.nix | 1 - pkgs/development/libraries/mapnik/default.nix | 4 ++-- pkgs/development/libraries/mtxclient/default.nix | 2 +- pkgs/development/libraries/nsss/default.nix | 2 +- pkgs/development/libraries/opencv/3.x.nix | 2 +- pkgs/development/libraries/openmpi/default.nix | 2 +- pkgs/development/libraries/openssl/default.nix | 2 +- pkgs/development/libraries/pagmo2/default.nix | 4 +--- pkgs/development/libraries/pcl/default.nix | 2 +- .../libraries/physics/geant4/g4py/default.nix | 2 +- pkgs/development/libraries/pixman/default.nix | 2 +- pkgs/development/libraries/podofo/default.nix | 1 - pkgs/development/libraries/polkit/default.nix | 2 +- .../development/libraries/properties-cpp/default.nix | 4 ++-- pkgs/development/libraries/protobuf/generic-v3.nix | 2 +- pkgs/development/libraries/qpdf/default.nix | 2 +- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 2 +- .../libraries/science/biology/mirtk/default.nix | 2 +- .../libraries/science/math/liblapack/default.nix | 3 +-- .../libraries/science/math/mkl/default.nix | 2 +- .../libraries/science/math/openblas/default.nix | 2 +- pkgs/development/libraries/skalibs/default.nix | 2 +- pkgs/development/libraries/spice-gtk/default.nix | 2 -- pkgs/development/libraries/spice/default.nix | 1 - pkgs/development/libraries/tk/generic.nix | 2 +- pkgs/development/libraries/umockdev/default.nix | 2 +- pkgs/development/libraries/utmps/default.nix | 2 +- pkgs/development/libraries/volume-key/default.nix | 1 - pkgs/development/libraries/vte/2.90.nix | 2 +- pkgs/development/libraries/wlroots/default.nix | 2 +- pkgs/development/libraries/wxwidgets/3.0/default.nix | 2 +- pkgs/development/libraries/wxwidgets/3.0/mac.nix | 2 +- .../libraries/xdg-desktop-portal-gtk/default.nix | 2 +- pkgs/development/lua-modules/default.nix | 2 +- pkgs/development/lua-modules/overrides.nix | 2 +- .../mobile/androidenv/compose-android-packages.nix | 2 +- pkgs/development/mobile/androidenv/default.nix | 2 +- pkgs/development/mobile/androidenv/emulate-app.nix | 1 - pkgs/development/mobile/titaniumenv/build-app.nix | 4 ---- pkgs/development/mobile/titaniumenv/default.nix | 2 +- pkgs/development/ocaml-modules/bap/default.nix | 4 ++-- pkgs/development/ocaml-modules/cohttp/default.nix | 2 +- pkgs/development/ocaml-modules/eliom/default.nix | 3 +-- .../development/ocaml-modules/janestreet/default.nix | 4 ++-- pkgs/development/ocaml-modules/jingoo/default.nix | 2 +- pkgs/development/ocaml-modules/lwt/ppx.nix | 2 +- pkgs/development/ocaml-modules/menhir/generic.nix | 2 +- pkgs/development/ocaml-modules/sqlexpr/ppx.nix | 2 +- pkgs/development/ocaml-modules/zmq/lwt.nix | 2 +- pkgs/development/pharo/vm/default.nix | 2 +- pkgs/development/python-modules/Cython/default.nix | 1 - pkgs/development/python-modules/JPype1/default.nix | 2 +- pkgs/development/python-modules/Nikola/default.nix | 1 - pkgs/development/python-modules/Theano/default.nix | 2 -- .../python-modules/agate-excel/default.nix | 2 +- .../python-modules/aiozeroconf/default.nix | 1 - .../python-modules/alerta-server/default.nix | 2 +- pkgs/development/python-modules/alerta/default.nix | 2 +- pkgs/development/python-modules/altair/default.nix | 2 +- pkgs/development/python-modules/arelle/default.nix | 2 +- pkgs/development/python-modules/astroid/1.6.nix | 2 +- pkgs/development/python-modules/asyncssh/default.nix | 2 +- pkgs/development/python-modules/av/default.nix | 1 - pkgs/development/python-modules/azure/default.nix | 1 - .../backports-shutil-which/default.nix | 2 +- pkgs/development/python-modules/blis/default.nix | 1 - pkgs/development/python-modules/bsddb3/default.nix | 1 - pkgs/development/python-modules/buildbot/default.nix | 2 +- pkgs/development/python-modules/buildbot/pkg.nix | 2 +- pkgs/development/python-modules/buildbot/worker.nix | 2 +- pkgs/development/python-modules/cartopy/default.nix | 2 +- .../python-modules/cassandra-driver/default.nix | 1 - pkgs/development/python-modules/celery/default.nix | 2 +- pkgs/development/python-modules/chalice/default.nix | 1 - pkgs/development/python-modules/click/default.nix | 2 +- pkgs/development/python-modules/cntk/default.nix | 3 +-- .../python-modules/dask-xgboost/default.nix | 1 - pkgs/development/python-modules/distro/default.nix | 2 +- .../python-modules/dj-search-url/default.nix | 1 - pkgs/development/python-modules/django/1_11.nix | 1 - pkgs/development/python-modules/django/1_8.nix | 1 - .../python-modules/django_guardian/default.nix | 2 +- pkgs/development/python-modules/dynd/default.nix | 1 - pkgs/development/python-modules/effect/default.nix | 1 - .../python-modules/elasticsearch-dsl/default.nix | 1 - pkgs/development/python-modules/eyed3/default.nix | 1 - .../python-modules/fastentrypoints/default.nix | 2 +- .../python-modules/fastparquet/default.nix | 2 +- pkgs/development/python-modules/fb-re2/default.nix | 1 - pkgs/development/python-modules/flake8/default.nix | 2 +- pkgs/development/python-modules/gateone/default.nix | 1 - pkgs/development/python-modules/genpy/default.nix | 1 - pkgs/development/python-modules/gipc/default.nix | 1 - .../google-api-python-client/default.nix | 2 +- .../python-modules/grpcio-tools/default.nix | 2 +- pkgs/development/python-modules/gtimelog/default.nix | 1 - pkgs/development/python-modules/gumath/default.nix | 3 +-- pkgs/development/python-modules/hbmqtt/default.nix | 2 +- .../python-modules/hoomd-blue/default.nix | 2 +- pkgs/development/python-modules/howdoi/default.nix | 1 - .../development/python-modules/httpretty/default.nix | 2 -- .../development/python-modules/hyperlink/default.nix | 2 +- pkgs/development/python-modules/ifaddr/default.nix | 1 - .../python-modules/influxgraph/default.nix | 2 +- .../python-modules/infoqscraper/default.nix | 1 - pkgs/development/python-modules/intake/default.nix | 1 - pkgs/development/python-modules/intelhex/default.nix | 1 - pkgs/development/python-modules/ipython/5.nix | 1 - pkgs/development/python-modules/isodate/default.nix | 1 - .../python-modules/jenkins-job-builder/default.nix | 1 - .../python-modules/jsbeautifier/default.nix | 2 +- .../python-modules/keyrings-alt/default.nix | 2 +- .../python-modules/lark-parser/default.nix | 1 - pkgs/development/python-modules/ldap3/default.nix | 2 +- pkgs/development/python-modules/libsexy/default.nix | 2 +- pkgs/development/python-modules/libusb1/default.nix | 2 +- .../python-modules/livestreamer/default.nix | 1 - .../python-modules/matplotlib/default.nix | 2 +- pkgs/development/python-modules/minio/default.nix | 2 +- pkgs/development/python-modules/moinmoin/default.nix | 2 +- pkgs/development/python-modules/moviepy/default.nix | 1 - .../python-modules/msrestazure/default.nix | 1 - pkgs/development/python-modules/ndtypes/default.nix | 4 +--- pkgs/development/python-modules/nixpkgs/default.nix | 1 - pkgs/development/python-modules/nltk/default.nix | 2 +- pkgs/development/python-modules/nuitka/default.nix | 1 - pkgs/development/python-modules/numpy/default.nix | 2 +- pkgs/development/python-modules/odfpy/default.nix | 2 -- pkgs/development/python-modules/ovito/default.nix | 2 +- pkgs/development/python-modules/panel/default.nix | 6 ------ pkgs/development/python-modules/papis/default.nix | 2 +- pkgs/development/python-modules/paramiko/default.nix | 3 --- pkgs/development/python-modules/pastel/default.nix | 2 +- pkgs/development/python-modules/pep8/default.nix | 1 - pkgs/development/python-modules/pims/default.nix | 1 - .../development/python-modules/poetry/jsonschema.nix | 2 +- pkgs/development/python-modules/pplpy/default.nix | 2 -- pkgs/development/python-modules/priority/default.nix | 2 +- .../python-modules/progressbar/default.nix | 2 +- .../development/python-modules/py3status/default.nix | 1 - pkgs/development/python-modules/pyarrow/default.nix | 2 +- .../python-modules/pyasn1-modules/default.nix | 1 - pkgs/development/python-modules/pyblock/default.nix | 1 - pkgs/development/python-modules/pyflakes/default.nix | 2 +- pkgs/development/python-modules/pyftgl/default.nix | 2 +- .../development/python-modules/pyftpdlib/default.nix | 1 - .../python-modules/pygame_sdl2/default.nix | 2 +- pkgs/development/python-modules/pygmo/default.nix | 1 - pkgs/development/python-modules/pyhepmc/default.nix | 1 - pkgs/development/python-modules/pylint/1.9.nix | 2 +- pkgs/development/python-modules/pylint/default.nix | 2 +- .../python-modules/pymatgen-lammps/default.nix | 1 - pkgs/development/python-modules/pyparted/default.nix | 1 - pkgs/development/python-modules/pyqt/5.x.nix | 2 +- .../python-modules/pyreadability/default.nix | 1 - .../python-modules/pytest-ansible/default.nix | 1 - .../python-modules/pytest-benchmark/default.nix | 1 - .../python-modules/python-engineio/default.nix | 1 - .../python-modules/python-jenkins/default.nix | 4 ---- .../python-modules/python-mapnik/default.nix | 1 - .../python-modules/python-snappy/default.nix | 1 - pkgs/development/python-modules/pyutil/default.nix | 1 - pkgs/development/python-modules/pyuv/default.nix | 1 - pkgs/development/python-modules/pywbem/default.nix | 2 +- pkgs/development/python-modules/qrcode/default.nix | 1 - .../python-modules/requests-aws4auth/default.nix | 2 +- .../python-modules/restructuredtext_lint/default.nix | 1 - .../python-modules/samplerate/default.nix | 1 - .../python-modules/scikit-bio/default.nix | 1 - .../python-modules/scikitlearn/default.nix | 2 +- pkgs/development/python-modules/scipy/default.nix | 2 +- .../python-modules/selectors34/default.nix | 1 - .../python-modules/simplejson/default.nix | 1 - .../sqlalchemy-imageattach/default.nix | 1 - .../python-modules/sqlalchemy-migrate/default.nix | 2 +- pkgs/development/python-modules/ssdp/default.nix | 1 - .../development/python-modules/structlog/default.nix | 1 - .../python-modules/tensorflow-estimator/default.nix | 2 +- pkgs/development/python-modules/tensorflow/bin.nix | 3 +-- pkgs/development/python-modules/tflearn/default.nix | 2 +- pkgs/development/python-modules/tqdm/default.nix | 1 - pkgs/development/python-modules/tweepy/default.nix | 2 +- pkgs/development/python-modules/unicorn/default.nix | 2 +- pkgs/development/python-modules/uuid/default.nix | 2 +- .../python-modules/vowpalwabbit/default.nix | 2 +- pkgs/development/python-modules/webapp2/default.nix | 1 - pkgs/development/python-modules/weboob/default.nix | 2 +- pkgs/development/python-modules/werkzeug/default.nix | 2 +- .../python-modules/wrf-python/default.nix | 2 +- pkgs/development/python-modules/xdot/default.nix | 2 +- pkgs/development/python-modules/xgboost/default.nix | 3 +-- pkgs/development/python-modules/xnd/default.nix | 4 +--- pkgs/development/python-modules/yattag/default.nix | 2 +- .../python-modules/zope_configuration/default.nix | 1 - pkgs/development/python-modules/zstd/default.nix | 2 +- .../development/ruby-modules/bundled-common/test.nix | 2 +- pkgs/development/ruby-modules/bundler-env/test.nix | 2 +- pkgs/development/tools/analysis/radare2/default.nix | 3 +-- pkgs/development/tools/analysis/valgrind/default.nix | 2 +- pkgs/development/tools/aws-sam-cli/default.nix | 1 - pkgs/development/tools/bazel-watcher/default.nix | 2 -- .../tools/build-managers/alibuild/default.nix | 2 +- .../tools/build-managers/bazel/bash-tools-test.nix | 2 +- .../build-managers/bazel/bazel-remote/default.nix | 1 - .../tools/build-managers/bazel/default.nix | 6 +++--- .../build-managers/bazel/python-bin-path-test.nix | 2 +- .../tools/build-managers/cmake/default.nix | 2 +- pkgs/development/tools/build-managers/gn/default.nix | 2 +- pkgs/development/tools/clang-tools/default.nix | 2 +- pkgs/development/tools/cloudfoundry-cli/default.nix | 2 +- pkgs/development/tools/cppclean/default.nix | 2 +- pkgs/development/tools/dapper/default.nix | 1 - pkgs/development/tools/database/cdb/default.nix | 2 +- pkgs/development/tools/database/dbmate/default.nix | 2 +- pkgs/development/tools/database/pgcli/default.nix | 2 +- pkgs/development/tools/erlang/cuter/default.nix | 2 +- pkgs/development/tools/erlang/relx-exe/default.nix | 2 +- pkgs/development/tools/fusee-launcher/default.nix | 1 - .../tools/github-changelog-generator/default.nix | 2 +- .../tools/global-platform-pro/default.nix | 2 +- pkgs/development/tools/jq/default.nix | 2 +- pkgs/development/tools/kubicorn/default.nix | 2 +- pkgs/development/tools/kustomize/default.nix | 2 +- pkgs/development/tools/kythe/default.nix | 2 +- pkgs/development/tools/misc/binutils/default.nix | 1 - pkgs/development/tools/misc/gdb/default.nix | 2 +- pkgs/development/tools/misc/gdbgui/default.nix | 3 --- pkgs/development/tools/misc/kibana/6.x.nix | 1 - pkgs/development/tools/misc/kibana/7.x.nix | 1 - pkgs/development/tools/misc/swig/2.x.nix | 2 +- pkgs/development/tools/misc/swig/3.x.nix | 2 +- .../tools/misc/teensy-loader-cli/default.nix | 2 +- pkgs/development/tools/packet/default.nix | 2 +- pkgs/development/tools/remarshal/default.nix | 2 +- pkgs/development/tools/simavr/default.nix | 4 ++-- .../tools/solarus-quest-editor/default.nix | 2 +- pkgs/development/tools/sourcetrail/default.nix | 2 +- .../tools/vulkan-validation-layers/default.nix | 2 +- pkgs/development/tools/wp-cli/default.nix | 2 +- pkgs/development/tools/xcbuild/sdks.nix | 4 ++-- pkgs/development/tools/xcbuild/wrapper.nix | 2 +- pkgs/development/web/nodejs/update.nix | 3 +-- pkgs/development/web/nodejs/v10.nix | 2 +- pkgs/development/web/nodejs/v11.nix | 2 +- pkgs/development/web/nodejs/v12.nix | 2 +- pkgs/development/web/nodejs/v8.nix | 2 +- pkgs/games/anki/default.nix | 2 -- pkgs/games/dwarf-fortress/default.nix | 1 - pkgs/games/dwarf-fortress/dfhack/default.nix | 3 --- .../games/dwarf-fortress/dwarf-therapist/wrapper.nix | 2 +- pkgs/games/dwarf-fortress/lazy-pack.nix | 2 +- pkgs/games/dwarf-fortress/twbt/default.nix | 4 ---- pkgs/games/dwarf-fortress/wrapper/default.nix | 2 +- pkgs/games/factorio/default.nix | 2 +- pkgs/games/freeorion/default.nix | 2 +- pkgs/games/frogatto/default.nix | 2 +- pkgs/games/frogatto/engine.nix | 2 +- pkgs/games/leela-zero/default.nix | 2 +- pkgs/games/linux-steam-integration/default.nix | 2 +- pkgs/games/minetest/default.nix | 2 +- pkgs/games/openra/default.nix | 1 - pkgs/games/openra/engines.nix | 2 +- pkgs/games/openra/mods.nix | 2 +- pkgs/games/pro-office-calculator/default.nix | 2 +- pkgs/games/steam/chrootenv.nix | 2 +- pkgs/games/super-tux-kart/default.nix | 2 +- pkgs/games/teeworlds/default.nix | 2 +- pkgs/misc/cups/default.nix | 2 +- pkgs/misc/cups/drivers/samsung/1.00.36/default.nix | 2 +- pkgs/misc/emulators/ccemux/default.nix | 2 +- pkgs/misc/emulators/citra/default.nix | 2 +- pkgs/misc/lilypond/unstable.nix | 2 +- pkgs/misc/lilypond/with-fonts.nix | 1 - pkgs/misc/screensavers/betterlockscreen/default.nix | 2 +- pkgs/misc/themes/adwaita-qt/default.nix | 2 +- pkgs/misc/vim-plugins/default.nix | 2 +- pkgs/os-specific/bsd/netbsd/default.nix | 2 +- .../apple-source-releases/Security/default.nix | 2 +- .../darwin/apple-source-releases/default.nix | 2 +- .../darwin/apple-source-releases/libutil/default.nix | 2 +- pkgs/os-specific/darwin/cctools/port.nix | 2 +- pkgs/os-specific/linux/anbox/default.nix | 2 +- pkgs/os-specific/linux/anbox/kmod.nix | 2 +- pkgs/os-specific/linux/bpftool/default.nix | 2 +- pkgs/os-specific/linux/cryptsetup/default.nix | 2 +- pkgs/os-specific/linux/ffado/default.nix | 2 +- .../linux/firmware/raspberrypi-wireless/default.nix | 2 +- pkgs/os-specific/linux/iptables/default.nix | 2 +- pkgs/os-specific/linux/kernel-headers/default.nix | 2 +- pkgs/os-specific/linux/kernel/generic.nix | 1 - pkgs/os-specific/linux/kmod/default.nix | 2 +- pkgs/os-specific/linux/libcap-ng/default.nix | 2 +- pkgs/os-specific/linux/mdadm/default.nix | 2 +- pkgs/os-specific/linux/nfs-utils/default.nix | 2 +- pkgs/os-specific/linux/numactl/default.nix | 2 +- pkgs/os-specific/linux/perf-tools/default.nix | 2 +- pkgs/os-specific/linux/sdnotify-wrapper/default.nix | 2 +- pkgs/os-specific/linux/speedometer/default.nix | 2 +- pkgs/os-specific/linux/sssd/default.nix | 2 +- .../linux/systemd/cryptsetup-generator.nix | 2 +- pkgs/os-specific/linux/systemd/default.nix | 2 +- pkgs/os-specific/linux/tp_smapi/update.nix | 2 +- pkgs/os-specific/linux/wpa_supplicant/default.nix | 2 +- pkgs/os-specific/linux/zfs/default.nix | 2 +- pkgs/os-specific/windows/w32api/default.nix | 2 +- pkgs/servers/clickhouse/default.nix | 2 +- pkgs/servers/dns/knot-resolver/default.nix | 2 +- pkgs/servers/foundationdb/cmake.nix | 4 ++-- pkgs/servers/home-assistant/default.nix | 2 +- pkgs/servers/home-assistant/esphome.nix | 2 +- pkgs/servers/http/apache-httpd/2.4.nix | 2 +- pkgs/servers/icingaweb2/theme-snow/default.nix | 2 +- pkgs/servers/mail/opensmtpd/default.nix | 2 +- pkgs/servers/mqtt/mosquitto/default.nix | 2 +- pkgs/servers/mxisd/default.nix | 2 +- pkgs/servers/nextcloud/default.nix | 2 +- pkgs/servers/oauth2_proxy/default.nix | 2 +- pkgs/servers/openafs/1.8/module.nix | 2 +- pkgs/servers/plex/default.nix | 4 ++-- pkgs/servers/roundcube/default.nix | 2 +- pkgs/servers/samba/4.x.nix | 2 +- pkgs/servers/search/elasticsearch/plugins.nix | 4 +--- pkgs/servers/slimserver/default.nix | 2 +- pkgs/servers/sql/postgresql/ext/pgjwt.nix | 2 +- pkgs/servers/web-apps/codimd/CodeMirror/default.nix | 2 +- pkgs/servers/x11/xorg/overrides.nix | 4 ++-- pkgs/servers/zoneminder/default.nix | 3 +-- pkgs/shells/zsh/default.nix | 2 +- pkgs/shells/zsh/zsh-git-prompt/default.nix | 1 - .../zsh/zsh-history-substring-search/default.nix | 2 +- pkgs/stdenv/darwin/default.nix | 1 - pkgs/stdenv/darwin/make-bootstrap-tools.nix | 4 +--- pkgs/stdenv/generic/make-derivation.nix | 1 - pkgs/test/kernel.nix | 2 +- pkgs/tools/X11/caffeine-ng/default.nix | 2 +- pkgs/tools/X11/nx-libs/default.nix | 2 +- pkgs/tools/X11/wpgtk/default.nix | 2 +- pkgs/tools/X11/xpra/xf86videodummy/default.nix | 3 +-- pkgs/tools/admin/aws-env/default.nix | 2 +- pkgs/tools/admin/cli53/default.nix | 2 +- pkgs/tools/admin/lxd/default.nix | 2 +- pkgs/tools/admin/nomachine-client/default.nix | 2 +- pkgs/tools/audio/mpdcron/default.nix | 2 +- pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix | 2 +- pkgs/tools/backup/borg/default.nix | 2 +- pkgs/tools/backup/dedup/default.nix | 2 +- pkgs/tools/backup/dirvish/default.nix | 2 +- pkgs/tools/filesystems/bees/default.nix | 2 +- pkgs/tools/filesystems/btrfs-progs/default.nix | 2 +- pkgs/tools/filesystems/go-mtpfs/default.nix | 2 +- pkgs/tools/filesystems/moosefs/default.nix | 2 -- pkgs/tools/graphics/gmic_krita_qt/default.nix | 2 +- pkgs/tools/graphics/zbar/default.nix | 2 +- pkgs/tools/inputmethods/ibus/default.nix | 2 +- pkgs/tools/misc/0x0/default.nix | 2 +- pkgs/tools/misc/capture/default.nix | 2 +- pkgs/tools/misc/colord/default.nix | 2 -- pkgs/tools/misc/direnv/default.nix | 2 +- pkgs/tools/misc/execline/default.nix | 2 +- pkgs/tools/misc/hashit/default.nix | 2 +- pkgs/tools/misc/megacli/default.nix | 2 +- pkgs/tools/misc/memtest86-efi/default.nix | 2 +- pkgs/tools/misc/pb_cli/default.nix | 2 +- pkgs/tools/misc/remind/default.nix | 2 +- pkgs/tools/misc/rrdtool/default.nix | 2 +- pkgs/tools/misc/s6-portable-utils/default.nix | 2 +- pkgs/tools/misc/snapper/default.nix | 2 +- pkgs/tools/misc/xdummy/default.nix | 2 +- pkgs/tools/misc/youtube-dl/default.nix | 1 - pkgs/tools/networking/amass/default.nix | 1 - pkgs/tools/networking/dnsperf/default.nix | 2 +- pkgs/tools/networking/gping/default.nix | 3 +-- pkgs/tools/networking/ipgrep/default.nix | 2 +- pkgs/tools/networking/nettee/default.nix | 2 +- pkgs/tools/networking/network-manager/default.nix | 4 ++-- .../networking/network-manager/l2tp/default.nix | 2 +- pkgs/tools/networking/ocserv/default.nix | 2 +- pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 2 +- pkgs/tools/networking/persepolis/default.nix | 2 +- pkgs/tools/networking/photon/default.nix | 2 +- pkgs/tools/networking/quickserve/default.nix | 2 +- pkgs/tools/networking/s6-dns/default.nix | 2 +- pkgs/tools/networking/slack-cli/default.nix | 2 +- pkgs/tools/networking/strongswan/default.nix | 4 +--- pkgs/tools/networking/telepresence/default.nix | 2 +- pkgs/tools/networking/tinyproxy/default.nix | 2 +- pkgs/tools/nix/nixdoc/default.nix | 2 +- .../package-management/appimage-run/default.nix | 2 +- pkgs/tools/package-management/apt-dater/default.nix | 2 +- pkgs/tools/package-management/nix-top/default.nix | 1 - .../package-management/nix-update-source/default.nix | 2 +- pkgs/tools/package-management/nix/default.nix | 2 +- pkgs/tools/package-management/nixops/default.nix | 2 +- pkgs/tools/security/browserpass/default.nix | 2 +- pkgs/tools/security/keybase/gui.nix | 4 ++-- pkgs/tools/security/monkeysphere/default.nix | 2 +- pkgs/tools/security/pass/extensions/genphrase.nix | 2 +- pkgs/tools/security/qesteidutil/default.nix | 2 +- pkgs/tools/security/sbsigntool/default.nix | 2 +- pkgs/tools/security/sshuttle/default.nix | 2 +- pkgs/tools/security/tcpcrypt/default.nix | 2 +- pkgs/tools/security/tpm2-tools/default.nix | 2 +- pkgs/tools/system/journalbeat/default.nix | 2 +- pkgs/tools/system/osquery/default.nix | 2 +- pkgs/tools/system/s6/default.nix | 2 +- pkgs/tools/system/smartmontools/default.nix | 2 +- pkgs/tools/text/discount/default.nix | 2 +- pkgs/tools/text/fanficfare/default.nix | 2 +- pkgs/tools/text/mb2md/default.nix | 2 +- pkgs/tools/text/sgml/opensp/default.nix | 2 +- pkgs/tools/typesetting/biber/default.nix | 2 +- pkgs/tools/virtualization/rootlesskit/default.nix | 2 +- pkgs/top-level/all-packages.nix | 10 +++------- pkgs/top-level/config.nix | 12 +----------- pkgs/top-level/coq-packages.nix | 3 +-- pkgs/top-level/emacs-packages.nix | 4 ++-- pkgs/top-level/lua-packages.nix | 7 +++---- pkgs/top-level/ocaml-packages.nix | 6 ++---- pkgs/top-level/python-packages.nix | 4 +--- pkgs/top-level/static.nix | 3 +-- 765 files changed, 661 insertions(+), 959 deletions(-) diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 7f5912a13a75..b088cd342f12 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -428,7 +428,7 @@ rec { mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s)); - doubleFromSystem = { cpu, vendor, kernel, abi, ... }: + doubleFromSystem = { cpu, kernel, abi, ... }: /**/ if abi == abis.cygnus then "${cpu.name}-cygwin" else if kernel.families ? darwin then "${cpu.name}-darwin" else "${cpu.name}-${kernel.name}"; diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 9f2360f41c6e..a5740929a310 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -1,6 +1,6 @@ # This module provides the proprietary NVIDIA X11 / OpenGL drivers. -{ stdenv, config, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index 917b3758d384..f65239a5bc0a 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -1,7 +1,7 @@ # This module contains the basic configuration for building a graphical NixOS # installation CD. -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: with lib; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 42b5ec882272..0b813bbf37b4 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -1,7 +1,7 @@ # This module defines a NixOS installation CD that contains X11 and # GNOME 3. -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/misc/nixops-autoluks.nix b/nixos/modules/misc/nixops-autoluks.nix index 2153c6f975ad..20c143286afa 100644 --- a/nixos/modules/misc/nixops-autoluks.nix +++ b/nixos/modules/misc/nixops-autoluks.nix @@ -1,7 +1,6 @@ { config, options, lib, ... }: let path = [ "deployment" "autoLuks" ]; - hasAutoLuksOption = lib.hasAttrByPath path options; hasAutoLuksConfig = lib.hasAttrByPath path config && (lib.attrByPath path {} config) != {}; inherit (config.nixops) enableDeprecatedAutoLuks; diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index c9b374b6d7b1..3ae60cb79160 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -1,4 +1,4 @@ -{ options, config, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/audio/snapserver.nix b/nixos/modules/services/audio/snapserver.nix index f709dd7fe16b..b0b9264e8166 100644 --- a/nixos/modules/services/audio/snapserver.nix +++ b/nixos/modules/services/audio/snapserver.nix @@ -4,7 +4,6 @@ with lib; let - package = "snapcast"; name = "snapserver"; cfg = config.services.snapserver; diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 5e46bfc4240f..143b41f57f6a 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -72,13 +72,6 @@ let default = null; }; }; - - kubeConfigDefaults = { - server = mkDefault cfg.kubeconfig.server; - caFile = mkDefault cfg.kubeconfig.caFile; - certFile = mkDefault cfg.kubeconfig.certFile; - keyFile = mkDefault cfg.kubeconfig.keyFile; - }; in { ###### interface diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index ccc8a16e788a..4c5df96bcc6a 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -28,13 +28,6 @@ let kubeconfig = top.lib.mkKubeConfig "kubelet" cfg.kubeconfig; - manifests = pkgs.buildEnv { - name = "kubernetes-manifests"; - paths = mapAttrsToList (name: manifest: - pkgs.writeTextDir "${name}.json" (builtins.toJSON manifest) - ) cfg.manifests; - }; - manifestPath = "kubernetes/manifests"; taintOptions = with lib.types; { name, ... }: { diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index e68660e8bdd4..47384ae50a07 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -118,7 +118,6 @@ in cfsslCertPathPrefix = "${config.services.cfssl.dataDir}/cfssl"; cfsslCert = "${cfsslCertPathPrefix}.pem"; cfsslKey = "${cfsslCertPathPrefix}-key.pem"; - cfsslPort = toString config.services.cfssl.port; certmgrPaths = [ top.caFile diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixos/modules/services/hardware/triggerhappy.nix index bffe7353b10e..a500cb4fc367 100644 --- a/nixos/modules/services/hardware/triggerhappy.nix +++ b/nixos/modules/services/hardware/triggerhappy.nix @@ -17,7 +17,7 @@ let ${cfg.extraConfig} ''; - bindingCfg = { config, ... }: { + bindingCfg = { ... }: { options = { keys = mkOption { diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index c9ba86780213..5541b8b79b7e 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -5,7 +5,6 @@ with lib; let cfg = config.services.rspamd; - opts = options.services.rspamd; postfixCfg = config.services.postfix; bindSocketOpts = {options, config, ... }: { diff --git a/nixos/modules/services/monitoring/alerta.nix b/nixos/modules/services/monitoring/alerta.nix index 8f4258e26ded..d423a91993c7 100644 --- a/nixos/modules/services/monitoring/alerta.nix +++ b/nixos/modules/services/monitoring/alerta.nix @@ -1,4 +1,4 @@ -{ options, config, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/monitoring/grafana-reporter.nix b/nixos/modules/services/monitoring/grafana-reporter.nix index 827cf6322cfd..b5a78e4583e1 100644 --- a/nixos/modules/services/monitoring/grafana-reporter.nix +++ b/nixos/modules/services/monitoring/grafana-reporter.nix @@ -1,4 +1,4 @@ -{ options, config, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/monitoring/kapacitor.nix b/nixos/modules/services/monitoring/kapacitor.nix index a4bdfa8f8053..cc4074be111b 100644 --- a/nixos/modules/services/monitoring/kapacitor.nix +++ b/nixos/modules/services/monitoring/kapacitor.nix @@ -1,4 +1,4 @@ -{ options, config, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixos/modules/services/networking/bitcoind.nix index e94265564595..d3501636b41d 100644 --- a/nixos/modules/services/networking/bitcoind.nix +++ b/nixos/modules/services/networking/bitcoind.nix @@ -28,7 +28,7 @@ let "-datadir=${cfg.dataDir}" "-pid=${pidFile}" ]; - hexStr = types.strMatching "[0-9a-f]+"; + rpcUserOpts = { name, ... }: { options = { name = mkOption { diff --git a/nixos/modules/services/system/kerberos/default.nix b/nixos/modules/services/system/kerberos/default.nix index 26ac85de402f..c55241c4cff1 100644 --- a/nixos/modules/services/system/kerberos/default.nix +++ b/nixos/modules/services/system/kerberos/default.nix @@ -1,4 +1,4 @@ -{pkgs, config, lib, ...}: +{config, lib, ...}: let inherit (lib) mkOption mkIf types length attrNames; diff --git a/nixos/modules/services/system/kerberos/heimdal.nix b/nixos/modules/services/system/kerberos/heimdal.nix index d0f470f836ed..f0e56c7951a4 100644 --- a/nixos/modules/services/system/kerberos/heimdal.nix +++ b/nixos/modules/services/system/kerberos/heimdal.nix @@ -2,7 +2,7 @@ let inherit (lib) mkIf concatStringsSep concatMapStrings toList mapAttrs - mapAttrsToList attrValues; + mapAttrsToList; cfg = config.services.kerberos_server; kerberos = config.krb5.kerberos; stateDir = "/var/heimdal"; diff --git a/nixos/modules/services/system/kerberos/mit.nix b/nixos/modules/services/system/kerberos/mit.nix index a53d9dd0c6b5..25d7d51e808a 100644 --- a/nixos/modules/services/system/kerberos/mit.nix +++ b/nixos/modules/services/system/kerberos/mit.nix @@ -2,7 +2,7 @@ let inherit (lib) mkIf concatStrings concatStringsSep concatMapStrings toList - mapAttrs mapAttrsToList attrValues; + mapAttrs mapAttrsToList; cfg = config.services.kerberos_server; kerberos = config.krb5.kerberos; stateDir = "/var/lib/krb5kdc"; diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix index f9e12e3642ea..f23b3075574d 100644 --- a/nixos/modules/services/web-apps/limesurvey.nix +++ b/nixos/modules/services/web-apps/limesurvey.nix @@ -2,7 +2,7 @@ let - inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption; + inherit (lib) mkDefault mkEnableOption mkForce mkIf mkOption; inherit (lib) mapAttrs optional optionalString types; cfg = config.services.limesurvey; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index bb39a5d1d714..fa9a36d11892 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }@args: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 08297c7275a4..b882f6c2ae7e 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -15,7 +15,6 @@ let else cfg.database.port; poolName = "tt-rss"; - phpfpmSocketName = "/run/phpfpm/${poolName}.sock"; tt-rss-config = pkgs.writeText "config.php" '' enableStaticLibraries == false; let inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast - concatStringsSep enableFeature optionalAttrs toUpper; + concatStringsSep enableFeature optionalAttrs; isGhcjs = ghc.isGhcjs or false; isHaLVM = ghc.isHaLVM or false; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 04cbd88989a6..a4c040673487 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -187,7 +187,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # for any version that has been released on hackage as opposed to only # versions released before whatever version of all-cabal-hashes you happen # to be currently using. - callHackageDirect = {pkg, ver, sha256}@args: + callHackageDirect = {pkg, ver, sha256}: let pkgver = "${pkg}-${ver}"; in self.callCabal2nix pkg (pkgs.fetchzip { url = "mirror://hackage/${pkgver}/${pkgver}.tar.gz"; diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index bc2d0e5be5a8..16f3e7f73e20 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -119,7 +119,6 @@ let # packageJSON=./package.json; cljdeps = import ./deps.nix { inherit pkgs; }; - cljpaths = cljdeps.makePaths {}; classp = cljdeps.makeClasspaths { extraClasspaths=["src/js" "src/cljs/bundled" "src/cljs/snapshot"]; }; diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index bc41d86256b2..f383c7283698 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -1,7 +1,6 @@ # Generic builder for lua packages { lib , lua -, stdenv , wrapLua # Whether the derivation provides a lua module or not. , toLuaModule diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index fb709227180f..08645dfb77f3 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -59,7 +59,7 @@ in rec { luajit_2_1 = import ../luajit/2.1.nix { self = luajit_2_1; - inherit callPackage lib; + inherit callPackage; }; } diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix index 7f584c0f0aff..14bd4a416468 100644 --- a/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/pkgs/development/interpreters/lua-5/wrapper.nix @@ -3,7 +3,6 @@ , extraOutputsToInstall ? [] , postBuild ? "" , ignoreCollisions ? false -, lib , requiredLuaModules , makeWrapperArgs ? [] }: diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index 0f223963132e..e8f1b8b338c4 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,4 +1,4 @@ -{ self, callPackage, lib }: +{ self, callPackage }: callPackage ./default.nix { inherit self; version = "2.1.0-beta3"; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index abd1fda47cb6..7db8feb98e71 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPackages +{ stdenv, fetchurl, buildPackages , name ? "luajit-${version}" , isStable , sha256 diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix index 9142a1f4fc36..95122aebf039 100644 --- a/pkgs/development/interpreters/perl/wrapper.nix +++ b/pkgs/development/interpreters/perl/wrapper.nix @@ -3,9 +3,7 @@ , extraOutputsToInstall ? [] , postBuild ? "" , ignoreCollisions ? false -, lib , requiredPerlModules -, makeWrapperArgs ? [] }: # Create a perl executable that knows about additional packages. diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index 98322312f7f3..61c1186cef9e 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -23,7 +23,7 @@ let common = import ./build-python-package-common.nix { inherit python; }; mkPythonDerivation = import ./mk-python-derivation.nix { inherit lib config python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook; - inherit toPythonModule namePrefix writeScript update-python-libraries; + inherit toPythonModule namePrefix update-python-libraries; }; in diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index bc90d93a7e3d..e7d07b9ad1c0 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -10,7 +10,6 @@ , sqlite , tcl ? null, tk ? null, tix ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? false , zlib -, callPackage , self , CF, configd, coreutils , python-setup-hook diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 60ea3bdf4c7f..5eb7f3ec1661 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -10,7 +10,6 @@ , sqlite , tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false , zlib -, callPackage , self , CF, configd , python-setup-hook diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index b3561bcbb725..6a9e3d48bdb5 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -10,7 +10,6 @@ # Whether the derivation provides a Python module or not. , toPythonModule , namePrefix -, writeScript , update-python-libraries }: diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 3cdc30b92340..42b652978bcc 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, fetchurl , zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi , sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 -, callPackage, self, gdbm, db, lzma +, self, gdbm, db, lzma , python-setup-hook # For the Python package set , packageOverrides ? (self: super: {}) diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 552f230ee712..6af198e65ead 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -41,8 +41,6 @@ let majorVersion = substring 0 1 pythonVersion; - setupHook = python-setup-hook sitePackages; - deps = [ bzip2 zlib diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index c2147fb5f6a7..e37c43a0bd65 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeFontsConf, makeWrapper +{ stdenv, fetchurl, makeFontsConf , cacert , cairo, coreutils, fontconfig, freefont_ttf , glib, gmp diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index e6c8a123041a..4e617ce67eb9 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages, lib -, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub +, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison , autoconf, libiconv, libobjc, libunwind, Foundation , buildEnv, bundler, bundix @@ -11,7 +11,7 @@ let opString = lib.optionalString; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; config = import ./config.nix { inherit fetchFromSavannah; }; - rubygems = import ./rubygems { inherit stdenv lib fetchurl fetchpatch; }; + rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; @@ -32,7 +32,7 @@ let }; self = lib.makeOverridable ( { stdenv, buildPackages, lib - , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub + , fetchurl, fetchFromSavannah, fetchFromGitHub , useRailsExpress ? true , zlib, zlibSupport ? true , openssl, opensslSupport ? true diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index db28cbe28fae..b9548284355d 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "rubygems"; diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index feac99b2d8e5..2ec5923b0e1f 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr, buildPackages }: +{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, zip, which, readline, icu, zlib, nspr, buildPackages }: let version = "52.9.0"; diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index 499b2c65b770..a7196c6e0314 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -5,7 +5,7 @@ with builtins; with stdenv.lib; let - mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv maven; }; + mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv; }; in stdenv.mkDerivation rec { inherit mavenDeps src name meta m2Path; diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix index ca7cc7027be7..f63c91cd360a 100644 --- a/pkgs/development/java-modules/maven-minimal.nix +++ b/pkgs/development/java-modules/maven-minimal.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, maven }: +{ stdenv, pkgs }: with stdenv.lib; with pkgs.javaPackages; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index f59a3fd713f9..429da8de8350 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection , pcre, itstool, gperf, vala diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index 4c34e40586f3..eb58003a5f63 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, fetchpatch, mpir, gmp, mpfr, flint}: +{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "arb"; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index c8f284acc135..380a5071aeee 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libexecinfo }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "aws-c-common"; diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 2618d35ff794..d6ebaf3c5663 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops +{ lib, stdenv, fetchurl, pkgconfig, libatomic_ops , enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179 }: diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 90dd8ff1744f..f7bd189022f8 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv +{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv , which , buildPackages , toolset ? /**/ if stdenv.cc.isClang then "clang" diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 67f5350d8fe6..2d0fd4cb1bcf 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "catch2-${version}"; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 06eac4423e78..0bdaf1be9551 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext -, pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false +, pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false , buildPackages, pruneLibtoolFiles }: with stdenv.lib; diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix index 06801dfb7d24..13cee8fe86ba 100644 --- a/pkgs/development/libraries/czmq/4.x.nix +++ b/pkgs/development/libraries/czmq/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, zeromq }: +{ stdenv, fetchurl, zeromq }: stdenv.mkDerivation rec { version = "4.2.0"; diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index aae7861fef4f..18244d83dee7 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -1,5 +1,4 @@ { stdenv -, fetchurl , fetchFromGitHub , autoreconfHook , pkgconfig diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 681062cd6713..62f04e061cfa 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , pari , ntl diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index e2a989f4ef23..6dfd4edd0716 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { name = "editline-${version}"; diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 25d0760a32d1..6aec15f976bb 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, cmake}: +{stdenv, fetchurl, cmake}: let version = "3.3.7"; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 3f731bdf799e..d3095099d3c1 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, zlib, expat, gettext +{ stdenv, fetchFromGitHub, zlib, expat, gettext , autoconf }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 4ea17e588a9b..4c4949b37be8 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 , gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit -, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, python2, hicolor-icon-theme +, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme , libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 6974adf74cec..2cfc87d6a2e5 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, enableShared ? true }: +{ stdenv, fetchFromGitHub, cmake, enableShared ? true }: stdenv.mkDerivation rec { version = "5.3.0"; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index d98d9e8107e9..48c232c122b3 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl +{ stdenv, fetchurl, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl , docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 , jasper, gobject-introspection, doCheck ? false, makeWrapper }: diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 4215f0ebc30d..0e3f79b1814c 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which , librsvg, pango, gtk, bzip2, json-glib, gettext, autoreconfHook, libraw -, gexiv2, libwebp, gnome3, libintl }: +, gexiv2, libwebp, libintl }: stdenv.mkDerivation rec { pname = "gegl"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index a2c7bdc5bde6..4b577d36857a 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, fetchpatch, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales +{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 43b8434b4961..494d9acb6bb6 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, m4, cxx ? true, withStatic ? true }: -let inherit (stdenv.lib) optional optionalString; in +let inherit (stdenv.lib) optional; in let self = stdenv.mkDerivation rec { name = "gmp-5.1.3"; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index f320c303123e..de31128e5a67 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -3,7 +3,7 @@ , buildPackages , withStatic ? false }: -let inherit (stdenv.lib) optional optionalString; in +let inherit (stdenv.lib) optional; in let self = stdenv.mkDerivation rec { name = "gmp-6.1.2"; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 26c472930ed5..b1fdb916b5ce 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, flex, bison, meson, ninja, pkgconfig, libffi, python3 -, libintl, cctools, cairo, gnome3, glibcLocales, fetchpatch +, libintl, cctools, cairo, gnome3, glibcLocales , substituteAll, nixStoreDir ? builtins.storeDir , x11Support ? true }: diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index c1bdcd6956e7..d454ca63fd7f 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection +{ stdenv, fetchurl, pkgconfig, glib, gobject-introspection , meson , ninja , python3 diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix index a81e72bf66fb..88a4ecb36225 100644 --- a/pkgs/development/libraries/gsignond/default.nix +++ b/pkgs/development/libraries/gsignond/default.nix @@ -61,7 +61,7 @@ unwrapped = stdenv.mkDerivation rec { in if plugins == [] then unwrapped else import ./wrapper.nix { - inherit stdenv makeWrapper symlinkJoin gsignondPlugins plugins; + inherit makeWrapper symlinkJoin plugins; gsignond = unwrapped; } diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index 6182ea283cba..887376d31874 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, check +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, check , json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 , docbook_xsl, glibcLocales, gobject-introspection }: diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index d1fa37939a78..655f73931f67 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, gsasl, check +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, gsasl, check , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/gsignond/wrapper.nix b/pkgs/development/libraries/gsignond/wrapper.nix index 04463aac3796..a4738e4b6a73 100644 --- a/pkgs/development/libraries/gsignond/wrapper.nix +++ b/pkgs/development/libraries/gsignond/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, symlinkJoin, gsignond, gsignondPlugins, plugins }: +{ makeWrapper, symlinkJoin, gsignond, plugins }: symlinkJoin { name = "gsignond-with-plugins-${gsignond.version}"; diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix index 4ff58843d155..839f0a75156b 100644 --- a/pkgs/development/libraries/ldacbt/default.nix +++ b/pkgs/development/libraries/ldacbt/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, pkgconfig , cmake }: diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 52d835d7a206..dd3c42e8b7f5 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, which, gnuplot +{ stdenv, fetchurl, autoreconfHook, pkgconfig, which, gnuplot , giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib }: diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index c1cf3215c16c..826f72b1f5fb 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, libpulseaudio, alsaLib, libcap -, CoreAudio, CoreServices, AudioUnit, AudioToolbox +, CoreAudio, CoreServices, AudioUnit , usePulseAudio }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index c7d7bfb1e824..62e0a850bad3 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3, writeText }: +{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3 }: stdenv.mkDerivation rec { name = "libaom-${version}"; diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix index e63bfd20c797..dd3320005a41 100644 --- a/pkgs/development/libraries/libaosd/default.nix +++ b/pkgs/development/libraries/libaosd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cairo, pango, +{ stdenv, fetchFromGitHub, pkgconfig, cairo, pango, libX11, libXcomposite, autoconf, automake }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index d908a8af85da..d22518e96d42 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: let diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix index d7638dd20597..3d32f4d0b953 100644 --- a/pkgs/development/libraries/libcsptr/default.nix +++ b/pkgs/development/libraries/libcsptr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, git }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "libcsptr-${version}"; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index 2bc2bcb5b856..611287b9aaa8 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, findutils, fixDarwinDylibNames +{ stdenv, fetchurl, findutils, fixDarwinDylibNames , sslSupport? true, openssl }: diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index 65d04cb53f16..f553afdfc709 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, perl }: +{ stdenv, fetchurl, perl }: stdenv.mkDerivation rec { name = "libfaketime-${version}"; diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index 4367cc5b2764..f5cc5efa06a1 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glibmm, libgda, libxml2, gnome3 -, mysqlSupport ? false, mysql ? null -, postgresSupport ? false, postgresql ? null }: +, mysqlSupport ? false +, postgresSupport ? false }: let gda = libgda.override { diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index dc221156f461..f3e1b8b0f997 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchpatch, buildPackages, fetchurl, gettext +{ stdenv, lib, buildPackages, fetchurl, gettext , genPosixLockObjOnly ? false }: let genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index cf5c80c9b219..c58812eca58b 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala, fetchpatch -, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection, valadoc }: +, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }: let pname = "libhttpseverywhere"; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 916530220526..b86a48ecd1ba 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, perl, pkgconfig, cmake, ninja, vala, gobject-introspection -, python3, tzdata, gtk-doc, docbook_xsl, docbook_xml_dtd_43, glib, libxml2, icu }: +, python3, tzdata, glib, libxml2, icu }: stdenv.mkDerivation rec { name = "libical-${version}"; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 57c35ab86777..371d7b838d40 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, nasm }: +{ stdenv, fetchurl, cmake, nasm }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index ef095fd4336a..284d415454de 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }: let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { name = "libmikmod-3.3.11.1"; diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index d9db09f1e98e..222a0df055bb 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook , asciidoctor, pkgconfig, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt -, json_c, kmod, which, file, utillinux, systemd, keyutils +, json_c, kmod, which, utillinux, systemd, keyutils }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 9efeb0f678e0..04f0db030bb0 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobject-introspection, gtk-doc, docbook_xsl +{ stdenv, fetchurl, pkgconfig, intltool, gobject-introspection, gtk-doc, docbook_xsl , glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null }: diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index fe7bc094fdce..65de6db3b47b 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, zlib, openssl, libsodium }: +{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { name = "libssh-0.8.7"; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index cd8192e34fb9..046229e8f1d7 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf +{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf , zlib, boost, openssl, libtool, python, libiconv, geoip, ncurses }: diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index e725439a3f1a..f5026da4c3b9 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { version = "1.29.1"; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index de131052314a..33f818f7d62c 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch +{ stdenv, lib, fetchurl , zlib, xz, python2, ncurses, findXMLCatalogs , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform , icuSupport ? false, icu ? null diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 11f975187b0b..500015f61c63 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , givaro , pkgconfig diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 1424ef9e12b4..3a90a4cdf33e 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, fetchpatch +{ stdenv, fetchzip , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff -, libwebp, libxml2, proj, python, scons, sqlite, zlib +, libwebp, libxml2, proj, python, sqlite, zlib # supply a postgresql package to enable the PostGIS input plugin , postgresql ? null diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 3ab1e0a79749..ca0e73078a16 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig -, boost, openssl, zlib, libsodium, olm, gtest, spdlog, nlohmann_json }: +, boost, openssl, zlib, libsodium, olm, nlohmann_json }: stdenv.mkDerivation rec { name = "mtxclient-${version}"; diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix index f503799e6b1c..cd1205e2c7d4 100644 --- a/pkgs/development/libraries/nsss/default.nix +++ b/pkgs/development/libraries/nsss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages }: +{ skawarePackages }: with skawarePackages; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index b0652176c940..5e78f9f92ecf 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchurl, fetchFromGitHub, fetchpatch +, fetchFromGitHub, fetchpatch , cmake, pkgconfig, unzip, zlib, pcre, hdf5 , glog, boost, google-gflags, protobuf , config diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 1a0e589373ca..61d42e4452fc 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl +{ stdenv, fetchurl, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc # Enable the Sun Grid Engine bindings diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index ef617a92eaa7..67b903970d3e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let - common = args@{ version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec { + common = { version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec { name = "openssl-${version}"; src = fetchurl { diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix index 842fae5ea938..47c6a27639d4 100644 --- a/pkgs/development/libraries/pagmo2/default.nix +++ b/pkgs/development/libraries/pagmo2/default.nix @@ -1,12 +1,10 @@ -{ lib -, fetchFromGitHub +{ fetchFromGitHub , stdenv , cmake , eigen , nlopt , ipopt , boost -, writeText }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 08a1613c2feb..fd2b9feff68b 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake +{ stdenv, fetchFromGitHub, cmake , qhull, flann, boost, vtk, eigen, pkgconfig, qtbase , libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL }: diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index f28f0fd64203..0b1f3f0490d2 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, xercesc +{ stdenv, cmake, xercesc # The target version of Geant4 , geant4 diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 2a033304b66e..d3bbb8679746 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libpng, glib /*just passthru*/ }: +{ stdenv, fetchurl, pkgconfig, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { name = "pixman-${version}"; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index ce3f5ab6b789..722c1cae8721 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig , openssl, libpng, lua5, pkgconfig, libidn, expat, fetchpatch -, gcc5 # TODO(@Dridus) remove this at next hash break }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index fb16a7fb6939..b5b9f1f7fa4d 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam, perl +{ stdenv, fetchurl, pkgconfig, glib, expat, pam, perl , intltool, spidermonkey_60 , gobject-introspection, libxslt, docbook_xsl, dbus , docbook_xml_dtd_412, gtk-doc, coreutils , useSystemd ? stdenv.isLinux, systemd diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/development/libraries/properties-cpp/default.nix index 06444e776703..bd20dc540c06 100644 --- a/pkgs/development/libraries/properties-cpp/default.nix +++ b/pkgs/development/libraries/properties-cpp/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig, gtest, doxygen -, graphviz, lcov, writeText }: +{ stdenv, fetchurl, cmake, pkgconfig, gtest, doxygen +, graphviz, lcov }: stdenv.mkDerivation rec { pname = "properties-cpp"; diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 883dff56f2ee..610efcfef298 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -1,6 +1,6 @@ { stdenv , fetchFromGitHub -, autoreconfHook, zlib, gmock, which, buildPackages +, autoreconfHook, zlib, gmock, buildPackages , version, sha256 , ... }: diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index dceda3c04bd4..5bccbf74965a 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: +{ stdenv, fetchurl, libjpeg, zlib, perl }: let version = "8.4.2"; in diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 2a474ab0ffea..40f4c56e8091 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -1,6 +1,6 @@ { qtModule, stdenv, lib, fetchurl , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel -, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt +, fontconfig, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby , darwin diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index 51beba898f6c..22bcc56c82ab 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib }: +{ stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib }: stdenv.mkDerivation rec { version = "2.0.0"; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index c26e9c575ab2..46538d0022e7 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -7,8 +7,7 @@ shared ? false }: let - usedLibExtension = if shared then ".so" else ".a"; - inherit (stdenv.lib) optional optionals; + inherit (stdenv.lib) optional; version = "3.8.0"; in diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 350cfb1f7a24..2dcac58bf6ca 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, writeText, fetchurl, rpmextract, undmg, darwin }: +{ stdenvNoCC, fetchurl, rpmextract, undmg, darwin }: /* 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. diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 8ec00f7e2b8b..d967bbf8c3e1 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, gfortran, perl, which, config +{ stdenv, fetchFromGitHub, perl, which # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index e56d677e8a46..49c89e68ad22 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages }: +{ skawarePackages }: with skawarePackages; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 0169a42ed65e..d597fd16ad07 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,14 +1,12 @@ { stdenv , fetchurl , pkgconfig -, fetchpatch , meson , ninja , python3 , spice-protocol , gettext , openssl -, libpulseaudio , pixman , gobject-introspection , libjpeg_turbo diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 902bc6a5560f..9e50a3b86b94 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,5 +1,4 @@ { stdenv -, substituteAll , fetchurl , meson , ninja diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 6e4640fabb7b..be09bb73b3aa 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, src, pkgconfig, tcl, libXft, fontconfig, patches ? [] +{ stdenv, lib, src, pkgconfig, tcl, libXft, patches ? [] , enableAqua ? stdenv.isDarwin, darwin , ... }: diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index b6f1136ea2b9..07892e970875 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, umockdev, gobject-introspection +{ stdenv, fetchFromGitHub, autoreconfHook, gobject-introspection , pkgconfig, glib, systemd, libgudev, vala }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix index 81562659c0d9..16d4a8fa40b5 100644 --- a/pkgs/development/libraries/utmps/default.nix +++ b/pkgs/development/libraries/utmps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages }: +{ skawarePackages }: with skawarePackages; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 32f816023e5a..f6669f2f8fea 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3 , ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme , autoconf, automake, libtool -, writeShellScriptBin , buildPackages }: diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix index 4b2b74c5e1d5..f4e8c128ccbf 100644 --- a/pkgs/development/libraries/vte/2.90.nix +++ b/pkgs/development/libraries/vte/2.90.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, glib, gtk3, ncurses, gobject-introspection }: +{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk3, ncurses, gobject-introspection }: stdenv.mkDerivation rec { versionMajor = "0.36"; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 47e1c37492c1..5567b6595ea5 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu , libpng, ffmpeg_4 diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index a89f132b8322..4d95b43ff876 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig +{ stdenv, fetchFromGitHub, fetchurl, pkgconfig , gtk2, gtk3, libXinerama, libSM, libXxf86vm , xorgproto, gstreamer, gst-plugins-base, GConf, setfile , libGLSupported diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 6e559cfb6a94..7a32aba24ff8 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib +{ stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib # darwin only attributes , cf-private, derez, rez, setfile , AGL, Cocoa, Kernel diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 780b7d630cb7..b8cf86999e0b 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gnome3, gsettings-desktop-schemas }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; diff --git a/pkgs/development/lua-modules/default.nix b/pkgs/development/lua-modules/default.nix index 372d609792c2..091b94f58f51 100644 --- a/pkgs/development/lua-modules/default.nix +++ b/pkgs/development/lua-modules/default.nix @@ -1,5 +1,5 @@ # inspired by pkgs/development/haskell-modules/default.nix -{ pkgs, stdenv, lib +{ pkgs, lib , lua , overrides ? (self: super: {}) }: diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index e00a5b904c50..0f448343e968 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }@args: +{ pkgs, ... }: self: super: with super; { diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 40b2ed775cd5..e5802c12e816 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, requireFile, makeWrapper, unzip, autoPatchelfHook, pkgs, pkgs_i686, licenseAccepted ? false}: +{requireFile, autoPatchelfHook, pkgs, pkgs_i686, licenseAccepted ? false}: { toolsVersion ? "25.2.5" , platformToolsVersion ? "28.0.1" diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 8d57f737c340..b05167460717 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -5,7 +5,7 @@ rec { composeAndroidPackages = import ./compose-android-packages.nix { - inherit (pkgs) stdenv fetchurl requireFile makeWrapper unzip autoPatchelfHook; + inherit (pkgs) requireFile autoPatchelfHook; inherit pkgs pkgs_i686 licenseAccepted; }; diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 01669024b3b8..6c8f6d664d75 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -8,7 +8,6 @@ let androidSdkArgNames = builtins.attrNames (builtins.functionArgs composeAndroidPackages); - extraParams = removeAttrs args ([ "name" ] ++ androidSdkArgNames); # Extract the parameters meant for the Android SDK androidParams = { diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 9e19afb24429..a7e158bd3bb1 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -20,10 +20,6 @@ let androidsdk = (composeAndroidPackages realAndroidsdkArgs).androidsdk; - realXcodewrapperArgs = { - inherit xcodeBaseDir; - } // xcodewrapperArgs; - xcodewrapper = composeXcodeWrapper xcodewrapperArgs; deleteKeychain = '' diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 336194cf0a81..e29801c51f97 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, androidenv, xcodeenv, tiVersion ? "7.1.0.GA"}: +{pkgs, androidenv, xcodeenv, tiVersion ? "7.1.0.GA"}: rec { titaniumsdk = let diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 64bbd91a3d56..30e3687676ab 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchurl, fetchpatch +{ stdenv, fetchFromGitHub, fetchurl , ocaml, findlib, ocamlbuild, ocaml_oasis, - bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, frontc, ounit, ppx_jane, parsexp, + bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, frontc, ounit, ppx_jane, parsexp, utop, ppx_tools_versioned, which, makeWrapper, writeText diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 23585ad009c5..3d293b1a1ac4 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildDunePackage -, ppx_fields_conv, ppx_sexp_conv, ppx_deriving +, ppx_fields_conv, ppx_sexp_conv , base64, fieldslib, jsonm, re, stringext, uri }: diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index d35a57f6b4bc..010df7d8df92 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchzip, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4, - lwt_react, cryptokit, - ipaddr, ocamlnet, ocaml_pcre, + lwt_react, opaline, ppx_tools, ppx_deriving, findlib , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json , js_of_ocaml-lwt diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 5c0726176f6d..a8fff893d5c9 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -1,6 +1,6 @@ -{ stdenv, janePackage, ocamlbuild, angstrom, cryptokit, ctypes, +{ janePackage, ocamlbuild, angstrom, cryptokit, ctypes, magic-mime, ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, - zarith, num, openssl + num, openssl , ppxlib }: diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix index 0ef3cf167341..30aea547cbd1 100644 --- a/pkgs/development/ocaml-modules/jingoo/default.nix +++ b/pkgs/development/ocaml-modules/jingoo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ounit, pcre, uutf }: +{ stdenv, fetchFromGitHub, ocaml, findlib, pcre, uutf }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" then throw "jingoo is not available for OCaml ${ocaml.version}" diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix index 7ba22a025f49..fbd061a6566b 100644 --- a/pkgs/development/ocaml-modules/lwt/ppx.nix +++ b/pkgs/development/ocaml-modules/lwt/ppx.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, lwt, ppx_tools_versioned }: +{ buildDunePackage, lwt, ppx_tools_versioned }: buildDunePackage { pname = "lwt_ppx"; diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index bac6cd707940..e69b9dabeabc 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -1,4 +1,4 @@ -{ version, src, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ version, src, stdenv, ocaml, findlib, ocamlbuild, ... }: stdenv.mkDerivation { name = "menhir-${version}"; diff --git a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix index 5ab6ff226f21..7cc455b01957 100644 --- a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix +++ b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, sqlexpr, ounit +{ buildDunePackage, sqlexpr, ounit , ppx_core, ppx_tools_versioned, re, lwt_ppx }: diff --git a/pkgs/development/ocaml-modules/zmq/lwt.nix b/pkgs/development/ocaml-modules/zmq/lwt.nix index 65595992e2c1..378bcf3acec0 100644 --- a/pkgs/development/ocaml-modules/zmq/lwt.nix +++ b/pkgs/development/ocaml-modules/zmq/lwt.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, zmq, ocaml_lwt }: +{ buildDunePackage, zmq, ocaml_lwt }: buildDunePackage rec { pname = "zmq-lwt"; diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index 5178551df453..a60afcd59ed7 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...}: +{ stdenv, callPackage, pkgsi686Linux, ...}: let i686 = pkgsi686Linux.callPackage ./vms.nix {}; diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 277a3b047d1c..7562c3e4fd06 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -8,7 +8,6 @@ , gdb , numpy , ncurses -, fetchpatch }: let diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index d449ae8bbf69..44ec253fbf78 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k, pytest }: +{ buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "JPype1"; diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index c6548f1b5984..52cf7598da8d 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , isPy3k , fetchPypi -, fetchpatch , doit , glibcLocales , pytest diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index b2d0aaa5b6b9..554eaf977911 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -1,8 +1,6 @@ { stdenv , runCommandCC -, lib , fetchPypi -, gcc , buildPythonPackage , isPyPy , pythonOlder diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index 4636f51d4bd1..ced0ff28090d 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, fetchpatch, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage , agate, openpyxl, xlrd, nose }: diff --git a/pkgs/development/python-modules/aiozeroconf/default.nix b/pkgs/development/python-modules/aiozeroconf/default.nix index 4dc9401d5306..78b1c215c2bd 100644 --- a/pkgs/development/python-modules/aiozeroconf/default.nix +++ b/pkgs/development/python-modules/aiozeroconf/default.nix @@ -3,7 +3,6 @@ , fetchPypi , netifaces , isPy27 -, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index c462c41822ab..9313a255fd05 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder, pyyaml +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pyyaml , python-dateutil, requests, pymongo, raven, bcrypt, flask, pyjwt, flask-cors, psycopg2, pytz, flask-compress, jinja2 }: diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index c366fc770b33..257e89790fa9 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, makeWrapper +{ stdenv, buildPythonPackage, fetchPypi , six, click, requests, pytz, tabulate, pythonOlder }: diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index ccba946abbb4..f1f2d728ff2b 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch +{ stdenv, buildPythonPackage, fetchPypi , pytest, jinja2, sphinx, vega_datasets, ipython, glibcLocales , entrypoints, jsonschema, numpy, pandas, six, toolz, typing , pythonOlder, recommonmark }: diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index a0acadd8db75..85033a1846f2 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -1,6 +1,6 @@ { gui ? true, buildPythonPackage, fetchFromGitHub, lib, - sphinx, lxml, isodate, numpy, pytest, openpyxl, + sphinx, lxml, isodate, numpy, openpyxl, tkinter ? null, py3to2, isPy3k, python, ... }: diff --git a/pkgs/development/python-modules/astroid/1.6.nix b/pkgs/development/python-modules/astroid/1.6.nix index b6ebea815ccc..cdbbe547aec7 100644 --- a/pkgs/development/python-modules/astroid/1.6.nix +++ b/pkgs/development/python-modules/astroid/1.6.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy +{ lib, fetchPypi, buildPythonPackage , lazy-object-proxy, six, wrapt, enum34, singledispatch, backports_functools_lru_cache , pytest }: diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index a078a4207163..42335a0393fe 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder , cryptography , bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl , openssl, openssh }: diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index c32719140ea7..8998abd6986a 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -3,7 +3,6 @@ , fetchPypi , numpy , ffmpeg_4 -, libav , pkgconfig }: diff --git a/pkgs/development/python-modules/azure/default.nix b/pkgs/development/python-modules/azure/default.nix index 541cf1e72702..87a39255561e 100644 --- a/pkgs/development/python-modules/azure/default.nix +++ b/pkgs/development/python-modules/azure/default.nix @@ -5,7 +5,6 @@ , futures , pyopenssl , requests -, pythonOlder , isPy3k }: diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix index 95cbd7ca0411..1b8b8f2ba47e 100644 --- a/pkgs/development/python-modules/backports-shutil-which/default.nix +++ b/pkgs/development/python-modules/backports-shutil-which/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchFromGitHub, buildPythonPackage, pytest }: +{ stdenv, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "backports.shutil_which"; diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 5fee40a941f9..e038e07507a0 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , buildPythonPackage , fetchPypi , cython diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index 700f5b3d0c52..a286249ea0f3 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pkgs -, isPy3k , python }: diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 066d7058fed5..a6f4b73bbf1e 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, future, sqlalchemy, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, - txrequests, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, + txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker, buildbot-pkg, parameterized, glibcLocales }: diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index f95d71dc2903..631572ffa025 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "buildbot-pkg"; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index c8ebdf34b868..363e6e8af283 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, python, setuptoolsTrial, mock, twisted, future }: +{ lib, buildPythonPackage, fetchPypi, setuptoolsTrial, mock, twisted, future }: buildPythonPackage (rec { pname = "buildbot-worker"; diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 28148450f076..e54136a50276 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, lib, fetchPypi , pytest, filelock, mock, pep8 -, cython, isPy27, isPy37, glibcLocales +, cython, isPy27 , six, pyshp, shapely, geos, proj, numpy , gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona , xvfb_run diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index dbf5a8686cd9..1551c98143c9 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -2,7 +2,6 @@ , libev , buildPythonPackage , fetchPypi -, pkgs , cython , futures , six diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 41c9493922a9..d499a937f501 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy37, fetchpatch, iana-etc, libredirect +{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect , case, pytest, boto3, moto, kombu, billiard, pytz, anyjson, amqp, eventlet }: diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index f982ffefb2a7..19aaf3368e5d 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -11,7 +11,6 @@ , six , typing , wheel -, pythonOlder , watchdog , pytest , hypothesis diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 1ae0cba4844a..9951b1711b39 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, substituteAll, locale, pytest }: +{ lib, buildPythonPackage, fetchPypi, locale, pytest }: buildPythonPackage rec { pname = "click"; diff --git a/pkgs/development/python-modules/cntk/default.nix b/pkgs/development/python-modules/cntk/default.nix index 564116bc6755..43a7b7646dae 100644 --- a/pkgs/development/python-modules/cntk/default.nix +++ b/pkgs/development/python-modules/cntk/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , pkgs , numpy diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix index 06b5e762852a..5dfcd2f415b9 100644 --- a/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/pkgs/development/python-modules/dask-xgboost/default.nix @@ -6,7 +6,6 @@ , distributed , pytest , scikitlearn -, scipy }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 09868b2f7555..ad8da4255d69 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }: +{ stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov }: buildPythonPackage rec { pname = "distro"; diff --git a/pkgs/development/python-modules/dj-search-url/default.nix b/pkgs/development/python-modules/dj-search-url/default.nix index b66f6b8f73a3..68fe4c913d69 100644 --- a/pkgs/development/python-modules/dj-search-url/default.nix +++ b/pkgs/development/python-modules/dj-search-url/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 90fd82f28f46..e4e4d129a8d0 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -1,5 +1,4 @@ { stdenv, buildPythonPackage, fetchurl, substituteAll, - pythonOlder, geos, gdal, pytz, withGdal ? false }: diff --git a/pkgs/development/python-modules/django/1_8.nix b/pkgs/development/python-modules/django/1_8.nix index ee2408f73405..b6b51a07e9f6 100644 --- a/pkgs/development/python-modules/django/1_8.nix +++ b/pkgs/development/python-modules/django/1_8.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchurl -, pythonOlder }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index 11ad13cb4a1a..007d70ca8106 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, django_environ, mock, django, six +, django_environ, mock, django , pytest, pytestrunner, pytest-django }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix index 337763afbd46..d4cd0e711a0d 100644 --- a/pkgs/development/python-modules/dynd/default.nix +++ b/pkgs/development/python-modules/dynd/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchFromGitHub , isPyPy , isPy3k , cython diff --git a/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix index 8e4ad446746a..6b8329550da3 100644 --- a/pkgs/development/python-modules/effect/default.nix +++ b/pkgs/development/python-modules/effect/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage , fetchPypi -, isPy37 , lib , six , attrs diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 1ca8c9b55ff2..b906f94b4272 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -5,7 +5,6 @@ , elasticsearch , ipaddress , python-dateutil -, pytz , six }: diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 16e94bd785f0..a06f276232ef 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -9,7 +9,6 @@ , six , pathlib , python_magic -, isPy3k , lib }: diff --git a/pkgs/development/python-modules/fastentrypoints/default.nix b/pkgs/development/python-modules/fastentrypoints/default.nix index 4a921b2390d7..e2e0a4d4d92e 100644 --- a/pkgs/development/python-modules/fastentrypoints/default.nix +++ b/pkgs/development/python-modules/fastentrypoints/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "fastentrypoints"; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index a31b5670732a..260d1b7f4b30 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi, fetchpatch, numba, numpy, pandas, +{ lib, buildPythonPackage, fetchPypi, fetchpatch, numba, numpy, pandas, pytestrunner, thrift, pytest, python-snappy, lz4 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix index 40a1d759c127..25aae4591eb5 100644 --- a/pkgs/development/python-modules/fb-re2/default.nix +++ b/pkgs/development/python-modules/fb-re2/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , re2 -, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 675e5ea86f59..a860ea152ebb 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder , mock, pytest, pytestrunner , configparser, enum34, mccabe, pycodestyle, pyflakes, entrypoints, functools32, typing }: diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix index 136c089ee4b6..e0b6b3e49fa4 100644 --- a/pkgs/development/python-modules/gateone/default.nix +++ b/pkgs/development/python-modules/gateone/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchFromGitHub , tornado , futures , html5lib diff --git a/pkgs/development/python-modules/genpy/default.nix b/pkgs/development/python-modules/genpy/default.nix index 0a8344f8b924..c8bbeefd6acd 100644 --- a/pkgs/development/python-modules/genpy/default.nix +++ b/pkgs/development/python-modules/genpy/default.nix @@ -3,7 +3,6 @@ , fetchPypi , pytools , numpy -, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index e2065e632d23..8255668de1cf 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k , gevent }: diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index d59bc5a70b89..1acc9603db34 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi , httplib2, google_auth, google-auth-httplib2, six, uritemplate, oauth2client }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 4e548577f906..f16a5800bb44 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, lib, grpc, grpcio}: +{ stdenv, buildPythonPackage, fetchPypi, lib, grpcio}: buildPythonPackage rec { pname = "grpcio-tools"; diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index 7f0ba451af67..c729874846da 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchurl , pkgs , python , pygobject3 diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix index b066f323d682..2937b876dec4 100644 --- a/pkgs/development/python-modules/gumath/default.nix +++ b/pkgs/development/python-modules/gumath/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , numba , ndtypes , xnd diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix index 0ec55dae3e4d..cd3264b78bb2 100644 --- a/pkgs/development/python-modules/hbmqtt/default.nix +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k +{ stdenv, buildPythonPackage, fetchPypi, isPy3k , transitions, websockets, passlib, docopt, pyyaml, nose }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix index ad25b8977c05..c4afe809cfb6 100644 --- a/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/pkgs/development/python-modules/hoomd-blue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchgit +{ stdenv, fetchgit , cmake, pkgconfig , python , mpi ? null diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index bbea01f49001..53e42027ba22 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -5,7 +5,6 @@ , requests-cache , pygments , pyquery -, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index 7d8f25ca9540..cf78a6185365 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -8,8 +8,6 @@ , nose , nose-exclude , coverage -, certifi -, urllib3 , rednose , nose-randomly , six diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix index 2e2e4e1cb774..d7950d3adb69 100644 --- a/pkgs/development/python-modules/hyperlink/default.nix +++ b/pkgs/development/python-modules/hyperlink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, idna, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, idna }: buildPythonPackage rec { pname = "hyperlink"; diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix index 5bc281d2be1e..e5087a105360 100644 --- a/pkgs/development/python-modules/ifaddr/default.nix +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -3,7 +3,6 @@ , fetchPypi , ipaddress , python -, pythonOlder }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/influxgraph/default.nix b/pkgs/development/python-modules/influxgraph/default.nix index 4f7ba65a27f3..eeb27b14080a 100644 --- a/pkgs/development/python-modules/influxgraph/default.nix +++ b/pkgs/development/python-modules/influxgraph/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k -, influxdb, graphite_api, memcached, gnugrep +, influxdb, graphite_api, memcached }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/infoqscraper/default.nix b/pkgs/development/python-modules/infoqscraper/default.nix index f9ced7e63daf..ce265d013785 100644 --- a/pkgs/development/python-modules/infoqscraper/default.nix +++ b/pkgs/development/python-modules/infoqscraper/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchFromGitHub , html5lib , six , beautifulsoup4 diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 2646ee1b9363..c7f6e5c82194 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -15,7 +15,6 @@ , six , tornado , pytest -, pythonOlder , isPy27 }: diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix index 6ed21597aff0..20098485ad48 100644 --- a/pkgs/development/python-modules/intelhex/default.nix +++ b/pkgs/development/python-modules/intelhex/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , fetchpatch -, fetchurl }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index 3709ba40dc03..15e7d00bcece 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, fetchpatch # Build dependencies , glibcLocales # Test dependencies diff --git a/pkgs/development/python-modules/isodate/default.nix b/pkgs/development/python-modules/isodate/default.nix index 4422e1614fb6..425a295e5a53 100644 --- a/pkgs/development/python-modules/isodate/default.nix +++ b/pkgs/development/python-modules/isodate/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k , python , six }: diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 764e47501cb3..6d9086748572 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, pip , pbr , mock , python-jenkins diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 226f1743a2a0..15191858daa8 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonApplication, EditorConfig, fetchpatch, pytest, six }: +{ lib, fetchPypi, buildPythonApplication, EditorConfig, pytest, six }: buildPythonApplication rec { pname = "jsbeautifier"; diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index beccc2f06b89..3fe986fc3351 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, pythonOlder, six -, pytest, pytest-flake8, backports_unittest-mock, keyring, setuptools_scm +, pytest, backports_unittest-mock, keyring, setuptools_scm }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index 08c9e8b763dc..6de2af1e505e 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index fc5b0b2fe045..13fe196e471c 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchFromGitHub, buildPythonPackage, pyasn1 }: +{ stdenv, fetchPypi, buildPythonPackage, pyasn1 }: buildPythonPackage rec { pname = "ldap3"; diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index 03797575a83e..78e0dae2634c 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib, python }: +{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, glib, python }: buildPythonPackage rec { pname = "libsexy"; diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index 9b268686b8ff..a2065f243169 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, libusb1, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, libusb1, pytest }: buildPythonPackage rec { pname = "libusb1"; diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix index 94394c11e04e..a316edaf80aa 100644 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchurl , pkgs , isPyPy , pycrypto diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index cbdd43af811f..392cc66786a1 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver -, freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32 +, freetype, libpng, pkgconfig, mock, pytz, pygobject3 , enableGhostscript ? true, ghostscript ? null, gtk3 , enableGtk2 ? false, pygtk ? null, gobject-introspection , enableGtk3 ? false, cairo diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 7eea7596f433..a87c6711d435 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, isPy3k, fetchPypi +{ lib, buildPythonPackage, isPy3k, fetchPypi , urllib3, python-dateutil , pytz, faker, mock, nose }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/pkgs/development/python-modules/moinmoin/default.nix index 8090ac199da8..cc00643b71ae 100644 --- a/pkgs/development/python-modules/moinmoin/default.nix +++ b/pkgs/development/python-modules/moinmoin/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchurl, fetchpatch, isPy3k +{ lib, buildPythonPackage, fetchurl, isPy3k , pytest, werkzeug, pygments }: diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 7171409bec84..73c2f6c8e684 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -6,7 +6,6 @@ , decorator , imageio , imageio-ffmpeg -, isPy3k , proglog , requests , tqdm diff --git a/pkgs/development/python-modules/msrestazure/default.nix b/pkgs/development/python-modules/msrestazure/default.nix index 7e71f618d8a0..a494bbfff07e 100644 --- a/pkgs/development/python-modules/msrestazure/default.nix +++ b/pkgs/development/python-modules/msrestazure/default.nix @@ -1,7 +1,6 @@ { pkgs , buildPythonPackage , fetchPypi -, python , adal , msrest }: diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix index 2110f3628a80..0d5923820d27 100644 --- a/pkgs/development/python-modules/ndtypes/default.nix +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -1,6 +1,4 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub +{ buildPythonPackage , numpy , libndtypes , isPy27 diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix index ea0a359a49c3..75dcf9b32c4c 100644 --- a/pkgs/development/python-modules/nixpkgs/default.nix +++ b/pkgs/development/python-modules/nixpkgs/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchpatch , fetchPypi , pbr , pythonix diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 2c6858915ce9..7e3134a44d20 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,4 +1,4 @@ -{ fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k, fetchpatch }: +{ fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k }: buildPythonPackage rec { version = "3.4.3"; diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index bf5ca3d55830..51b1c8dd7756 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -3,7 +3,6 @@ , fetchurl , vmprof , pyqt4 -, scons , isPyPy , pkgs }: diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 171496584ef2..880d368a600b 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, python, buildPythonPackage, gfortran, pytest, blas, writeTextFile }: +{ lib, fetchPypi, python, buildPythonPackage, gfortran, pytest, blas, writeTextFile }: let blasImplementation = lib.nameFromURL blas.name "-"; diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix index f4dba0858dbf..c62f6ae681c2 100644 --- a/pkgs/development/python-modules/odfpy/default.nix +++ b/pkgs/development/python-modules/odfpy/default.nix @@ -1,8 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, python -, isPy27 , defusedxml , pytest }: diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix index cae337904b20..73230b2e8fb3 100644 --- a/pkgs/development/python-modules/ovito/default.nix +++ b/pkgs/development/python-modules/ovito/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit , cmake -, qtbase, libav, netcdf, qscintilla, zlib, boost, git, fftw, hdf5, libssh +, libav, netcdf, qscintilla, zlib, boost, git, fftw, hdf5, libssh , pythonPackages }: diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 821a543eeb17..fccd46c605db 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -7,12 +7,6 @@ , markdown , pyct , testpath -, pytest -, scipy -, plotly -, altair -, vega_datasets -, hvplot }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 32c945f332a7..a1fdeec28f83 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, xdg_utils +{ lib, buildPythonPackage, fetchFromGitHub, xdg_utils , requests, filetype, pyparsing, configparser, arxiv2bib , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , pylibgen, click, python-slugify, habanero, isbnlib diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index e41ec9689d28..a1ecced51eb5 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -5,12 +5,9 @@ , bcrypt , pynacl , pyasn1 -, python , pytest , pytest-relaxed , mock -, isPyPy -, isPy33 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pastel/default.nix b/pkgs/development/python-modules/pastel/default.nix index 2d99447f724f..532970c62c28 100644 --- a/pkgs/development/python-modules/pastel/default.nix +++ b/pkgs/development/python-modules/pastel/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: buildPythonPackage rec { pname = "pastel"; diff --git a/pkgs/development/python-modules/pep8/default.nix b/pkgs/development/python-modules/pep8/default.nix index 85d274944a78..6794b6f5f668 100644 --- a/pkgs/development/python-modules/pep8/default.nix +++ b/pkgs/development/python-modules/pep8/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, pythonAtLeast }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index 4e45d5203e66..4504886d03d0 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -6,7 +6,6 @@ , six , numpy , tifffile -, pytest , nose }: diff --git a/pkgs/development/python-modules/poetry/jsonschema.nix b/pkgs/development/python-modules/poetry/jsonschema.nix index d0adb43daf84..35607b536f34 100644 --- a/pkgs/development/python-modules/poetry/jsonschema.nix +++ b/pkgs/development/python-modules/poetry/jsonschema.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, callPackage +{ lib, buildPythonPackage, fetchPypi, isPy27 , attrs , pyrsistent , six diff --git a/pkgs/development/python-modules/pplpy/default.nix b/pkgs/development/python-modules/pplpy/default.nix index 6f118a51c879..a693c8cad4cc 100644 --- a/pkgs/development/python-modules/pplpy/default.nix +++ b/pkgs/development/python-modules/pplpy/default.nix @@ -1,12 +1,10 @@ { lib -, python , fetchPypi , buildPythonPackage , gmp , mpfr , libmpc , ppl -, pari , cython , cysignals , gmpy2 diff --git a/pkgs/development/python-modules/priority/default.nix b/pkgs/development/python-modules/priority/default.nix index f2f7a935cc41..f6e7efb78c20 100644 --- a/pkgs/development/python-modules/priority/default.nix +++ b/pkgs/development/python-modules/priority/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, pytest, hypothesis }: +{ lib, buildPythonPackage, fetchPypi, pytest, hypothesis }: buildPythonPackage rec { pname = "priority"; diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix index a68ecf59ad0e..fcd802b34875 100644 --- a/pkgs/development/python-modules/progressbar/default.nix +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "progressbar"; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 8cca405f7bfd..033cb192c8ef 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, fetchpatch , requests , pytz , tzlocal diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 32c5f38b66d0..44acbe5c7a9d 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { inherit python; }; diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 9817a73be92c..446ec81bb4f8 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pyasn1 -, isPyPy , pytest }: diff --git a/pkgs/development/python-modules/pyblock/default.nix b/pkgs/development/python-modules/pyblock/default.nix index 5027619d74c8..eb6de23e0eaa 100644 --- a/pkgs/development/python-modules/pyblock/default.nix +++ b/pkgs/development/python-modules/pyblock/default.nix @@ -1,5 +1,4 @@ { stdenv -, fetchurl , python , pkgs , isPy3k diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 026e5626c023..5ea7ba9c7a89 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy, unittest2 }: +{ stdenv, buildPythonPackage, fetchPypi, unittest2 }: buildPythonPackage rec { pname = "pyflakes"; diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index 1163f007b092..2b20ba956009 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub , boost, freetype, ftgl, libGLU_combined , python }: diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index e0f0f25c9add..9fc654292ab3 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -5,7 +5,6 @@ , psutil , pyopenssl , pysendfile -, python }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index 18eced7e8067..ab46a5670eeb 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchurl, isPy27, fetchpatch +{ stdenv, buildPythonPackage, fetchurl, isPy27 , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index 30e4444f5527..507310b4c51e 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -1,5 +1,4 @@ { lib -, fetchFromGitHub , buildPythonPackage , eigen , nlopt diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix index acb5c9648783..0ff269c98740 100644 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -3,7 +3,6 @@ , fetchPypi , fetchFromBitbucket , isPy3k -, fetchurl , pkgs , python }: diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix index a88b5ba7356c..c088ea6a3967 100644 --- a/pkgs/development/python-modules/pylint/1.9.nix +++ b/pkgs/development/python-modules/pylint/1.9.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, astroid, six, isort, +{ stdenv, lib, buildPythonPackage, fetchPypi, astroid, six, isort, mccabe, configparser, backports_functools_lru_cache, singledispatch, pytest, pytestrunner, pyenchant }: diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 64259872ce32..4faeb05280d0 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, pythonOlder, astroid, +{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, astroid, isort, mccabe, pytest, pytestrunner }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pymatgen-lammps/default.nix b/pkgs/development/python-modules/pymatgen-lammps/default.nix index dbe9107c7c83..c38f56885d14 100644 --- a/pkgs/development/python-modules/pymatgen-lammps/default.nix +++ b/pkgs/development/python-modules/pymatgen-lammps/default.nix @@ -2,7 +2,6 @@ , fetchurl , buildPythonPackage , pymatgen -, lammps , pytestrunner , pytest , isPy3k diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index 1db09842fa98..1a477ab23284 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchurl , isPyPy , pkgs , python diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 46de94cd0c68..288f35f23524 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig +{ lib, fetchurl, pythonPackages, pkgconfig , qmake, lndir, qtbase, qtsvg, qtwebengine, dbus , withConnectivity ? false, qtconnectivity , withWebKit ? false, qtwebkit diff --git a/pkgs/development/python-modules/pyreadability/default.nix b/pkgs/development/python-modules/pyreadability/default.nix index a95074b906e3..60bdbf011674 100644 --- a/pkgs/development/python-modules/pyreadability/default.nix +++ b/pkgs/development/python-modules/pyreadability/default.nix @@ -1,6 +1,5 @@ { lib, fetchPypi, buildPythonPackage , requests, chardet, cssselect, lxml -, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index e37fa07f2723..3085ee06e870 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -4,7 +4,6 @@ , ansible , pytest , mock -, isPy3k }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index 0a361627e8e9..b43c00e42d9f 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestrunner , pytest , py-cpuinfo , pythonOlder diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index adb6d71fb40d..93dd9fb654f9 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , buildPythonPackage , fetchFromGitHub , six diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index 44f1c0d6c39d..9cd55757aac7 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -1,16 +1,12 @@ { lib , buildPythonPackage , fetchPypi -, python , mock , pbr , pyyaml , six , multi_key_dict -, testtools , testscenarios -, testrepository -, kerberos , requests , unittest2 , requests-mock diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 8523020ccf50..35b7a706f609 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchFromGitHub , isPyPy , python , pkgs diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix index d3ab69ac9570..328b1ec0994d 100644 --- a/pkgs/development/python-modules/python-snappy/default.nix +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , isPyPy -, python , snappy , cffi , nose diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index b7c38c512652..ce0c514e3eca 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -4,7 +4,6 @@ , setuptoolsDarcs , setuptoolsTrial , simplejson -, zbase32 , twisted , isPyPy }: diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix index 04e2c2f08185..cd76b283028f 100644 --- a/pkgs/development/python-modules/pyuv/default.nix +++ b/pkgs/development/python-modules/pyuv/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchurl , isPyPy , pkgs }: diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index 90a415060eb8..83403b3d1500 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, libxml2 -, m2crypto, ply, pyyaml, six, pbr, pythonOlder, isPy37, python +, m2crypto, ply, pyyaml, six, pbr, pythonOlder, isPy37 , httpretty, lxml, mock, pytest, requests, decorator, unittest2 }: diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index 363f43c857dd..4321c025b56d 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, isPy27 , fetchPypi , six , pillow diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index b7010eccf0b3..46d1dbdbbd62 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchzip, isPy3k, requests }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }: with lib; buildPythonPackage rec { pname = "requests-aws4auth"; diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index 4522c7623283..340c558b7a42 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, isPy37 , docutils , nose , testtools diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index 432e2194b098..b5952e6ee156 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchgit , numpy , pkgs }: diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index cc83c31ca5df..c5e36f8ac070 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -13,7 +13,6 @@ , scipy , hdmedians , scikitlearn -, pytest , coverage , python , isPy3k diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 454066c1c163..04ea254ee928 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python +{ stdenv, buildPythonPackage, fetchPypi , gfortran, glibcLocales , numpy, scipy, pytest, pillow }: diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 01c54ef5f16b..af6dbeaa5e17 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,4 +1,4 @@ -{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy, fetchpatch}: +{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy}: buildPythonPackage rec { pname = "scipy"; diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix index 76f6232bafa7..079e88378c07 100644 --- a/pkgs/development/python-modules/selectors34/default.nix +++ b/pkgs/development/python-modules/selectors34/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, lib , python , six }: diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index cc60e81a59ee..9e80830f4380 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , stdenv -, isPy3k , pytest }: diff --git a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix index 53eb223b25a7..96de95655e05 100644 --- a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, fetchFromGitHub , pytest , Wand , webob diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index 596f9e47a08d..ba93fb040b9a 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, fetchpatch, python -, unittest2, scripttest, pytz, pylint, mock +, unittest2, scripttest, pytz, mock , testtools, pbr, tempita, decorator, sqlalchemy , six, sqlparse, testrepository }: diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index 36cf33d8c252..82f1315ba3d2 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, pkgs , pbr , pytest }: diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index aa582aacaa94..f7e390bd6788 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , pytest , python-rapidjson , pretend diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix index 5b9e032c49a9..3b33ac413ba9 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k +{ stdenv, fetchPypi, buildPythonPackage , numpy , absl-py , mock diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 03f1e66bf501..e4372fc2ec45 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -2,7 +2,7 @@ , lib , fetchurl , buildPythonPackage -, isPy3k, isPy36, pythonOlder +, isPy3k, pythonOlder , astor , gast , numpy @@ -13,7 +13,6 @@ , grpcio , mock , backports_weakref -, enum34 , tensorflow-estimator , tensorflow-tensorboard , cudaSupport ? false diff --git a/pkgs/development/python-modules/tflearn/default.nix b/pkgs/development/python-modules/tflearn/default.nix index 341c1da56801..03185ae4d9fe 100644 --- a/pkgs/development/python-modules/tflearn/default.nix +++ b/pkgs/development/python-modules/tflearn/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, fetchurl, pytest, scipy, h5py +{ lib, fetchPypi, buildPythonPackage, pytest, scipy, h5py , pillow, tensorflow }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index f224ec21b0e8..cc0745afef41 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -5,7 +5,6 @@ , coverage , glibcLocales , flake8 -, stdenv }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index 97903a4a222b..3218ff43e279 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, requests, six, requests_oauthlib }: +{ lib, buildPythonPackage, fetchPypi, requests, six, requests_oauthlib }: buildPythonPackage rec { pname = "tweepy"; diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index de317ec1844e..35afe10f8d24 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, buildPythonPackage, fetchPypi, isPy3k }: +{ stdenv, buildPackages, buildPythonPackage, fetchPypi }: buildPythonPackage rec { name = "${pname}-${version}"; diff --git a/pkgs/development/python-modules/uuid/default.nix b/pkgs/development/python-modules/uuid/default.nix index 0481e5c24c0f..5e31f6ccad09 100644 --- a/pkgs/development/python-modules/uuid/default.nix +++ b/pkgs/development/python-modules/uuid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "uuid"; diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index e2e305635200..a91de2d7eeed 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, boost, zlib, clang +{ stdenv, lib, buildPythonPackage, fetchPypi, python, zlib, clang , ncurses, pytest, docutils, pygments, numpy, scipy, scikitlearn }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/webapp2/default.nix b/pkgs/development/python-modules/webapp2/default.nix index 91ce52ff5adc..584440eab6ae 100644 --- a/pkgs/development/python-modules/webapp2/default.nix +++ b/pkgs/development/python-modules/webapp2/default.nix @@ -3,7 +3,6 @@ , fetchPypi , webob , six -, jinja2 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 26eca0d24cc1..d78cb7f3de9c 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchurl, fetchPypi, stdenv, isPy27 +{ buildPythonPackage, fetchurl, stdenv, isPy27 , nose, pillow, prettytable, pyyaml, dateutil, gdata , requests, mechanize, feedparser, lxml, gnupg, pyqt5 , libyaml, simplejson, cssselect, futures, pdfminer diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 9b5e3f9ca5f9..cb46e498db7d 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi , itsdangerous, hypothesis -, pytest, requests, glibcLocales }: +, pytest, requests }: buildPythonPackage rec { pname = "Werkzeug"; diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index 3adbaa942dd5..8d1443837cde 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -1,4 +1,4 @@ -{lib, fetchFromGitHub, python, pythonOlder, buildPythonPackage, gfortran, mock, xarray, wrapt, numpy, netcdf4}: +{lib, fetchFromGitHub, pythonOlder, buildPythonPackage, gfortran, mock, xarray, wrapt, numpy, netcdf4}: buildPythonPackage rec { pname = "wrf-python"; diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 8ad249a4c1a4..14f4b24747c7 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3, gtk3 }: +, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gtk3 }: buildPythonPackage rec { pname = "xdot"; diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 559789149736..bbe7c9862606 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , pytest , nose , scipy diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix index 8ffb8f96936b..558e414debf8 100644 --- a/pkgs/development/python-modules/xnd/default.nix +++ b/pkgs/development/python-modules/xnd/default.nix @@ -1,6 +1,4 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub +{ buildPythonPackage , ndtypes , libndtypes , libxnd diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index 5c02ea83ec99..b8a7dc47c10a 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "yattag"; diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix index 28f461689972..e0ec7bd6ca80 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope_configuration/default.nix @@ -5,7 +5,6 @@ , zope_schema , zope_testrunner , manuel -, isPy3k }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index 3706fd06a15d..08b1d67ffee5 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchpatch, fetchPypi, buildPythonPackage +{ stdenv, pkgconfig, fetchPypi, buildPythonPackage , zstd, pytest }: buildPythonPackage rec { diff --git a/pkgs/development/ruby-modules/bundled-common/test.nix b/pkgs/development/ruby-modules/bundled-common/test.nix index 7c5932c4e761..ab03f48445b3 100644 --- a/pkgs/development/ruby-modules/bundled-common/test.nix +++ b/pkgs/development/ruby-modules/bundled-common/test.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }: +{ lib, ruby, defaultGemConfig, test, should }: let testConfigs = { inherit lib; diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix index e42f1bf25711..8fdbafbba425 100644 --- a/pkgs/development/ruby-modules/bundler-env/test.nix +++ b/pkgs/development/ruby-modules/bundler-env/test.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}: +{ callPackage, test, stubs, should}: let bundlerEnv = callPackage ./default.nix stubs // { basicEnv = callPackage ../bundled-common stubs; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 5a3ee3d8cbdd..2bb9f6e5d427 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchFromGitHub , buildPackages -, callPackage , pkgconfig , libusb, readline, libewf, perl, zlib, openssl , libuv, file, libzip, xxHash @@ -23,7 +22,7 @@ let inherit (stdenv.lib) optional; generic = { - version_commit, + version_commit, # unused gittap, gittip, rev, diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 4def201952a9..c362ae5734cb 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }: +{ stdenv, fetchurl, perl, gdb, cctools, xnu, bootstrap_cmds }: stdenv.mkDerivation rec { name = "valgrind-3.15.0"; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index c4095a6f9b3c..73adfaec8386 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -1,6 +1,5 @@ { lib , python -, fetchFromGitHub }: let diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 1a56933548f6..035bc16064d5 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -1,7 +1,5 @@ { buildBazelPackage -, cacert , fetchFromGitHub -, fetchpatch , git , go , python diff --git a/pkgs/development/tools/build-managers/alibuild/default.nix b/pkgs/development/tools/build-managers/alibuild/default.nix index 68f00be342c3..c50e57160639 100644 --- a/pkgs/development/tools/build-managers/alibuild/default.nix +++ b/pkgs/development/tools/build-managers/alibuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python}: +{ lib, python}: python.pkgs.buildPythonApplication rec { pname = "alibuild"; diff --git a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix index fa6b310ce618..898640a84fe6 100644 --- a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix +++ b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, runCommandCC, bazel, runLocal, bazelTest }: +{ writeText, bazel, runLocal, bazelTest }: # Tests that certain executables are available in bazel-executed bash shells. diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index dbbc0d11ff1a..0d821fa61660 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -1,7 +1,6 @@ { buildBazelPackage , cacert , fetchFromGitHub -, fetchpatch , git , go , stdenv diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 1ea0fc049ba8..7fa4118e34e8 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,10 +1,10 @@ -{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, runCommandCC, makeWrapper +{ stdenv, callPackage, lib, fetchurl, runCommand, runCommandCC, makeWrapper # this package (through the fixpoint glass) , bazel , lr, xe, zip, unzip, bash, writeCBin, coreutils -, which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils +, which, python, gawk, gnused, gnutar, gnugrep, gzip, findutils # Apple dependencies -, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation +, cctools, libcxx, CoreFoundation, CoreServices, Foundation # Allow to independently override the jdks used to build and run respectively , buildJdk, runJdk , buildJdkName diff --git a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix index 08bc642b6307..17d5697a81ea 100644 --- a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix +++ b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeText, bazel, bazelTest, runLocal }: +{ writeText, bazel, bazelTest, runLocal }: let WORKSPACE = writeText "WORKSPACE" '' diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 721015f0c7c4..290860a0d9c3 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig +{ stdenv, fetchurl, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index 7ee4c4ee2580..d89c5fdbabde 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchzip, fetchpatch, darwin, writeText +{ stdenv, lib, fetchgit, darwin, writeText , git, ninja, python2 }: let diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix index 42bcf7fd055f..bd8401ac80dd 100644 --- a/pkgs/development/tools/clang-tools/default.nix +++ b/pkgs/development/tools/clang-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScript, llvmPackages }: +{ stdenv, llvmPackages }: let clang = llvmPackages.clang-unwrapped; diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index 4f285fa69618..70d0acfec884 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, go }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "cloudfoundry-cli-${version}"; diff --git a/pkgs/development/tools/cppclean/default.nix b/pkgs/development/tools/cppclean/default.nix index 96fe07a7799a..99f8d55bd87e 100644 --- a/pkgs/development/tools/cppclean/default.nix +++ b/pkgs/development/tools/cppclean/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages }: +{ stdenv, fetchFromGitHub, python3Packages }: with python3Packages; diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/development/tools/dapper/default.nix index 265763492b88..d5c7d309e98d 100644 --- a/pkgs/development/tools/dapper/default.nix +++ b/pkgs/development/tools/dapper/default.nix @@ -1,7 +1,6 @@ { buildGoPackage , lib , fetchFromGitHub -, fetchpatch }: buildGoPackage rec { diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix index f0a4f6c34e25..553d622a83c6 100644 --- a/pkgs/development/tools/database/cdb/default.nix +++ b/pkgs/development/tools/database/cdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, writeText }: +{ stdenv, lib, fetchurl, fetchFromGitHub }: let version = "0.75"; diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 14fcc3f8607c..7eb34aa29ba4 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "dbmate-${version}"; diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index 602eb33fdc1c..31ffff3804f0 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub, fetchpatch }: +{ lib, python3Packages, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "pgcli"; diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index af58762f80eb..e67b417226f4 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -1,5 +1,5 @@ { stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang -, beamPackages, z3, python }: +, z3, python }: stdenv.mkDerivation rec { name = "cuter-${version}"; diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix index 2c32cc5c6706..78735d8f76fc 100644 --- a/pkgs/development/tools/erlang/relx-exe/default.nix +++ b/pkgs/development/tools/erlang/relx-exe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchHex, fetchRebar3Deps, rebar3Relx }: +{ fetchHex, fetchRebar3Deps, rebar3Relx }: rebar3Relx rec { name = "relx-exe"; diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix index 6210361eb883..292c0dc3a4e8 100644 --- a/pkgs/development/tools/fusee-launcher/default.nix +++ b/pkgs/development/tools/fusee-launcher/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , python3Packages , python3 , fetchFromGitHub diff --git a/pkgs/development/tools/github-changelog-generator/default.nix b/pkgs/development/tools/github-changelog-generator/default.nix index 9362ef3fe45d..02de300138d2 100644 --- a/pkgs/development/tools/github-changelog-generator/default.nix +++ b/pkgs/development/tools/github-changelog-generator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundlerApp}: +{ lib, bundlerApp}: bundlerApp rec { pname = "github_changelog_generator"; diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index 9841e7900cd5..361740def118 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk, maven, writeText, makeWrapper, jre_headless, pcsclite }: +{ stdenv, fetchFromGitHub, jdk, maven, makeWrapper, jre_headless, pcsclite }: # TODO: This is quite a bit of duplicated logic with gephi. Factor it out? stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 307968a68440..ebb875c92984 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, oniguruma }: +{ stdenv, fetchurl, oniguruma }: stdenv.mkDerivation rec { name = "jq-${version}"; diff --git a/pkgs/development/tools/kubicorn/default.nix b/pkgs/development/tools/kubicorn/default.nix index fb76aed7b9eb..a63de5507479 100644 --- a/pkgs/development/tools/kubicorn/default.nix +++ b/pkgs/development/tools/kubicorn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: with stdenv.lib; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 49cea5e8ac81..69f246e921b5 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "kustomize-${version}"; diff --git a/pkgs/development/tools/kythe/default.nix b/pkgs/development/tools/kythe/default.nix index aaad6d31210c..c2bba7b32542 100644 --- a/pkgs/development/tools/kythe/default.nix +++ b/pkgs/development/tools/kythe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, binutils , fetchurl, glibc, ncurses5 }: +{ stdenv, binutils , fetchurl, ncurses5 }: stdenv.mkDerivation rec { version = "0.0.30"; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 1edd2944eab9..c33741740adc 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -6,7 +6,6 @@ , noSysDirs , gold ? !stdenv.buildPlatform.isDarwin || stdenv.hostPlatform == stdenv.targetPlatform , bison ? null -, fetchpatch }: let diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 05e0b1cd96f6..e37824d241cc 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,7 +1,7 @@ { stdenv # Build time -, fetchurl, fetchpatch, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages +, fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time , ncurses, readline, gmp, mpfr, expat, zlib, dejagnu diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index 36e83564346b..b021a3e222b3 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -2,15 +2,12 @@ , buildPythonApplication , fetchPypi , gdb -, iana-etc -, libredirect , flask , flask-socketio , flask-compress , pygdbmi , pygments , gevent -, breakpointHook , }: buildPythonApplication rec { diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index e11dd5040b09..0d052f340958 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -2,7 +2,6 @@ , enableUnfree ? true , stdenv , makeWrapper -, fetchzip , fetchurl , nodejs-10_x , coreutils diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index 0c3dd9f12c28..e8435549f4aa 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -2,7 +2,6 @@ , enableUnfree ? true , stdenv , makeWrapper -, fetchzip , fetchurl , nodejs-10_x , coreutils diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index 9f0e767c3d0b..80cfdc8b196d 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { pname = "swig"; diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index bec855f3cee6..262afe4f1891 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre, buildPackages }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { pname = "swig"; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 91f2a5c58fc2..82d0ec6119ea 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, unzip, libusb, fetchgit }: +{ stdenv, libusb, fetchgit }: let version = "2.1"; in diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix index 4c30d000ce20..82849be40b2c 100644 --- a/pkgs/development/tools/packet/default.nix +++ b/pkgs/development/tools/packet/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "packet-${version}"; diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 10bfd0c2f2d0..460fb46671ff 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ stdenv, python3Packages }: python3Packages.buildPythonApplication rec { pname = "remarshal"; diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index f2bbbef71896..04076a8f0cf6 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, libelf, which, git, pkgconfig, freeglut -, avrbinutils, avrgcc, avrlibc +{ stdenv, fetchFromGitHub, libelf, which, pkgconfig, freeglut +, avrgcc, avrlibc , libGLU_combined , GLUT }: diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix index 991edf9b568f..35ba9f8c006b 100644 --- a/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/pkgs/development/tools/solarus-quest-editor/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, cmake, luajit, SDL2, SDL2_image, SDL2_ttf, physfs, openal, libmodplug, libvorbis, solarus, - qtbase, qttools, fetchpatch, glm }: + qtbase, qttools, glm }: stdenv.mkDerivation rec { name = "solarus-quest-editor-${version}"; diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix index 42042b87198d..4c5b1843229b 100644 --- a/pkgs/development/tools/sourcetrail/default.nix +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoPatchelfHook -, icu, zlib, expat, dbus, libheimdal, openssl}: +, zlib, expat, dbus, openssl}: stdenv.mkDerivation rec { name = "sourcetrail-${version}"; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 702b7a564b22..5acf5ed0d231 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, cmake, writeText, python3 +{ stdenv, fetchFromGitHub, cmake, writeText, python3 , vulkan-headers, vulkan-loader, glslang , pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 211f71693976..c6c001143a95 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeScript, writeText, php, runtimeShell }: +{ stdenv, lib, fetchurl, php, runtimeShell }: let version = "2.0.1"; diff --git a/pkgs/development/tools/xcbuild/sdks.nix b/pkgs/development/tools/xcbuild/sdks.nix index 74192d9c6744..5ff3ca6808dc 100644 --- a/pkgs/development/tools/xcbuild/sdks.nix +++ b/pkgs/development/tools/xcbuild/sdks.nix @@ -1,5 +1,5 @@ -{ stdenv, runCommand, lib, toolchainName, sdkName -, writeText, version, xcodePlatform, libcxx, symlinkJoin }: +{ runCommand, lib, toolchainName, sdkName +, writeText, version, xcodePlatform }: let inherit (lib.generators) toPlist; diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index bc49a48778fc..cd7b86163667 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, makeWrapper, writeText, runCommand +{ stdenv, makeWrapper, writeText, runCommand , CoreServices, ImageIO, CoreGraphics , runtimeShell, callPackage , xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX" diff --git a/pkgs/development/web/nodejs/update.nix b/pkgs/development/web/nodejs/update.nix index 7b5a4710aa09..47e1abc9b217 100644 --- a/pkgs/development/web/nodejs/update.nix +++ b/pkgs/development/web/nodejs/update.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , writeScript , coreutils , curl diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index fd0196961441..5743868d5d96 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, openssl, enableNpm ? true }: +{ callPackage, openssl, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; diff --git a/pkgs/development/web/nodejs/v11.nix b/pkgs/development/web/nodejs/v11.nix index 881c348a98a5..7b60a3772d3c 100644 --- a/pkgs/development/web/nodejs/v11.nix +++ b/pkgs/development/web/nodejs/v11.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, openssl, enableNpm ? true }: +{ callPackage, openssl, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 1e68714f8c14..1ad8b3206d20 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, openssl, icu, enableNpm ? true }: +{ callPackage, openssl, icu, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index cf877521144a..90d88215d3fd 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, enableNpm ? true }: +{ callPackage, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix {}; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 250a4598b972..7cd9212c5a80 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -1,10 +1,8 @@ { stdenv , buildPythonApplication -, callPackage , lib , python , fetchurl -, fetchpatch , fetchFromGitHub , lame , mplayer diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 2580e870321c..650d5da53313 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -83,7 +83,6 @@ let inherit (self) themes; dwarf-fortress = dwarf-fortress; - dwarf-fortress-unfuck = dwarf-fortress-unfuck; twbt = twbt; dfhack = dfhack; dwarf-therapist = dwarf-therapist; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index d65bdab84911..a77250543107 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -54,9 +54,6 @@ let version = release.dfHackRelease; - warning = if release.prerelease then builtins.trace "[DFHack] Version ${version} is a prerelease. Careful!" - else null; - # revision of library/xml submodule xmlRev = release.xmlRev; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 071ab2af0c5c..e3005373b95f 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, symlinkJoin, lib, dwarf-therapist, dwarf-fortress, makeWrapper }: +{ pkgs, stdenv, dwarf-therapist, dwarf-fortress, makeWrapper }: let platformSlug = if stdenv.targetPlatform.is32bit then diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index 828ff77dfade..5f0328cba02d 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, lib, buildEnv, callPackage +{ stdenvNoCC, lib, buildEnv , df-games, themes, latestVersion, versionToName , dfVersion ? latestVersion # This package should, at any given time, provide an opinionated "optimal" diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index 7c80c1012462..e1f8e8abab80 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -41,10 +41,6 @@ let release = if hasAttr dfVersion twbt-releases then getAttr dfVersion twbt-releases else throw "[TWBT] Unsupported Dwarf Fortress version: ${dfVersion}"; - - warning = if release.prerelease then builtins.trace "[TWBT] Version ${version} is a prerelease. Careful!" - else null; - in stdenvNoCC.mkDerivation rec { diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 713f38f8a616..06bc6ca1fe51 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildEnv, substituteAll, runCommand -, dwarf-fortress, dwarf-fortress-unfuck +, dwarf-fortress , dwarf-therapist , enableDFHack ? false, dfhack , enableSoundSense ? false, soundSense, jdk diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index c5c239fc04f3..abc384e2c461 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, makeWrapper +{ stdenv, fetchurl, makeWrapper , alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL , factorio-utils , releaseType diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 5895e87e731f..125f02005a33 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, graphviz, makeWrapper +{ stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper , boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff , libjpeg, libGLU_combined, glew, libxslt }: diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index 53be638e753a..51975c17a8ee 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -1,4 +1,4 @@ -{ lib, buildEnv, stdenv, callPackage, makeWrapper, makeDesktopItem }: +{ buildEnv, stdenv, callPackage, makeWrapper, makeDesktopItem }: let description = "Action-adventure game, starring a certain quixotic frog"; diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index b49224d258d8..5a01d2512c42 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bash, which +{ stdenv, fetchFromGitHub, which , boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf , glew, zlib, icu, pkgconfig, cairo, libvpx }: diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix index efe7a6a76e98..d00072d24551 100644 --- a/pkgs/games/leela-zero/default.nix +++ b/pkgs/games/leela-zero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, boost, eigen +{ stdenv, fetchFromGitHub, cmake, boost , opencl-headers, ocl-icd, qtbase , zlib }: stdenv.mkDerivation rec { diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix index edc73eeac922..1fcf9c9527bd 100644 --- a/pkgs/games/linux-steam-integration/default.nix +++ b/pkgs/games/linux-steam-integration/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, git, gtk, pkgs, gettext, +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, git, gtk, gettext, gcc_multi, libressl, gnome3, steam }: let diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index cebdae3fb62f..17366ae99040 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp -, libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, xlibsWrapper, sqlite, luajit +, libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, sqlite, luajit , freetype, gettext, doxygen, ncurses, graphviz, xorg , leveldb, postgresql, hiredis }: diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index bf243e610bde..2e8533f7816e 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -43,7 +43,6 @@ let callWithName = name: value: if isFunction value then value name else value; buildOpenRASet = f: args: pkgs.recurseIntoAttrs (mapAttrs callWithName (f ({ inherit (pkgs) fetchFromGitHub; - abbrevCommit = commit: substring 0 7 commit; extraPostFetch = '' sed -i 's/curl/curl --insecure/g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh $out/thirdparty/fetch-thirdparty-deps.sh diff --git a/pkgs/games/openra/engines.nix b/pkgs/games/openra/engines.nix index 2bdbce6d939d..1c3d2308d972 100644 --- a/pkgs/games/openra/engines.nix +++ b/pkgs/games/openra/engines.nix @@ -1,4 +1,4 @@ -{ buildOpenRAEngine, fetchFromGitHub, abbrevCommit, extraPostFetch }: +{ buildOpenRAEngine, fetchFromGitHub, extraPostFetch }: let buildUpstreamOpenRAEngine = { version, rev, sha256 }: name: (buildOpenRAEngine { diff --git a/pkgs/games/openra/mods.nix b/pkgs/games/openra/mods.nix index 1e81e02e59f1..a045e365eceb 100644 --- a/pkgs/games/openra/mods.nix +++ b/pkgs/games/openra/mods.nix @@ -1,4 +1,4 @@ -{ buildOpenRAMod, fetchFromGitHub, abbrevCommit, extraPostFetch }: +{ buildOpenRAMod, fetchFromGitHub, extraPostFetch }: let unsafeBuildOpenRAMod = attrs: name: (buildOpenRAMod attrs name).overrideAttrs (_: { diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix index 7486bf0d9408..6991735962d7 100644 --- a/pkgs/games/pro-office-calculator/default.nix +++ b/pkgs/games/pro-office-calculator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia, fetchpatch }: +{ stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: stdenv.mkDerivation rec { version = "1.0.13"; name = "pro-office-calculator-${version}"; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index a7f055c70810..b3a9dec52941 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, writeScript, buildFHSUserEnv, steam, glxinfo-i686 +{ config, lib, writeScript, buildFHSUserEnv, steam, glxinfo-i686 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 002d6be784c1..0bdd1f9f62df 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchsvn, fetchpatch, cmake, pkgconfig +{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig , openal, freealut, libGLU_combined, libvorbis, libogg, gettext, curl, freetype , fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, enet }: diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 56ca1a6507b0..f0c40274d9a1 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchurl, stdenv, bam, pkgconfig, makeWrapper, python, alsaLib +{ fetchFromGitHub, stdenv, bam, pkgconfig, python, alsaLib , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack }: diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index ef39e9f2fb55..11873e6f2a06 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, removeReferencesTo +{ stdenv, fetchurl, pkgconfig, removeReferencesTo , zlib, libjpeg, libpng, libtiff, pam, dbus, systemd, acl, gmp, darwin , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null , coreutils diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index 872e49dc3c7a..b395d73a2669 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, cups, libusb, libxml2, ghostscript, perl }: +{ stdenv, fetchurl, cups, libusb, libxml2, perl }: let diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index 77d9f5094d05..f3ec6421339f 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, makeWrapper, jre +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, jre , useCCTweaked ? true }: diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index b0d422385424..3e8f78c44115 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost, curl, gtest }: +{ stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: stdenv.mkDerivation rec { name = "citra-${version}"; diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index ce72c1fdfee8..5b548038da9f 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, lilypond, ghostscript, gyre-fonts }: +{ fetchgit, lilypond, ghostscript, gyre-fonts }: let diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index 829d2d4e02e4..36dbcf170dd5 100644 --- a/pkgs/misc/lilypond/with-fonts.nix +++ b/pkgs/misc/lilypond/with-fonts.nix @@ -1,6 +1,5 @@ { stdenv, lndir, symlinkJoin, makeWrapper , lilypond, openlilylib-fonts -, fonts ? openlilylib-fonts.all }: stdenv.lib.appendToName "with-fonts" (symlinkJoin { diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index 26143a5ef442..ffa8934cd8bb 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -1,5 +1,5 @@ { - stdenv, makeWrapper, fetchFromGitHub, substituteAll, + stdenv, makeWrapper, fetchFromGitHub, imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh }: diff --git a/pkgs/misc/themes/adwaita-qt/default.nix b/pkgs/misc/themes/adwaita-qt/default.nix index aade22927f01..f2a682bcf7dc 100644 --- a/pkgs/misc/themes/adwaita-qt/default.nix +++ b/pkgs/misc/themes/adwaita-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, qtbase }: +{ stdenv, fetchFromGitHub, cmake, ninja, qtbase }: stdenv.mkDerivation rec { pname = "adwaita-qt"; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index b30413ac79c6..20cbbf275c3a 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,5 +1,5 @@ # TODO check that no license information gets lost -{ callPackage, config, lib, stdenv, vimUtils, vim, darwin, llvmPackages }: +{ callPackage, config, lib, vimUtils, vim, darwin, llvmPackages }: let diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index f93ed5669d00..93b6f4a62097 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, yacc, flex, bash +{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, yacc, flex , writeText, buildPackages, splicePackages, symlinkJoin }: let diff --git a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix index be744fa88736..f335a6c11548 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuildHook, Foundation, xpc, darling, dtrace, xnu }: +{ appleDerivation, xcbuildHook, xpc, dtrace, xnu }: appleDerivation { nativeBuildInputs = [ xcbuildHook dtrace ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index d5094e1f91e4..14c69b84eb41 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, fetchzip, pkgs }: +{ stdenv, fetchurl, fetchzip, pkgs }: let # This attrset can in theory be computed automatically, but for that to work nicely we need diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix index 87211f481d4f..8bd45aa008b9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, appleDerivation, xcbuildHook +{ lib, appleDerivation, xcbuildHook # headersOnly is true when building for libSystem , headersOnly ? false }: diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 43a9495c3ab8..ff8f3eb5e265 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook -, libcxxabi, libuuid, llvm +, libcxxabi, libuuid , libobjc ? null, maloader ? null , enableTapiSupport ? true, libtapi }: diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index 9d3f7c34b0fb..64ed110b2a3f 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl +{ stdenv, fetchFromGitHub, fetchurl , cmake, pkgconfig, dbus, makeWrapper , gtest , boost diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix index 8a102996cab6..6415cc635d53 100644 --- a/pkgs/os-specific/linux/anbox/kmod.nix +++ b/pkgs/os-specific/linux/anbox/kmod.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, kernel, fetchFromGitHub }: +{ stdenv, kernel, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "anbox-modules"; diff --git a/pkgs/os-specific/linux/bpftool/default.nix b/pkgs/os-specific/linux/bpftool/default.nix index cc4786ab3848..ac444c28d75d 100644 --- a/pkgs/os-specific/linux/bpftool/default.nix +++ b/pkgs/os-specific/linux/bpftool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv , libopcodes, libbfd, libelf , linuxPackages_latest }: diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index ebd09759be6e..9c621d28ed29 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lvm2, json_c +{ stdenv, fetchurl, lvm2, json_c , openssl, libuuid, pkgconfig, popt , enablePython ? false, python2 ? null }: diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 3b3d56052485..3d6f00ba97a9 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python3 , libraw1394, libconfig, libavc1394, libiec61883, libxmlxx3 , glibmm -, alsaLib, dbus, dbus_cplusplus +, dbus, dbus_cplusplus }: let diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 89b4f70264eb..e64c4c09ebd9 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, dpkg }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "raspberrypi-wireless-firmware-${version}"; diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index b2fee6184e24..cf06ff353253 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, bison, flex, pkgconfig, pruneLibtoolFiles +{ stdenv, fetchurl, bison, flex, pkgconfig, pruneLibtoolFiles , libnetfilter_conntrack, libnftnl, libmnl, libpcap }: stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index cc3e039d2414..1e9b1c276d0c 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -1,5 +1,5 @@ { stdenvNoCC, lib, buildPackages -, fetchurl, fetchpatch, perl +, fetchurl, perl , elf-header }: diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 5a086612925d..527811c2b8d6 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -1,5 +1,4 @@ { buildPackages -, ncurses , callPackage , perl , bison ? null diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 09cb4e11b571..433506e5c39e 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, lib, fetchurl, autoreconfHook, pkgconfig +{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig , libxslt, xz, elf-header }: let diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index 838f5c1e8c01..981e928ba659 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { (if python3 != null then "--with-python3" else "--without-python3") ]; - meta = let inherit (stdenv.lib) platforms licenses maintainers; in { + meta = let inherit (stdenv.lib) platforms licenses; in { description = "Library for working with POSIX capabilities"; homepage = https://people.redhat.com/sgrubb/libcap-ng/; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index d2fc9cf0d26f..4e0202cebf31 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScript, fetchurl, groff, system-sendmail }: +{ stdenv, fetchurl, groff, system-sendmail }: stdenv.mkDerivation rec { name = "mdadm-4.1"; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index d7eafd9246d0..303df98d44ae 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers -, buildEnv, python3 +, python3 }: let diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index 3bdb9886d39a..2db2e12bb961 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { name = "numactl-${version}"; diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix index ee12251ae5e3..ef8e8c7b34a7 100644 --- a/pkgs/os-specific/linux/perf-tools/default.nix +++ b/pkgs/os-specific/linux/perf-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perl }: +{ stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation { name = "perf-tools-20171219"; diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix b/pkgs/os-specific/linux/sdnotify-wrapper/default.nix index 28e1f0257897..613a7fd51e65 100644 --- a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix +++ b/pkgs/os-specific/linux/sdnotify-wrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, runCommandCC, skawarePackages }: +{ lib, runCommandCC, skawarePackages }: with skawarePackages; diff --git a/pkgs/os-specific/linux/speedometer/default.nix b/pkgs/os-specific/linux/speedometer/default.nix index f9c971502921..449edf481a95 100644 --- a/pkgs/os-specific/linux/speedometer/default.nix +++ b/pkgs/os-specific/linux/speedometer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { name = "speedometer-${version}"; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index fdde2bedf552..80c5c1f650ba 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, glibc, augeas, dnsutils, c-ares, curl, +{ stdenv, fetchurl, glibc, augeas, dnsutils, c-ares, curl, cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen, python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index 2ff0e4cd38fd..3fd8ff07f425 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -1,4 +1,4 @@ -{ stdenv, systemd, cryptsetup }: +{ systemd, cryptsetup }: systemd.overrideAttrs (p: { version = p.version; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 8aa518ed1d01..1485d060281f 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, pkgconfig, intltool, gperf, libcap, kmod +{ stdenv, lib, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod , xz, pam, acl, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor , audit, lz4, bzip2, libmicrohttpd, pcre2 diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/pkgs/os-specific/linux/tp_smapi/update.nix index b89912434ec5..65b557e45457 100644 --- a/pkgs/os-specific/linux/tp_smapi/update.nix +++ b/pkgs/os-specific/linux/tp_smapi/update.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts, runtimeShell }: +{ lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts, runtimeShell }: writeScript "update-tp_smapi" '' #!${runtimeShell} diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index b2851116ce8e..61f487586767 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchurl, openssl, pkgconfig, libnl +{ stdenv, fetchurl, openssl, pkgconfig, libnl , dbus, readline ? null, pcsclite ? null }: diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index b422fe2c3222..fe757d78af5e 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils -, perl, fetchpatch +, perl , configFile ? "all" # Userspace dependencies diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix index 2fe989bb2f49..ebc95ecaa7a9 100644 --- a/pkgs/os-specific/windows/w32api/default.nix +++ b/pkgs/os-specific/windows/w32api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, lib }: +{ stdenv, fetchurl, lib }: stdenv.mkDerivation rec { name = "w32api-3.17-2"; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 61476a892d64..4df24a6d60c0 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, libtool +{ stdenv, fetchFromGitHub, cmake, libtool , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu , libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka , readline, sparsehash, unixODBC, zstd, ninja, jemalloc, brotli, protobuf, xxHash diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 15f6be1fa595..0a4d6f154807 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -8,7 +8,7 @@ let # un-indented, over the whole file result = if extraFeatures then wrapped-full else unwrapped; -inherit (stdenv.lib) optional concatStringsSep; +inherit (stdenv.lib) optional; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 4ae96e95269c..87e4a22b0514 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -1,6 +1,6 @@ # This builder is for FoundationDB CMake build system. -{ lib, fetchurl, fetchpatch, fetchFromGitHub +{ lib, fetchFromGitHub , cmake, ninja, boost, python3, openjdk, mono, libressl , gccStdenv, llvmPackages @@ -16,7 +16,7 @@ let makeFdb = { version - , branch + , branch # unused , sha256 , rev ? "refs/tags/${version}" , officialRelease ? true diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 408f4ecb1e05..d778e8df18f4 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, python3, protobuf3_6 +{ lib, fetchFromGitHub, python3, protobuf3_6 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [] diff --git a/pkgs/servers/home-assistant/esphome.nix b/pkgs/servers/home-assistant/esphome.nix index a8cb12193b0c..895b089f991d 100644 --- a/pkgs/servers/home-assistant/esphome.nix +++ b/pkgs/servers/home-assistant/esphome.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchpatch, platformio, esptool, git, protobuf3_7 }: +{ lib, python3, platformio, esptool, git, protobuf3_7 }: let python = python3.override { diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 5933a71e5159..3c3d4c20df1b 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -8,7 +8,7 @@ , luaSupport ? false, lua5 }: -let inherit (stdenv.lib) optional optionalString; +let inherit (stdenv.lib) optional; in assert sslSupport -> aprutil.sslSupport && openssl != null; diff --git a/pkgs/servers/icingaweb2/theme-snow/default.nix b/pkgs/servers/icingaweb2/theme-snow/default.nix index 136168fc8d4a..941138bb0a52 100644 --- a/pkgs/servers/icingaweb2/theme-snow/default.nix +++ b/pkgs/servers/icingaweb2/theme-snow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, gawk }: with lib; stdenv.mkDerivation rec { +{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { name = "icingaweb2-theme-snow"; version = "1.0.0"; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 6730f7acc670..cd48ab12e24e 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, autoconf, automake, libtool, bison +{ stdenv, fetchurl, autoconf, automake, libtool, bison , libasr, libevent, zlib, libressl, db, pam, nixosTests }: diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index b82bdf1518b9..11d5b92071be 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, docbook_xsl, libxslt +{ stdenv, lib, fetchFromGitHub, cmake, docbook_xsl, libxslt , openssl, libuuid, libwebsockets, c-ares, libuv , systemd ? null, withSystemd ? stdenv.isLinux }: diff --git a/pkgs/servers/mxisd/default.nix b/pkgs/servers/mxisd/default.nix index 9baf5ffdc52c..5d3a220d9b19 100644 --- a/pkgs/servers/mxisd/default.nix +++ b/pkgs/servers/mxisd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk, jre, git, gradle_4_10, perl, makeWrapper, writeText }: +{ stdenv, fetchFromGitHub, jre, git, gradle_4_10, perl, makeWrapper }: let name = "mxisd-${version}"; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index ea77c61eec0f..c6ab0e5d9fee 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "nextcloud-${version}"; diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix index 2de69d5d9677..d094fda84b4f 100644 --- a/pkgs/servers/oauth2_proxy/default.nix +++ b/pkgs/servers/oauth2_proxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "oauth2_proxy"; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 1c8fd508a5a7..958fcd578c2b 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, which, autoconf, automake, flex, yacc +{ stdenv, fetchurl, which, autoconf, automake, flex, yacc , kernel, glibc, perl, libtool_2, kerberos }: with (import ./srcs.nix { inherit fetchurl; }); diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 1332edbab45f..2f2b1195cf32 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -4,8 +4,8 @@ , writeScript , plexRaw -# Old argument for overriding the Plex data directory; isn't necessary for this -# version of Plex to function, but still around for backwards-compatibility. +# Old argument for overriding the Plex data directory; not used for this +# version of Plex, but still around for backwards-compatibility. , dataDir ? "/var/lib/plex" }: diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 4d8f034c51ee..a490acb1f739 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, buildEnv, roundcube, roundcubePlugins }: +{ fetchurl, stdenv, buildEnv, roundcube, roundcubePlugins }: stdenv.mkDerivation rec { pname = "roundcube"; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 7dcc6cbe686d..dbda33a1f196 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen -, fetchpatch, fixDarwinDylibNames +, fixDarwinDylibNames , docbook_xml_dtd_42, readline , popt, iniparser, libbsd, libarchive, libiconv, gettext , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index f45b948a6f7f..e76d08061145 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -1,10 +1,8 @@ -{ pkgs, lib, stdenv, fetchurl, unzip, javaPackages, elasticsearch }: +{ pkgs, lib, stdenv, fetchurl, unzip, elasticsearch }: let esVersion = elasticsearch.version; - majorVersion = lib.head (builtins.splitVersion esVersion); - esPlugin = a@{ pluginName, installPhase ? '' diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 90768e8f66ee..90c84ce15879 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, makeWrapper +{ stdenv, fetchurl, makeWrapper , perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }: perlPackages.buildPerlPackage rec { diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index ab7ba8943a7b..65b9c052f63e 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "pgjwt-${version}"; diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/default.nix b/pkgs/servers/web-apps/codimd/CodeMirror/default.nix index fa636601ec24..2dba13d09143 100644 --- a/pkgs/servers/web-apps/codimd/CodeMirror/default.nix +++ b/pkgs/servers/web-apps/codimd/CodeMirror/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, buildEnv, fetchFromGitHub, nodejs-8_x, phantomjs2, which }: +{ stdenv, pkgs, fetchFromGitHub, nodejs-8_x, phantomjs2, which }: let nodePackages = import ./node.nix { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 6bcf4d08f386..f668d7bbf2a3 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -1,6 +1,6 @@ { abiCompat ? null, - stdenv, makeWrapper, lib, fetchurl, fetchpatch, buildPackages, - automake, autoconf, gettext, libiconv, libtool, intltool, mtdev, libevdev, libinput, + stdenv, makeWrapper, fetchurl, fetchpatch, buildPackages, + automake, autoconf, gettext, libiconv, libtool, intltool, freetype, tradcpp, fontconfig, meson, ninja, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index ccde00c3259f..9c1e3ffe0b71 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchurl, cmake, makeWrapper, pkgconfig -, curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, mysql, nettools, pcre, perl, perlPackages +, curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, mysql, pcre, perl, perlPackages , polkit, utillinuxMinimal, x264, zlib -, avahi, dbus, gettext, git, gnutar, gzip, bzip2, libiconv, openssl, python , coreutils, procps, psmisc }: # NOTES: diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index c9a93db2d981..b74b2fc43f30 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pcre, fetchpatch }: +{ stdenv, fetchurl, ncurses, pcre }: let version = "5.7.1"; diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix index ddabfe87174f..6aadf3163d34 100644 --- a/pkgs/shells/zsh/zsh-git-prompt/default.nix +++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix @@ -25,7 +25,6 @@ # installed. # { fetchFromGitHub -, haskell , python , git , lib diff --git a/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/pkgs/shells/zsh/zsh-history-substring-search/default.nix index 26866f830dbc..42de7d48d831 100644 --- a/pkgs/shells/zsh/zsh-history-substring-search/default.nix +++ b/pkgs/shells/zsh/zsh-history-substring-search/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, zsh }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { name = "zsh-history-substring-search-${version}"; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 20062bba8ee6..f7a40bb0d0e7 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -199,7 +199,6 @@ in rec { ninja = super.ninja.override { buildDocs = false; }; darwin = super.darwin // { cctools = super.darwin.cctools.override { - llvm = null; enableTapiSupport = false; }; }; diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index cfa8aac0578e..a299879693c8 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -12,9 +12,7 @@ in rec { singleBinary = false; }); - # We want a version of cctools without LLVM, because the LTO support ends up making - # the bootstrap tools huge and isn't really necessary for bootstrap - cctools_ = darwin.cctools.override { llvm = null; }; + cctools_ = darwin.cctools; # Avoid debugging larger changes for now. bzip2_ = bzip2.override (args: { linkStatic = true; }); diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 1c6f6490bf75..be79e7626c55 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -99,7 +99,6 @@ in rec { separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.useLLVM or false); outputs' = outputs ++ lib.optional separateDebugInfo' "debug"; - fixedOutputDrv = attrs ? outputHash; noNonNativeDeps = builtins.length (depsBuildTarget ++ depsBuildTargetPropagated ++ depsHostHost ++ depsHostHostPropagated ++ buildInputs ++ propagatedBuildInputs diff --git a/pkgs/test/kernel.nix b/pkgs/test/kernel.nix index 14a4d5ea1041..86f1b8d8e9ac 100644 --- a/pkgs/test/kernel.nix +++ b/pkgs/test/kernel.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs }: +{ lib, pkgs }: with lib.kernel; with lib.asserts; diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix index 8792818164ff..aff7b8adfc23 100644 --- a/pkgs/tools/X11/caffeine-ng/default.nix +++ b/pkgs/tools/X11/caffeine-ng/default.nix @@ -1,4 +1,4 @@ -{ gdk_pixbuf, glib, gobject-introspection, gtk3, lib, libnotify, pkgs, +{ gdk_pixbuf, glib, gobject-introspection, gtk3, lib, libnotify, pythonPackages, wrapGAppsHook }: diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index 97c8e05e83a3..516ed9da272b 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, bash, fetchFromGitHub, libgcc, libjpeg_turbo, +{ stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo, libpng, libtool, libxml2, pkgconfig, which, xorg }: stdenv.mkDerivation rec { name = "nx-libs-${version}"; diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 8cd26c805079..5d94943daf90 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, feh, libxslt, +{ stdenv, python3Packages, fetchFromGitHub, libxslt, gobject-introspection, gtk3, wrapGAppsHook, gnome3 }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/tools/X11/xpra/xf86videodummy/default.nix b/pkgs/tools/X11/xpra/xf86videodummy/default.nix index 8d04745ed7fc..4e9f88608927 100644 --- a/pkgs/tools/X11/xpra/xf86videodummy/default.nix +++ b/pkgs/tools/X11/xpra/xf86videodummy/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, fetchurl , xorgproto, xorgserver -, pkgconfig -, xpra }: +, pkgconfig }: with lib; diff --git a/pkgs/tools/admin/aws-env/default.nix b/pkgs/tools/admin/aws-env/default.nix index 19f149b02274..37bf0e6c45d3 100644 --- a/pkgs/tools/admin/aws-env/default.nix +++ b/pkgs/tools/admin/aws-env/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, lib }: +{ buildGoPackage, fetchFromGitHub, lib }: buildGoPackage rec { pname = "aws-env"; diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index 6fe568966e9f..e6ce5d077984 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "cli53-${version}"; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 852bb3377781..880ff331c933 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl, fetchpatch +{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute, iptables, ebtables, libcap, dqlite , sqlite-replication diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index f73104422c1b..feab9c821c0e 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, file, fetchurl, makeWrapper, +{ stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let versionMajor = "6.6"; diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index 467ff2ba1861..5b5a0d9c0e0a 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, libdaemon -, mpd_clientlib, curl, sqlite, ruby, bundlerEnv, libnotify, pandoc }: +, mpd_clientlib, curl, sqlite, bundlerEnv, libnotify, pandoc }: let gemEnv = bundlerEnv { diff --git a/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix b/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix index b79dfeb12d80..d8f15a65b45b 100644 --- a/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix +++ b/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix @@ -1,4 +1,4 @@ -{ stdenv, opl3bankeditor, fetchFromGitHub, fetchpatch }: +{ opl3bankeditor, fetchFromGitHub }: opl3bankeditor.overrideAttrs (oldAttrs: rec { version = "1.3-beta"; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 1c0e08a2dbbd..beb3db5e78b3 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, python3, acl, libb2, lz4, zstd, openssl, openssh }: +{ stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh }: python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; diff --git a/pkgs/tools/backup/dedup/default.nix b/pkgs/tools/backup/dedup/default.nix index de2a7370c3f8..05a436049263 100644 --- a/pkgs/tools/backup/dedup/default.nix +++ b/pkgs/tools/backup/dedup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, lz4, snappy, libsodium +{ stdenv, fetchurl, lz4, snappy, libsodium # For testing , coreutils, gawk }: diff --git a/pkgs/tools/backup/dirvish/default.nix b/pkgs/tools/backup/dirvish/default.nix index 829dca52dfe5..0127e32fe93b 100644 --- a/pkgs/tools/backup/dirvish/default.nix +++ b/pkgs/tools/backup/dirvish/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeWrapper, perl, rsync, perlPackages }: +{ fetchurl, stdenv, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { name = "dirvish-1.2.1"; diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index c43962cb075d..f12e8af84b88 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, makeWrapper, fetchFromGitHub, bash, btrfs-progs, coreutils, pythonPackages, utillinux }: +{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, pythonPackages, utillinux }: let diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index d78cdff2273a..168542f57df8 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo +{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3 }: diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index c1d41ff1622c..72e43725ef59 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, libusb1, buildGoPackage, fetchgit }: +{ pkgconfig, libusb1, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-mtpfs-${version}"; diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 0d58e8007efa..73227b3d9f03 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -1,12 +1,10 @@ { stdenv -, fetchzip , fetchFromGitHub , makeWrapper , python , fuse , pkgconfig , libpcap -, file , zlib }: diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix index 14d47dc30bd8..7ea73ab8db8d 100644 --- a/pkgs/tools/graphics/gmic_krita_qt/default.nix +++ b/pkgs/tools/graphics/gmic_krita_qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig +{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng , curl, krita, qtbase, qttools , fetchgit }: diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index b3835394800d..503461018abb 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, imagemagickBig, pkgconfig, python2Packages, perl -, libX11, libv4l, qt5, lzma, gtk2, xmlto, docbook_xsl, autoreconfHook, dbus +, libX11, libv4l, qt5, gtk2, xmlto, docbook_xsl, autoreconfHook, dbus , enableVideo ? stdenv.isLinux, enableDbus ? stdenv.isLinux }: diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index cb42d959d12f..31ac23b395c7 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, fetchurl, runCommand, fetchFromGitHub, autoreconfHook, gettext, makeWrapper, pkgconfig +{ stdenv, substituteAll, fetchurl, fetchFromGitHub, autoreconfHook, gettext, makeWrapper, pkgconfig , vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePython2Library ? false , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix index 83e3842252d3..ad129503de33 100644 --- a/pkgs/tools/misc/0x0/default.nix +++ b/pkgs/tools/misc/0x0/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, xsel, curl, fetchFromGitLab, makeWrapper}: +{ stdenv, xsel, curl, fetchFromGitLab, makeWrapper}: stdenv.mkDerivation rec { name = "0x0-${version}"; diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix index b78f1d7136d3..a3b30423aa8f 100644 --- a/pkgs/tools/misc/capture/default.nix +++ b/pkgs/tools/misc/capture/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, slop, ffmpeg, fetchFromGitHub, makeWrapper}: +{ stdenv, slop, ffmpeg, fetchFromGitHub, makeWrapper}: stdenv.mkDerivation rec { name = "capture-unstable-${version}"; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 0719fb36164b..91fb208f5c05 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -14,7 +14,6 @@ , argyllcms , meson , ninja -, libxml2 , vala , libgudev , wrapGAppsHook @@ -25,7 +24,6 @@ , docbook_xml_dtd_412 , gtk-doc , libxslt -, substituteAll }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 4a56e6465e62..6ee7ffdd9955 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, bash, fetchpatch }: +{ stdenv, fetchFromGitHub, buildGoPackage, bash }: buildGoPackage rec { name = "direnv-${version}"; diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 553a68abf0bf..5a967ea20959 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages, makeWrapper }: +{ skawarePackages, makeWrapper }: with skawarePackages; diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index f1f2fd9aa44d..b773fc5d6804 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, pantheon, python3, gnome3, gtk3, gobject-introspection, desktop-file-utils, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, pantheon, python3, gnome3, gtk3, gobject-introspection, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "hashit"; diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 36c09d2b1c9f..bbd78feaaf87 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rpmextract, ncurses5, patchelf, makeWrapper, requireFile, unzip }: +{ stdenv, rpmextract, ncurses5, patchelf, requireFile, unzip }: stdenv.mkDerivation rec { name = "megacli-${version}"; diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix index c839c1f5e6c4..10135d66408b 100644 --- a/pkgs/tools/misc/memtest86-efi/default.nix +++ b/pkgs/tools/misc/memtest86-efi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, utillinux, libguestfs-with-appliance }: +{ lib, stdenv, fetchurl, unzip, libguestfs-with-appliance }: stdenv.mkDerivation rec { pname = "memtest86-efi"; diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/tools/misc/pb_cli/default.nix index 10fe3169bfbd..fe1d848ee502 100644 --- a/pkgs/tools/misc/pb_cli/default.nix +++ b/pkgs/tools/misc/pb_cli/default.nix @@ -1,5 +1,5 @@ { screenshots ? true, video ? false, clipboard ? true -, stdenv, pkgs, jq, curl, fetchFromGitHub, makeWrapper, maim ? null, xclip ? null, capture ? null }: +, stdenv, jq, curl, fetchFromGitHub, makeWrapper, maim ? null, xclip ? null, capture ? null }: assert screenshots -> maim != null; assert video -> capture != null; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 9c66ea849e25..cc842105d0ae 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -7,7 +7,7 @@ assert tkremind -> tcllib != null; assert tkremind -> makeWrapper != null; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optional optionalString; tclLibraries = stdenv.lib.optionals tkremind [ tcllib tk ]; tclLibPaths = stdenv.lib.concatStringsSep " " (map (p: "${p}/lib/${p.libPrefix}") tclLibraries); diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 09df21e4c41c..2ea93319935f 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff +{ fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff , tcl-8_5, darwin }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 97548cab8db8..dcdc6dde2cad 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages }: +{ skawarePackages }: with skawarePackages; diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index cc37326cc5eb..ac0b950a1da5 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 , lvm2, pam, python, utillinux }: diff --git a/pkgs/tools/misc/xdummy/default.nix b/pkgs/tools/misc/xdummy/default.nix index bdcdc47ea131..7d7942f7ca98 100644 --- a/pkgs/tools/misc/xdummy/default.nix +++ b/pkgs/tools/misc/xdummy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, writeScriptBin, xorg, xkeyboard_config, runtimeShell }: +{ writeText, writeScriptBin, xorg, xkeyboard_config, runtimeShell }: let xorgConfig = writeText "dummy-xorg.conf" '' diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index e65f59f3c67b..f714d62ff4da 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,6 +1,5 @@ { lib, fetchurl, buildPythonPackage , zip, ffmpeg_4, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc -, fetchpatch # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the # manpage argument in place in case someone wants to use this derivation to diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 586961c0df72..bd9cae162244 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -1,6 +1,5 @@ { buildGoModule , fetchFromGitHub -, fetchpatch , lib }: diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index 77e61aaf3470..afe00d7a3547 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook -, bind, libseccomp, zlib, openssl, libcap +, bind, zlib, openssl, libcap }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 467f6f1586d5..85f13f031b4d 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , iputils , python3 , python3Packages diff --git a/pkgs/tools/networking/ipgrep/default.nix b/pkgs/tools/networking/ipgrep/default.nix index 6052b7d405b5..6ea930fccaab 100644 --- a/pkgs/tools/networking/ipgrep/default.nix +++ b/pkgs/tools/networking/ipgrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper }: +{ stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { version = "1.0"; diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/tools/networking/nettee/default.nix index 058a36f3ed18..fdfa446907c1 100644 --- a/pkgs/tools/networking/nettee/default.nix +++ b/pkgs/tools/networking/nettee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeScript, file, cleanPackaging }: +{ stdenv, lib, fetchurl, cleanPackaging }: let version = "0.3.4"; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index c60a409fba5c..e6940d2332ca 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -2,9 +2,9 @@ , gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala , libgcrypt, dnsmasq, bluez5, readline, libselinux, audit , gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, gnused, coreutils, iputils, kmod, jansson, gtk-doc, libxslt +, ethtool, gnused, iputils, kmod, jansson, gtk-doc, libxslt , docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43 -, openconnect, curl, meson, ninja, libpsl, libredirect }: +, openconnect, curl, meson, ninja, libpsl }: let pname = "NetworkManager"; diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index 352b88f39354..5dffdb4ca3fb 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig , file, findutils , gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret -, withGnome ? true, gnome3, networkmanagerapplet }: +, withGnome ? true, networkmanagerapplet }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix index fdb281e6c372..805c4bd55207 100644 --- a/pkgs/tools/networking/ocserv/default.nix +++ b/pkgs/tools/networking/ocserv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, nettle, gnutls , libev, protobufc, guile, geoip, libseccomp, gperf, readline -, lz4, libgssglue, ronn, coreutils, pam +, lz4, libgssglue, ronn, pam }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 1458ca65f924..8c043294143e 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, unzip, nettools, pythonPackages, texinfo }: +{ fetchurl, lib, nettools, pythonPackages, texinfo }: # FAILURES: The "running build_ext" phase fails to compile Twisted # plugins, because it tries to write them into Twisted's (immutable) diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index bfa309f79df2..854ad617cd26 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonApplication, fetchFromGitHub, makeDesktopItem, makeWrapper +{ stdenv, lib, buildPythonApplication, fetchFromGitHub, makeWrapper , aria , libnotify , pulseaudio diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix index 5b923748c673..8d75ea413eca 100644 --- a/pkgs/tools/networking/photon/default.nix +++ b/pkgs/tools/networking/photon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, makeWrapper }: +{ stdenv, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "photon"; diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/tools/networking/quickserve/default.nix index 7269eb7b80a9..d83784f9989c 100644 --- a/pkgs/tools/networking/quickserve/default.nix +++ b/pkgs/tools/networking/quickserve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchzip, python3, python3Packages, writeScript }: +{ stdenv, makeWrapper, fetchzip, python3, python3Packages }: let threaded_servers = python3Packages.buildPythonPackage { name = "threaded_servers"; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index af68440ede83..36c539a40b41 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages }: +{ skawarePackages }: with skawarePackages; diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index 44b262861e1c..91b868a017f5 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -5,7 +5,7 @@ # for token storage, except that it would make the Nix package inconsistent with # upstream and other distributions. -{ stdenv, lib, writeShellScriptBin, fetchFromGitHub, curl, jq, runtimeShell }: +{ stdenv, lib, fetchFromGitHub, curl, jq, runtimeShell }: stdenv.mkDerivation rec { name = "slack-cli-${version}"; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 1f0271c22573..1bd864d859c5 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,13 +1,11 @@ -{ stdenv, fetchurl, substituteAll +{ stdenv, fetchurl , pkgconfig, autoreconfHook , gmp, python, iptables, ldns, unbound, openssl, pcsclite , openresolv , systemd, pam , curl -, kmod , enableTNC ? false, trousers, sqlite, libxml2 , enableNetworkManager ? false, networkmanager -, libpcap , darwin }: diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index 2eca68a98f68..7c883ebdc55b 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pythonPackages, fetchgit, fetchFromGitHub, makeWrapper, git +{ lib, pythonPackages, fetchgit, fetchFromGitHub, makeWrapper, git , sshfs-fuse, torsocks, sshuttle, conntrack-tools , openssh, coreutils , iptables, bash }: diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index 809286cefe96..c9a6599708c6 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoreconfHook, asciidoc, libxml2, +{ stdenv, fetchFromGitHub, autoreconfHook, asciidoc, libxml2, libxslt, docbook_xsl }: stdenv.mkDerivation rec{ diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index ddcd98a596d5..69f4fc435c91 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, rustPlatform, darwin }: +{ stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { name = "nixdoc-${version}"; diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index 54abfa89991a..426cc7943e5a 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScript, buildFHSUserEnv, coreutils, file, libarchive, runtimeShell +{ writeScript, buildFHSUserEnv, coreutils, file, libarchive, runtimeShell , extraPkgs ? pkgs: [], appimageTools }: let diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix index 2912999fafa9..bcf96a50d36a 100644 --- a/pkgs/tools/package-management/apt-dater/default.nix +++ b/pkgs/tools/package-management/apt-dater/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , autoreconfHook, pkgconfig, gettext -, vim, glib, libxml2, openssl, ncurses, popt, screen +, vim, glib, libxml2, ncurses, popt, screen }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix index a2cd0242839c..cd3a8507be14 100644 --- a/pkgs/tools/package-management/nix-top/default.nix +++ b/pkgs/tools/package-management/nix-top/default.nix @@ -5,7 +5,6 @@ , makeWrapper , getent # /etc/passwd , ncurses # tput -, procps # ps , binutils-unwrapped # strings , coreutils , findutils diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix index cabd1e491a76..a2add8f8a78e 100644 --- a/pkgs/tools/package-management/nix-update-source/default.nix +++ b/pkgs/tools/package-management/nix-update-source/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts +{ lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts , runtimeShell }: python3Packages.buildPythonApplication rec { version = "0.6.3"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 7ba83b700375..744d795cb781 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -9,7 +9,7 @@ let common = - { lib, stdenv, fetchurl, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz + { lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns, jq , busybox-sandbox-shell diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 7cd7935d155c..c761a3a47793 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,4 +1,4 @@ -{ callPackage, newScope, pkgs, fetchurl }: +{ callPackage, fetchurl }: callPackage ./generic.nix (rec { version = "1.7"; diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index 4e602804405b..966383163e60 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, buildGoModule, fetchFromGitHub, makeWrapper, gnupg }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, gnupg }: buildGoModule rec { pname = "browserpass"; version = "3.0.6"; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index bd9c1328d31c..843b9a57c8de 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, alsaLib, atk, cairo, cups, udev, hicolor-icon-theme -, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gtk3, gnome3 +{ stdenv, fetchurl, alsaLib, atk, cairo, cups, udev +, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gtk3 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook , runtimeShell, gsettings-desktop-schemas }: diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index ed1cda8030f2..e1a134ec5d18 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -2,7 +2,7 @@ , perl, libassuan, libgcrypt , perlPackages, lockfileProgs, gnupg, coreutils # For the tests: -, bash, openssh, which, socat, cpio, hexdump, procps, openssl +, openssh, which, socat, cpio, hexdump, procps, openssl }: let diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix index 0413234bad2a..ba3f821e88c6 100644 --- a/pkgs/tools/security/pass/extensions/genphrase.nix +++ b/pkgs/tools/security/pass/extensions/genphrase.nix @@ -1,4 +1,4 @@ -{ stdenv, pass, fetchFromGitHub }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "pass-genphrase-${version}"; diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix index 0f9502a7ac97..f8b110ce2213 100644 --- a/pkgs/tools/security/qesteidutil/default.nix +++ b/pkgs/tools/security/qesteidutil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , cmake, ccid, qttools, qttranslations , pkgconfig, pcsclite, hicolor-icon-theme }: diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index 4f4cbf4fb6f5..1091b366781d 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchgit, autoconf, automake, pkgconfig, help2man -, utillinux, openssl, libuuid, gnu-efi, libbfd +, openssl, libuuid, gnu-efi, libbfd }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 6a9bd05d820e..0e0e8c7ad753 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,5 +1,5 @@ { stdenv, python3Packages, fetchurl, makeWrapper -, coreutils, iptables, nettools, openssh, procps, fetchpatch }: +, coreutils, iptables, nettools, openssh, procps }: python3Packages.buildPythonApplication rec { name = "sshuttle-${version}"; diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index 3641472f2761..4d0feef72c9f 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook -, openssl, lib +, openssl , libcap, libpcap, libnfnetlink, libnetfilter_conntrack, libnetfilter_queue }: diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index ef4ae52ac590..1d4cb4f21854 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lib +{ stdenv, fetchurl, lib , cmocka, curl, pandoc, pkgconfig, openssl, tpm2-tss }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix index 0f13d2d3da1c..35a006505434 100644 --- a/pkgs/tools/system/journalbeat/default.nix +++ b/pkgs/tools/system/journalbeat/default.nix @@ -1,4 +1,4 @@ -{ lib, systemd, buildGoPackage, fetchFromGitHub, makeWrapper }: +{ lib, systemd, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "journalbeat-${version}"; diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 84860df979c6..36d28098b0be 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -4,7 +4,7 @@ , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy , openssl, file, doxygen -, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, fetchgit, fetchurl, libelfin +, gtest, fpm, zstd, rdkafka, rapidjson, fetchgit, fetchurl, libelfin , smartmontools, which, git, cscope, ctags, ssdeep }: diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index ff233e6ad94f..39db6c0273dd 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages }: +{ skawarePackages }: with skawarePackages; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 6c26855b9561..05d96afded14 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook +{ stdenv, fetchurl, autoreconfHook , IOKit ? null , ApplicationServices ? null }: let diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index 34e1c3b0ace4..561ee06136d8 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "2.2.6"; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index 8a60d52faab4..efe126fe042d 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ stdenv, python3Packages }: python3Packages.buildPythonApplication rec { pname = "FanFicFare"; diff --git a/pkgs/tools/text/mb2md/default.nix b/pkgs/tools/text/mb2md/default.nix index adaff3e2f436..ddc7f96ec26e 100644 --- a/pkgs/tools/text/mb2md/default.nix +++ b/pkgs/tools/text/mb2md/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, perlPackages }: +{ stdenv, fetchurl, makeWrapper, perlPackages }: let perlDeps = with perlPackages; [ TimeDate ]; diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index 8d659713d954..ade640dac7a9 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412 +{ stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412 , libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}: stdenv.mkDerivation { diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 4b7d19b790dc..03e4a5223b3a 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perlPackages, texlive }: +{ stdenv, perlPackages, texlive }: let biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs); diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index 590e5704b88d..2699a7a1f36b 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "rootlesskit-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dddd9041f274..c57e0a82b31c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -854,9 +854,7 @@ in ssh-agents = callPackage ../tools/networking/ssh-agents { }; - titaniumenv = callPackage ../development/mobile/titaniumenv { - pkgs_i686 = pkgsi686Linux; - }; + titaniumenv = callPackage ../development/mobile/titaniumenv { }; abootimg = callPackage ../development/mobile/abootimg {}; @@ -11140,7 +11138,7 @@ in libao = callPackage ../development/libraries/libao { usePulseAudio = config.pulseaudio or stdenv.isLinux; - inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit AudioToolbox; + inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; }; libaosd = callPackage ../development/libraries/libaosd { }; @@ -13118,7 +13116,6 @@ in simavr = callPackage ../development/tools/simavr { avrgcc = pkgsCross.avr.buildPackages.gcc; - avrbinutils = pkgsCross.avr.buildPackages.binutils; avrlibc = pkgsCross.avr.libcCross; inherit (darwin.apple_sdk.frameworks) GLUT; }; @@ -17016,7 +17013,6 @@ in libxkbcommon = libxkbcommon_7; }; bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { - inherit (gnome3) zenity; inherit (pkgs) bitwig-studio1; }; bitwig-studio = bitwig-studio2; @@ -17651,7 +17647,7 @@ in emacsPackagesNgFor = emacs: import ./emacs-packages.nix { inherit lib newScope stdenv; - inherit fetchFromGitHub fetchgit fetchhg fetchurl fetchpatch; + inherit fetchFromGitHub fetchurl; inherit emacs texinfo makeWrapper runCommand writeText; inherit (xorg) lndir; diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 17ded76a0649..7a5b4bdd1798 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -1,21 +1,11 @@ # This file defines the structure of the `config` nixpkgs option. -{ lib, config, ... }: +{ lib, ... }: with lib; let - mkMeta = args: mkOption (builtins.removeAttrs args [ "feature" ] // { - type = args.type or (types.uniq types.bool); - default = args.default or false; - description = args.description or '' - Whether to ${args.feature} while evaluating nixpkgs. - '' + '' - Changing the default will not cause any rebuilds. - ''; - }); - mkMassRebuild = args: mkOption (builtins.removeAttrs args [ "feature" ] // { type = args.type or (types.uniq types.bool); default = args.default or false; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index cc40f78875c8..725ea6db2dea 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -2,8 +2,7 @@ let mkCoqPackages' = self: coq: - let newScope = self.newScope; - callPackage = self.callPackage; in { + let callPackage = self.callPackage; in { inherit coq; coqPackages = self; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 1975f6aad43e..92be7db9ce55 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -32,7 +32,7 @@ # `meta` with `platforms` and `homepage` set to something you are # unlikely to want to override for most packages -{ lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, fetchpatch, runCommand, writeText +{ lib, newScope, stdenv, fetchurl, fetchFromGitHub, runCommand, writeText , emacs, texinfo, lndir, makeWrapper , trivialBuild @@ -46,7 +46,7 @@ with lib.licenses; let elpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix { - inherit fetchurl lib stdenv texinfo; + inherit lib stdenv texinfo; }; melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix { diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index a15982fe8b93..f1e2fde2e7e1 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,13 +5,12 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig +{ fetchurl, stdenv, lua, unzip, pkgconfig , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat -, glib, gobject-introspection, libevent, zlib, autoreconfHook, gnum4 +, autoreconfHook, gnum4 , mysql, postgresql, cyrus_sasl -, fetchFromGitHub, libmpack, which, fetchpatch, writeText +, fetchFromGitHub, which, writeText , pkgs -, fetchgit , lib }: diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 651cfa47e1a2..de6f97ce57e1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1,8 +1,6 @@ { lib, newScope, pkgs, config }: let - inherit (pkgs.stdenv.hostPlatform) system; - liftJaneStreet = self: super: super.janeStreet // super; mkOcamlPackages = ocaml: @@ -782,8 +780,8 @@ let janeStreet = import ../development/ocaml-modules/janestreet { inherit janePackage ocamlbuild angstrom ctypes cryptokit; inherit magic-mime num ocaml-migrate-parsetree octavius ounit; - inherit ppx_deriving re zarith ppxlib; - inherit (pkgs) stdenv openssl; + inherit ppx_deriving re ppxlib; + inherit (pkgs) openssl; }; janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 61801eee1581..2d5e9fe6514e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -139,9 +139,7 @@ in { setuptools = toPythonModule (callPackage ../development/python-modules/setuptools { }); - vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { - boost = pkgs.boost160; - }; + vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; acoustics = callPackage ../development/python-modules/acoustics { }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index bee6761c285b..476ad9de3e95 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -12,9 +12,8 @@ self: super: let inherit (super.stdenvAdapters) makeStaticBinaries - overrideInStdenv makeStaticLibraries; - inherit (super.lib) foldl optional flip id optionalAttrs composeExtensions; + inherit (super.lib) foldl optional flip id composeExtensions; inherit (super) makeSetupHook; # Best effort static binaries. Will still be linked to libSystem, From 2be7ccf2a34c68fa515f457fc5c1948ed35c368c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 16 Jun 2019 19:10:20 +0100 Subject: [PATCH 044/106] pythonPackages.hdbscan: fix build by applying upstream patch simple missing import in one of the test modules --- pkgs/development/python-modules/hdbscan/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index d20c43754fce..04cffbef78b0 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -6,6 +6,7 @@ , scipy , scikitlearn , fetchPypi +, fetchpatch }: buildPythonPackage rec { @@ -17,6 +18,15 @@ buildPythonPackage rec { sha256 = "263e9f34db63eec217d50f2ca3e65049c065775dc4095b5ee817824cd2b5b51b"; }; + patches = [ + # Fix Tests. Drop in release >0.8.20 + (fetchpatch { + name = "test-rsl-missing-import.patch"; + url = https://github.com/scikit-learn-contrib/hdbscan/commit/e40ccef139e56e38adf7bd6912cd63efd97598f9.patch; + sha256 = "0cfq4ja7j61h2zwd1jw5gagcz2sg18kjnx29sb0bwa13wfw6fip0"; + }) + ]; + checkInputs = [ nose ]; propagatedBuildInputs = [ cython numpy scipy scikitlearn ]; From fc78e57467601928b907c67e45888ead4d1a933a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 14:21:48 -0700 Subject: [PATCH 045/106] epiphany: 3.32.2 -> 3.32.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/epiphany/versions --- pkgs/desktops/gnome-3/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 641cfa5236fd..f4e87b50906b 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "epiphany-${version}"; - version = "3.32.2"; + version = "3.32.3"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1yhc8hpylj7i2i15nrbjldhi38xpz7pdwjdj7b358dxsxaghvrwa"; + sha256 = "0gx386k1p78ppjhvdanv99hfiwana0ccn9d499qrp0rvlicnijrw"; }; # Tests need an X display From e6a0514aaf563e4dd079cf82892237b95f54f0e6 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 16 Jun 2019 12:45:36 -0500 Subject: [PATCH 046/106] libfsm: init at 0.1pre1869_f70c3c5 Signed-off-by: Austin Seipp --- pkgs/development/libraries/libfsm/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/libraries/libfsm/default.nix diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/development/libraries/libfsm/default.nix new file mode 100644 index 000000000000..5491fab3edf2 --- /dev/null +++ b/pkgs/development/libraries/libfsm/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub +, bmake +}: + +stdenv.mkDerivation rec { + name = "libfsm-${version}"; + version = "0.1pre1869_${builtins.substring 0 7 src.rev}"; + + src = fetchFromGitHub { + owner = "katef"; + repo = "libfsm"; + rev = "f70c3c5778a79eeecb52f9fd35c7cbc241db0ed6"; + sha256 = "1hgv272jdv6dwnsdjajyky537z84q0cwzspw9br46qj51h8gkwvx"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ bmake ]; + enableParallelBuilding = true; + + # note: build checks value of '$CC' to add some extra cflags, but we don't + # necessarily know which 'stdenv' someone chose, so we leave it alone (e.g. + # if we use stdenv vs clangStdenv, we don't know which, and CC=cc in all + # cases.) it's unclear exactly what should be done if we want those flags, + # but the defaults work fine. + buildPhase = "PREFIX=$out bmake -r install"; + + # fix up multi-output install. we also have to fix the pkgconfig libdir + # file; it uses prefix=$out; libdir=${prefix}/lib, which is wrong in + # our case; libdir should really be set to the $lib output. + installPhase = '' + mkdir -p $lib $dev/lib + + mv $out/lib $lib/lib + mv $out/include $dev/include + mv $out/share/pkgconfig $dev/lib/pkgconfig + rmdir $out/share + + for x in libfsm.pc libre.pc; do + substituteInPlace "$dev/lib/pkgconfig/$x" \ + --replace 'libdir=''${prefix}/lib' "libdir=$lib/lib" + done + ''; + + outputs = [ "out" "lib" "dev" ]; + + meta = with stdenv.lib; { + description = "DFA regular expression library & friends"; + homepage = "https://github.com/katef/libfsm"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c57e0a82b31c..233b47bb3d23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4309,6 +4309,8 @@ in libfann = callPackage ../development/libraries/libfann { }; + libfsm = callPackage ../development/libraries/libfsm { }; + libgaminggear = callPackage ../development/libraries/libgaminggear { }; libhandy = callPackage ../development/libraries/libhandy { }; From 046d53c29ceb7fbf4a3180ce59f7f14a0a0b971c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 16 Jun 2019 23:56:55 +0200 Subject: [PATCH 047/106] eclipse-plugin-emacsplus: remove package Unfortunately the upstream source has disappeared and the package is no longer available anywhere. --- pkgs/applications/editors/eclipse/plugins.nix | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index b75324ee1ee6..08733d21f790 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -392,29 +392,6 @@ rec { }; }; - emacsplus = buildEclipsePlugin rec { - name = "emacsplus-${version}"; - version = "4.2.0"; - - srcFeature = fetchurl { - url = "http://www.mulgasoft.com/emacsplus/e4/update-site/features/com.mulgasoft.emacsplus.feature_${version}.jar"; - sha256 = "0wja3cd7gq8w25797fxnafvcncjnmlv8qkl5iwqj7zja2f45vka8"; - }; - - srcPlugin = fetchurl { - url = "http://www.mulgasoft.com/emacsplus/e4/update-site/plugins/com.mulgasoft.emacsplus_${version}.jar"; - sha256 = "08yw45nr90mlpdzim74vsvdaxj41sgpxcrqk5ia6l2dzvrqlsjs1"; - }; - - meta = with stdenv.lib; { - homepage = http://www.mulgasoft.com/emacsplus/; - description = "Provides a more Emacs-like experience in the Eclipse text editors"; - license = licenses.epl10; - platforms = platforms.all; - maintainers = [ maintainers.rycee ]; - }; - }; - findbugs = buildEclipsePlugin rec { name = "findbugs-${version}"; version = "3.0.1.20150306-5afe4d1"; From f71d8bd50005c1196f1ca785f5859393d7e4b172 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 16 Jun 2019 17:31:13 -0500 Subject: [PATCH 048/106] linux_testing: 5.2-rc4 -> 5.2-rc5 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 0db75d4fdace..e2e492b32e9b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "5.2-rc4"; - modDirVersion = "5.2.0-rc4"; + version = "5.2-rc5"; + modDirVersion = "5.2.0-rc5"; extraMeta.branch = "5.2"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0j5vvmbndmjyal3sd98a9lr0x6lxarbz46rgp197f6sf628gxahq"; + sha256 = "0av5kfwa0s2vip7bzrzgslyaww1z22zwyvl7jcfjfsaqfxdyyya0"; }; # Should the testing kernels ever be built on Hydra? From 38fa7639a353a89159fbdea54c8243977032e0ac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 15:43:12 -0700 Subject: [PATCH 049/106] flrig: 1.3.44 -> 1.3.45 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/flrig/versions --- pkgs/applications/radio/flrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index 7489cc53109e..2b4a679accab 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.44"; + version = "1.3.45"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "0y05qhjmqydh0lripb44jjkcchxzr8bfn1r2k3m48wb4aij607yj"; + sha256 = "14rnyqwlk35j2027l7hxfig6v7j7302w4vsvx0l33b782i8phs2v"; }; buildInputs = [ From d852492c1882ab3e594415d25acf66c766590f7b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 15:56:10 -0700 Subject: [PATCH 050/106] spleen: 1.0.4 -> 1.0.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/spleen/versions --- pkgs/data/fonts/spleen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index ed1e1e52e980..873528b8bde1 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,7 +2,7 @@ let pname = "spleen"; - version = "1.0.4"; + version = "1.0.5"; in fetchurl rec { name = "${pname}-${version}"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; @@ -17,7 +17,7 @@ in fetchurl rec { install -Dm644 *.bdf -t $d install -m644 fonts.alias-spleen $d/fonts.alias ''; - sha256 = "0jab55h08gy7gpyxqfrfj30iinmknpllh3dp5g7ck5q3qfgdzh7m"; + sha256 = "0144a0lkkl5qx0a8sapymcayj5lp5cs9nfgpbmg3427n41pkqfbb"; meta = with lib; { description = "Monospaced bitmap fonts"; From b2a78de0c04d18dd1fe9ea86ad55c5f3ab1c7b75 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 16:20:10 -0700 Subject: [PATCH 051/106] fwts: 19.05.00 -> 19.06.00 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fwts/versions --- pkgs/os-specific/linux/fwts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 7f31ac1dac07..7c4bd77fae07 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fwts-${version}"; - version = "19.05.00"; + version = "19.06.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "0hhwp25a7lknzmbbm067nxlzgyb3p7gh119jra2gdkm6d3p2gc47"; + sha256 = "1aza6j323a908vlz3vkn0hda0jm34njg81aak1g4pqvmzhrg47ls"; stripRoot = false; }; From ab5f07960a26d0062ab03d6c1a5c5b1eb0f958c9 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Mon, 17 Jun 2019 09:02:26 +0900 Subject: [PATCH 052/106] gauche: 0.9.7 -> 0.9.8 --- pkgs/development/interpreters/gauche/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index bb3294e2097b..a0d20b7ebe4f 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gauche-${version}"; - version = "0.9.7"; + version = "0.9.8"; src = fetchurl { url = "mirror://sourceforge/gauche/Gauche-${version}.tgz"; - sha256 = "181nycikma0rwrb1h6mi3kys11f8628pq8g5r3fg5hiz5sabscrd"; + sha256 = "0jxp1ladpy8kvfvk561c64spf1c3d6giqla6zscqkd6qa480vcry"; }; nativeBuildInputs = [ pkgconfig texinfo ]; From 348489c685d411e758f8c86ed35df350befb96ab Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 16 Jun 2019 19:19:49 -0500 Subject: [PATCH 053/106] foundationdb61: 6.1.8 -> 6.1.10 Signed-off-by: Austin Seipp --- pkgs/servers/foundationdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index ec28986f2e20..b29c5298b77d 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -69,9 +69,9 @@ in with builtins; { # ------------------------------------------------------ foundationdb61 = cmakeBuild rec { - version = "6.1.8"; + version = "6.1.10"; branch = "release-6.1"; - sha256 = "1qd9yf3a7a99nfx7vky0jy8r74yrxjwp9imc6792awn66256pxiv"; + sha256 = "1v278zlrki3da2i2258j2b4rk4fq6d9bj623z01bjrvmaqxc2gry"; patches = [ ./patches/clang-libcxx.patch From b62a696625ad288d6f8b09c795d333613e712a3b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 18:44:38 -0700 Subject: [PATCH 054/106] gzdoom: 4.1.2 -> 4.1.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gzdoom/versions --- pkgs/games/gzdoom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index ada78297c7dc..ed24f44356ae 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "4.1.2"; + version = "4.1.3"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "1ix5n8hvvxfchfggfr05k4f53smfmn4l806j8hpv12h57rqvvrxw"; + sha256 = "07mkh50gnprrq11kifibvf5yq1hgcqkj7nzprl5kjgjwwlwd76x6"; }; nativeBuildInputs = [ cmake makeWrapper ]; From 239de521989135e69c9fe13f857b2faf95e8c055 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 16 Jun 2019 22:02:03 -0500 Subject: [PATCH 055/106] tflint: init at 0.8.3 (#63012) --- .../tools/analysis/tflint/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/analysis/tflint/default.nix diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix new file mode 100644 index 000000000000..7c320c3ea03e --- /dev/null +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "tflint"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "wata727"; + repo = pname; + rev = "v${version}"; + sha256 = "0kqlwncsxssi1jchmrg1wmv7dknp0shx33j7kkryy12wdxxcbwyb"; + }; + + modSha256 = "1j5hjr4l4ivvhrywk286zczsn9balaaq5l5qx4ga4v0llwspmygm"; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Terraform linter focused on possible errors, best practices, and so on"; + homepage = "https://github.com/wata727/tflint"; + license = licenses.mpl20; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 233b47bb3d23..fecf53c3f4d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9716,6 +9716,8 @@ in texi2mdoc = callPackage ../tools/misc/texi2mdoc { }; + tflint = callPackage ../development/tools/analysis/tflint { }; + todoist = callPackage ../applications/misc/todoist { }; todolist = callPackage ../applications/misc/todolist { }; From 71f8f6a02b02272cb430c7ab8e4507d29a2ca96f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 20:06:35 -0700 Subject: [PATCH 056/106] helmfile: 0.73.0 -> 0.77.0 (#63266) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/helmfile/versions --- pkgs/applications/networking/cluster/helmfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index cc87aaa5e384..6c5c281d0395 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.73.0"; in +let version = "0.77.0"; in buildGoModule { pname = "helmfile"; @@ -10,7 +10,7 @@ buildGoModule { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0mg88mqdmfvg10iips6xz4pw82w88pyf3b73g9kwzlv9v9vhgdzd"; + sha256 = "0nj8gs7aqkxpj6bd80ks7g34qqa4y53a8sim1znbxs6mb678c2x2"; }; goPackagePath = "github.com/roboll/helmfile"; From c23a98f5d47b20bc4b9796bc3484aebb49418f28 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 20:58:57 -0700 Subject: [PATCH 057/106] jackett: 0.11.384 -> 0.11.420 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jackett/versions --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index decee0b7dc97..f8c708f81a92 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.11.384"; + version = "0.11.420"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1bdp7nmyk83m2c7i9nhzzdrmjk9z3lb50lwbm7gfc86h7m4kyh7x"; + sha256 = "12mskqmgvfy6m10x6chxpl30pv1prsq21rxdlmd4pgd6shkfz9gn"; }; buildInputs = [ makeWrapper ]; From c833e6b931ddbc6ff7b364c759c6bff8fed60422 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 22:35:20 -0700 Subject: [PATCH 058/106] josm: 15031 -> 15155 (#63278) --- pkgs/applications/misc/josm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index bfc4ac796154..4f7acb7731ab 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "15031"; + version = "15155"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "19qw1s5v0dha329a7rfnhby0rq5d109b3f1ln2w1dfkmirbl75ir"; + sha256 = "0qws5bgv7mm1iynsdrn7cdi16rd8k4139iia3bnjpm04xn69i5im"; }; buildInputs = [ jdk11 makeWrapper ]; From 73d0b53ff273de22db75e4cb0465a622b0ab75d8 Mon Sep 17 00:00:00 2001 From: Daniel Vianna Date: Wed, 12 Jun 2019 10:18:47 +1000 Subject: [PATCH 059/106] pythonPackages.pytest-testmon: init at 0.9.16 Co-Authored-By: worldofpeace --- .../python-modules/pytest-testmon/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-testmon/default.nix diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix new file mode 100644 index 000000000000..1a4cc260ff44 --- /dev/null +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, coverage +, pytest +}: + +buildPythonPackage rec { + pname = "pytest-testmon"; + version = "0.9.16"; + + src = fetchPypi { + inherit pname version; + sha256 = "df00594e55f8f8f826e0e345dc23863ebac066eb749f8229c515a0373669c5bb"; + }; + + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ coverage ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest test + ''; + + meta = with lib; { + homepage = "https://github.com/tarpas/pytest-testmon/"; + description = "This is a py.test plug-in which automatically selects and re-executes only tests affected by recent changes"; + license = licenses.mit; + maintainers = [ maintainers.dmvianna ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d5e9fe6514e..ec9982ac0773 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -821,6 +821,8 @@ in { pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; + pytest-testmon = callPackage ../development/python-modules/pytest-testmon { }; + pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; python-binance = callPackage ../development/python-modules/python-binance { }; From d72887e0d28a98cc6435bde1962e2b414224e717 Mon Sep 17 00:00:00 2001 From: Daniel Vianna Date: Wed, 12 Jun 2019 11:56:42 +1000 Subject: [PATCH 060/106] pythonPackages.pytest-watch: init at 4.2.0 Co-Authored-By: worldofpeace --- .../python-modules/pytest-watch/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-watch/default.nix diff --git a/pkgs/development/python-modules/pytest-watch/default.nix b/pkgs/development/python-modules/pytest-watch/default.nix new file mode 100644 index 000000000000..12b06c2e1b63 --- /dev/null +++ b/pkgs/development/python-modules/pytest-watch/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, docopt +, colorama +, pytest +, watchdog +}: + +buildPythonPackage rec { + pname = "pytest-watch"; + version = "4.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "06136f03d5b361718b8d0d234042f7b2f203910d8568f63df2f866b547b3d4b9"; + }; + + # No Tests + doCheck = false; + + propagatedBuildInputs = [ pytest colorama docopt watchdog ]; + + meta = with lib; { + homepage = "https://github.com/joeyespo/pytest-watch"; + description = "Local continuous test runner with pytest and watchdog"; + license = licenses.mit; + maintainers = with maintainers; [ dmvianna ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec9982ac0773..8d9cfbbccdaa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1745,6 +1745,8 @@ in { pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; + pytest-watch = callPackage ../development/python-modules/pytest-watch { }; + pytestpep8 = callPackage ../development/python-modules/pytest-pep8 { }; pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; From 9e76c00b1b701020b1de38338f42c60a901e6c47 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 22:58:12 -0700 Subject: [PATCH 061/106] liblouis: 3.9.0 -> 3.10.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/liblouis/versions --- pkgs/development/libraries/liblouis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index a3af7aab526d..c2731e44efbc 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -3,7 +3,7 @@ }: let - version = "3.9.0"; + version = "3.10.0"; in stdenv.mkDerivation rec { name = "liblouis-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "11vq9rnmrfqka3fiyrxs0q1gpvpj4m9jmrkwd1yvrq94fndgvh1m"; + sha256 = "1wimv2wfl566jp8hhrxr91dmx20hldqzj70dar8i9k3hzq1kmb4q"; }; outputs = [ "out" "dev" "man" "info" "doc" ]; From b00a5f55576536dbc7563fa20ebe3cfbea8c865b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Jun 2019 11:49:37 +0000 Subject: [PATCH 062/106] ocamlPackages.mlgmpidl: 1.2.8 -> 1.2.10 --- pkgs/development/ocaml-modules/mlgmpidl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix index 1a46c1e939b6..d25a5f4ce06c 100644 --- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-mlgmpidl-${version}"; - version = "1.2.8"; + version = "1.2.10"; src = fetchFromGitHub { owner = "nberth"; repo = "mlgmpidl"; rev = version; - sha256 = "1csqplyxi5gq6ma7g4la2x20mhz1plmjallsankv0mn0x69zb1id"; + sha256 = "181vpqx8zdairq645b8qpkzj4fnkb508iavk7sqzskag1s8613qn"; }; buildInputs = [ perl gmp mpfr ocaml findlib camlidl ]; From e8d79a52a99abedf48ac27dfc2682761fe4b31c9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 00:24:21 -0700 Subject: [PATCH 063/106] lttng-ust: 2.10.3 -> 2.10.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lttng-ust/versions --- pkgs/development/tools/misc/lttng-ust/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 27c8f609d5d6..adc4bbd5c39a 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "lttng-ust-${version}"; - version = "2.10.3"; + version = "2.10.4"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; - sha256 = "0aw580xx6x9hgbxrzil7yqv12j8yvi5d9iibldx3z5jz1pwj114y"; + sha256 = "0rx9q5r9qcdx3i9i0rx28p33yl52sd6f35qj7qs4li2w42xv9mbm"; }; buildInputs = [ python ]; From da916b5b96d50f06f3491dc4ca659516dee723be Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 02:49:41 -0700 Subject: [PATCH 064/106] notes-up: 2.0.1 -> 2.0.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/notes-up/versions --- pkgs/applications/office/notes-up/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index b27b77e6e6d7..f8729583ddce 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "notes-up"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "Philip-Scott"; repo = "Notes-up"; rev = version; - sha256 = "14vnnr18v374daz8ag5gc2sqr3jxbwrj11mmfz8l57xi2mwhn53z"; + sha256 = "0bklgp8qrrj9y5m77xqbpy1ld2d9ya3rlxklgzx3alffq5312i4s"; }; nativeBuildInputs = [ From 11cb382a4c095656463117390baf5b03e029d8a2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 17 Jun 2019 12:01:51 +0200 Subject: [PATCH 065/106] nixos/doc: Fix spurious indentation --- doc/languages-frameworks/java.xml | 2 +- nixos/doc/manual/configuration/matrix.xml | 190 +++++++++--------- nixos/doc/manual/configuration/modularity.xml | 18 +- nixos/doc/manual/configuration/profiles.xml | 2 +- nixos/doc/manual/configuration/user-mgmt.xml | 2 +- nixos/doc/manual/configuration/xfce.xml | 10 +- .../development/writing-nixos-tests.xml | 14 +- .../manual/installation/changing-config.xml | 23 ++- .../installing-from-other-distro.xml | 45 +++-- nixos/doc/manual/installation/installing.xml | 4 +- nixos/doc/manual/release-notes/rl-1703.xml | 16 +- nixos/modules/services/desktops/flatpak.xml | 22 +- .../monitoring/prometheus/exporters.xml | 110 +++++----- .../services/network-filesystems/samba.nix | 8 +- .../services/networking/dnscrypt-proxy.xml | 8 +- .../modules/services/networking/smokeping.nix | 22 +- .../modules/services/web-apps/matomo-doc.xml | 22 +- 17 files changed, 262 insertions(+), 256 deletions(-) diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml index 667a795a8d3a..287f63e685c4 100644 --- a/doc/languages-frameworks/java.xml +++ b/doc/languages-frameworks/java.xml @@ -68,7 +68,7 @@ installPhase = can be done in a generic fashion with the --set argument of makeWrapper: - --set JAVA_HOME ${jdk.home} +--set JAVA_HOME ${jdk.home} diff --git a/nixos/doc/manual/configuration/matrix.xml b/nixos/doc/manual/configuration/matrix.xml index 66965460a15d..e43b70faf7ac 100644 --- a/nixos/doc/manual/configuration/matrix.xml +++ b/nixos/doc/manual/configuration/matrix.xml @@ -33,91 +33,91 @@ installation instructions of Synapse . +let + fqdn = let - fqdn = - let - join = hostName: domain: hostName + optionalString (domain != null) ".${domain}"; - in join config.networking.hostName config.networking.domain; - in { - networking = { - hostName = "myhostname"; - domain = "example.org"; - }; - networking.firewall.allowedTCPPorts = [ 80 443 ]; + join = hostName: domain: hostName + optionalString (domain != null) ".${domain}"; + in join config.networking.hostName config.networking.domain; +in { + networking = { + hostName = "myhostname"; + domain = "example.org"; + }; + networking.firewall.allowedTCPPorts = [ 80 443 ]; - services.nginx = { - enable = true; - # only recommendedProxySettings and recommendedGzipSettings are strictly required, - # but the rest make sense as well - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - recommendedProxySettings = true; + services.nginx = { + enable = true; + # only recommendedProxySettings and recommendedGzipSettings are strictly required, + # but the rest make sense as well + recommendedTlsSettings = true; + recommendedOptimisation = true; + recommendedGzipSettings = true; + recommendedProxySettings = true; - virtualHosts = { - # This host section can be placed on a different host than the rest, - # i.e. to delegate from the host being accessible as ${config.networking.domain} - # to another host actually running the Matrix homeserver. - "${config.networking.domain}" = { - locations."= /.well-known/matrix/server".extraConfig = - let - # use 443 instead of the default 8448 port to unite - # the client-server and server-server port for simplicity - server = { "m.server" = "${fqdn}:443"; }; - in '' - add_header Content-Type application/json; - return 200 '${builtins.toJSON server}'; - ''; - locations."= /.well-known/matrix/client".extraConfig = - let - client = { - "m.homeserver" = { "base_url" = "https://${fqdn}"; }; - "m.identity_server" = { "base_url" = "https://vector.im"; }; - }; - # ACAO required to allow riot-web on any URL to request this json file - in '' - add_header Content-Type application/json; - add_header Access-Control-Allow-Origin *; - return 200 '${builtins.toJSON client}'; - ''; - }; - - # Reverse proxy for Matrix client-server and server-server communication - ${fqdn} = { - enableACME = true; - forceSSL = true; - - # Or do a redirect instead of the 404, or whatever is appropriate for you. - # But do not put a Matrix Web client here! See the Riot Web section below. - locations."/".extraConfig = '' - return 404; - ''; - - # forward all Matrix API calls to the synapse Matrix homeserver - locations."/_matrix" = { - proxyPass = "http://[::1]:8008"; + virtualHosts = { + # This host section can be placed on a different host than the rest, + # i.e. to delegate from the host being accessible as ${config.networking.domain} + # to another host actually running the Matrix homeserver. + "${config.networking.domain}" = { + locations."= /.well-known/matrix/server".extraConfig = + let + # use 443 instead of the default 8448 port to unite + # the client-server and server-server port for simplicity + server = { "m.server" = "${fqdn}:443"; }; + in '' + add_header Content-Type application/json; + return 200 '${builtins.toJSON server}'; + ''; + locations."= /.well-known/matrix/client".extraConfig = + let + client = { + "m.homeserver" = { "base_url" = "https://${fqdn}"; }; + "m.identity_server" = { "base_url" = "https://vector.im"; }; }; - }; + # ACAO required to allow riot-web on any URL to request this json file + in '' + add_header Content-Type application/json; + add_header Access-Control-Allow-Origin *; + return 200 '${builtins.toJSON client}'; + ''; + }; + + # Reverse proxy for Matrix client-server and server-server communication + ${fqdn} = { + enableACME = true; + forceSSL = true; + + # Or do a redirect instead of the 404, or whatever is appropriate for you. + # But do not put a Matrix Web client here! See the Riot Web section below. + locations."/".extraConfig = '' + return 404; + ''; + + # forward all Matrix API calls to the synapse Matrix homeserver + locations."/_matrix" = { + proxyPass = "http://[::1]:8008"; }; }; - services.matrix-synapse = { - enable = true; - server_name = config.networking.domain; - listeners = [ - { - port = 8008; - bind_address = "::1"; - type = "http"; - tls = false; - x_forwarded = true; - resources = [ - { names = [ "client" "federation" ]; compress = false; } - ]; - } - ]; - }; }; - + }; + services.matrix-synapse = { + enable = true; + server_name = config.networking.domain; + listeners = [ + { + port = 8008; + bind_address = "::1"; + type = "http"; + tls = false; + x_forwarded = true; + resources = [ + { names = [ "client" "federation" ]; compress = false; } + ]; + } + ]; + }; +}; + @@ -142,14 +142,14 @@ create a new user or admin, run the following after you have set the secret and have rebuilt NixOS: - $ nix run nixpkgs.matrix-synapse - $ register_new_matrix_user -k <your-registration-shared-secret> http://localhost:8008 - New user localpart: <your-username> - Password: - Confirm password: - Make admin [no]: - Success! - +$ nix run nixpkgs.matrix-synapse +$ register_new_matrix_user -k <your-registration-shared-secret> http://localhost:8008 +New user localpart: <your-username> +Password: +Confirm password: +Make admin [no]: +Success! + In the example, this would create a user with the Matrix Identifier @your-username:example.org. Note that the registration secret ends up in the nix store and therefore is world-readable by any user @@ -177,16 +177,16 @@ Matrix Now! for a list of existing clients and their supported featureset. - services.nginx.virtualHosts."riot.${fqdn}" = { - enableACME = true; - forceSSL = true; - serverAliases = [ - "riot.${config.networking.domain}" - ]; +services.nginx.virtualHosts."riot.${fqdn}" = { + enableACME = true; + forceSSL = true; + serverAliases = [ + "riot.${config.networking.domain}" + ]; - root = pkgs.riot-web; - }; - + root = pkgs.riot-web; +}; + diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index 724abd31ca4e..67bb5a47d729 100644 --- a/nixos/doc/manual/configuration/modularity.xml +++ b/nixos/doc/manual/configuration/modularity.xml @@ -129,17 +129,17 @@ nix-repl> map (x: x.hostName) config. +{ imports = [ (netConfig "nixos.localdomain") ]; } + diff --git a/nixos/doc/manual/configuration/profiles.xml b/nixos/doc/manual/configuration/profiles.xml index c0a8f55785fc..9d08f7f7bed2 100644 --- a/nixos/doc/manual/configuration/profiles.xml +++ b/nixos/doc/manual/configuration/profiles.xml @@ -16,7 +16,7 @@ imports = [ <nixpkgs/nixos/modules/profiles/profile-name.nix> ]; - + Even if some of these profiles seem only useful in the context of install media, many are actually intended to be used in real installs. diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index 66c1c6eb3a11..4b1710f3a2b1 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -44,7 +44,7 @@ A user ID (uid) is assigned automatically. You can also specify a uid manually by adding - uid = 1000; +uid = 1000; to the user specification. diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index 77d5d9632792..f2967fa3b10a 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -11,7 +11,7 @@ xfce.enable = true; default = "xfce"; }; - + Optionally, compton can be enabled for nice graphical @@ -24,7 +24,7 @@ shadow = true; fadeDelta = 4; }; - + Some Xfce programs are not installed automatically. To install them manually @@ -37,7 +37,7 @@ To enable Thunar volume support, put = true; - + into your configuration.nix. @@ -58,14 +58,14 @@ on start (look at journalctl --user -b). Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported - + This is caused by some needed GNOME services not running. This is all fixed by enabling "Launch GNOME services on startup" in the Advanced tab of the Session and Startup settings panel. Alternatively, you can run this command to do the same thing. $ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true - + A log-out and re-log will be needed for this to take effect. diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 4a2615c9407b..6be2d0a4d231 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -397,9 +397,9 @@ startAll; - $machine->systemctl("list-jobs --no-pager"); // runs `systemctl list-jobs --no-pager` - $machine->systemctl("list-jobs --no-pager", "any-user"); // spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` - +$machine->systemctl("list-jobs --no-pager"); // runs `systemctl list-jobs --no-pager` +$machine->systemctl("list-jobs --no-pager", "any-user"); // spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` + @@ -410,10 +410,10 @@ startAll; To test user units declared by systemd.user.services the optional $user argument can be used: - $machine->start; - $machine->waitForX; - $machine->waitForUnit("xautolock.service", "x-session-user"); - +$machine->start; +$machine->waitForX; +$machine->waitForUnit("xautolock.service", "x-session-user"); + This applies to systemctl, getUnitInfo, waitForUnit, startJob and stopJob. diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index 1a116ec0b655..b77d71389a9d 100644 --- a/nixos/doc/manual/installation/changing-config.xml +++ b/nixos/doc/manual/installation/changing-config.xml @@ -9,7 +9,8 @@ changed something in that file, you should do -# nixos-rebuild switch +# nixos-rebuild switch + to build the new configuration, make it the default configuration for booting, and try to realise the configuration in the running system (e.g., by restarting system services). @@ -23,7 +24,8 @@ You can also do -# nixos-rebuild test +# nixos-rebuild test + to build the configuration and switch the running system to it, but without making it the boot default. So if (say) the configuration locks up your machine, you can just reboot to get back to a working configuration. @@ -31,7 +33,8 @@ There is also -# nixos-rebuild boot +# nixos-rebuild boot + to build the configuration and make it the boot default, but not switch to it now (so it will only take effect after the next reboot). @@ -39,7 +42,8 @@ You can make your configuration show up in a different submenu of the GRUB 2 boot screen by giving it a different profile name, e.g. -# nixos-rebuild switch -p test +# nixos-rebuild switch -p test + which causes the new configuration (and previous ones created using -p test) to show up in the GRUB submenu “NixOS - Profile 'test'”. This can be useful to separate test configurations from @@ -48,7 +52,8 @@ Finally, you can do -$ nixos-rebuild build +$ nixos-rebuild build + to build the configuration but nothing more. This is useful to see whether everything compiles cleanly. @@ -58,8 +63,8 @@ $ nixos-rebuild build virtual machine that contains the desired configuration. Just do -$ nixos-rebuild build-vm -$ ./result/bin/run-*-vm +$ nixos-rebuild build-vm +$ ./result/bin/run-*-vm The VM does not have any data from your host system, so your existing user accounts and home directories will not be available unless you have set @@ -74,12 +79,12 @@ $ ./result/bin/run-*-vm guest. For instance, the following will forward host port 2222 to guest port 22 (SSH): -$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm +$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm allowing you to log in via SSH (assuming you have set the appropriate passwords or SSH authorized keys): -$ ssh -p 2222 localhost +$ ssh -p 2222 localhost diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index d1e49a2a1597..8ed45899fd7f 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -47,8 +47,8 @@ Short version: -$ curl https://nixos.org/nix/install | sh -$ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell +$ curl https://nixos.org/nix/install | sh +$ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell More details in the the nixpkgs channel by default. -$ nix-channel --list +$ nix-channel --list nixpkgs https://nixos.org/channels/nixpkgs-unstable As that channel gets released without running the NixOS tests, it will be safer to use the nixos-* channels instead: -$ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs +$ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs You may want to throw in a nix-channel --update for good measure. @@ -89,7 +89,7 @@ $ nix-channel --add https://nixos.org/channels/nixos-version -$ nix-env -iE "_: with import <nixpkgs/nixos> { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]" +$ nix-env -iE "_: with import <nixpkgs/nixos> { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]" @@ -116,7 +116,7 @@ $ nix-channel --add https://nixos.org/channels/nixos-version Generate your NixOS configuration: -$ sudo `which nixos-generate-config` --root /mnt +$ sudo `which nixos-generate-config` --root /mnt You'll probably want to edit the configuration files. Refer to the nixos-generate-config step in @@ -148,8 +148,8 @@ $ nix-channel --add https://nixos.org/channels/nixos-version -$ sudo groupadd -g 30000 nixbld -$ sudo useradd -u 30000 -g nixbld -G nixbld nixbld +$ sudo groupadd -g 30000 nixbld +$ sudo useradd -u 30000 -g nixbld -G nixbld nixbld @@ -161,7 +161,7 @@ $ sudo useradd -u 30000 -g nixbld -G nixbld nixbld existing systems without the help of a rescue USB drive or similar. -$ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt +$ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt Again, please refer to the nixos-install step in for more information. @@ -175,8 +175,8 @@ $ sudo useradd -u 30000 -g nixbld -G nixbld nixbld Optionally, you may want to clean up your non-NixOS distribution: -$ sudo userdel nixbld -$ sudo groupdel nixbld +$ sudo userdel nixbld +$ sudo groupdel nixbld If you do not wish to keep the Nix package manager installed either, run something like sudo rm -rv ~/.nix-* /nix and remove the @@ -193,7 +193,7 @@ $ sudo groupdel nixbld Generate your NixOS configuration: -$ sudo `which nixos-generate-config` --root / +$ sudo `which nixos-generate-config` --root / Note that this will place the generated configuration files in /etc/nixos. You'll probably want to edit the @@ -212,21 +212,21 @@ $ sudo groupdel nixbld users.users.root.initialHashedPassword = ""; - + Build the NixOS closure and install it in the system profile: -$ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system +$ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system Change ownership of the /nix tree to root (since your Nix install was probably single user): -$ sudo chown -R 0.0 /nix +$ sudo chown -R 0.0 /nix @@ -284,16 +284,16 @@ $ sudo groupdel nixbld Let's create the files: -$ sudo touch /etc/NIXOS -$ sudo touch /etc/NIXOS_LUSTRATE - +$ sudo touch /etc/NIXOS +$ sudo touch /etc/NIXOS_LUSTRATE + Let's also make sure the NixOS configuration files are kept once we reboot on NixOS: -$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE - +$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE + @@ -312,8 +312,9 @@ $ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE -$ sudo mv -v /boot /boot.bak && - sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot +$ sudo mv -v /boot /boot.bak && +sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot + Cross your fingers, reboot, hopefully you should get a NixOS prompt! diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 9687c21a01e6..cc5420794aff 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -525,7 +525,7 @@ $ nix-env -i w3m NixOS Configuration - + { config, pkgs, ... }: { imports = [ # Include the results of the hardware scan. @@ -543,7 +543,7 @@ $ nix-env -i w3m # Enable the OpenSSH server. services.sshd.enable = true; } - +
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 6ca79e2bc00d..86f4a1ccfb78 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -626,17 +626,17 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install"> overlays. For example, the following code: - let - pkgs = import <nixpkgs> {}; - in - pkgs.overridePackages (self: super: ...) +let + pkgs = import <nixpkgs> {}; +in + pkgs.overridePackages (self: super: ...) should be replaced by: - let - pkgs = import <nixpkgs> {}; - in - import pkgs.path { overlays = [(self: super: ...)]; } +let + pkgs = import <nixpkgs> {}; +in + import pkgs.path { overlays = [(self: super: ...)]; } diff --git a/nixos/modules/services/desktops/flatpak.xml b/nixos/modules/services/desktops/flatpak.xml index 8045d5fa14f8..fb27bd1f62b2 100644 --- a/nixos/modules/services/desktops/flatpak.xml +++ b/nixos/modules/services/desktops/flatpak.xml @@ -21,7 +21,7 @@ configuration.nix: = true; - + For the sandboxed apps to work correctly, desktop integration portals need to @@ -30,27 +30,27 @@ configuration.nix: = [ pkgs.xdg-desktop-portal-gtk ]; - + Then, you will need to add a repository, for example, Flathub, either using the following commands: - - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak update - + +$ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo +$ flatpak update + or by opening the repository file in GNOME Software. Finally, you can search and install programs: - - flatpak search bustle - flatpak install flathub org.freedesktop.Bustle - flatpak run org.freedesktop.Bustle - + +$ flatpak search bustle +$ flatpak install flathub org.freedesktop.Bustle +$ flatpak run org.freedesktop.Bustle + Again, GNOME Software offers graphical interface for these tasks. diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixos/modules/services/monitoring/prometheus/exporters.xml index 7a0a1bdf2c14..81ac998729be 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.xml +++ b/nixos/modules/services/monitoring/prometheus/exporters.xml @@ -112,65 +112,65 @@ directory, which will be called postfix.nix and contains all exporter specific options and configuration: - # nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix - { config, lib, pkgs }: +# nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix +{ config, lib, pkgs }: - with lib; +with lib; - let - # for convenience we define cfg here - cfg = config.services.prometheus.exporters.postfix; - in - { - port = 9154; # The postfix exporter listens on this port by default +let + # for convenience we define cfg here + cfg = config.services.prometheus.exporters.postfix; +in +{ + port = 9154; # The postfix exporter listens on this port by default - # `extraOpts` is an attribute set which contains additional options - # (and optional overrides for default options). - # Note that this attribute is optional. - extraOpts = { - telemetryPath = mkOption { - type = types.str; - default = "/metrics"; - description = '' - Path under which to expose metrics. - ''; - }; - logfilePath = mkOption { - type = types.path; - default = /var/log/postfix_exporter_input.log; - example = /var/log/mail.log; - description = '' - Path where Postfix writes log entries. - This file will be truncated by this exporter! - ''; - }; - showqPath = mkOption { - type = types.path; - default = /var/spool/postfix/public/showq; - example = /var/lib/postfix/queue/public/showq; - description = '' - Path at which Postfix places its showq socket. - ''; - }; - }; + # `extraOpts` is an attribute set which contains additional options + # (and optional overrides for default options). + # Note that this attribute is optional. + extraOpts = { + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = '' + Path under which to expose metrics. + ''; + }; + logfilePath = mkOption { + type = types.path; + default = /var/log/postfix_exporter_input.log; + example = /var/log/mail.log; + description = '' + Path where Postfix writes log entries. + This file will be truncated by this exporter! + ''; + }; + showqPath = mkOption { + type = types.path; + default = /var/spool/postfix/public/showq; + example = /var/lib/postfix/queue/public/showq; + description = '' + Path at which Postfix places its showq socket. + ''; + }; + }; - # `serviceOpts` is an attribute set which contains configuration - # for the exporter's systemd service. One of - # `serviceOpts.script` and `serviceOpts.serviceConfig.ExecStart` - # has to be specified here. This will be merged with the default - # service confiuration. - serviceOpts = { - serviceConfig = { - ExecStart = '' - ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \ - --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - --web.telemetry-path ${cfg.telemetryPath} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - }; - }; - } - + # `serviceOpts` is an attribute set which contains configuration + # for the exporter's systemd service. One of + # `serviceOpts.script` and `serviceOpts.serviceConfig.ExecStart` + # has to be specified here. This will be merged with the default + # service confiuration. + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} + diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 10dc58311212..69368441c62c 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -86,10 +86,10 @@ in If you use the firewall consider adding the following: - - networking.firewall.allowedTCPPorts = [ 139 445 ]; - networking.firewall.allowedUDPPorts = [ 137 138 ]; - + + networking.firewall.allowedTCPPorts = [ 139 445 ]; + networking.firewall.allowedUDPPorts = [ 137 138 ]; + ''; }; diff --git a/nixos/modules/services/networking/dnscrypt-proxy.xml b/nixos/modules/services/networking/dnscrypt-proxy.xml index f90eef69848c..afc7880392a1 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.xml +++ b/nixos/modules/services/networking/dnscrypt-proxy.xml @@ -18,7 +18,7 @@ To enable the client proxy, set = true; - + @@ -36,7 +36,7 @@ the other client to it: = 43; - + @@ -47,7 +47,7 @@ = true; = [ "127.0.0.1#43" ]; } - + @@ -59,7 +59,7 @@ = true; = [ "127.0.0.1@43" ]; } - + diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index fab3ed5bb39d..c41d0edaf17f 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -101,17 +101,17 @@ in ''; example = literalExample '' # near constant pings. - step = 30 - pings = 20 - # consfn mrhb steps total - AVERAGE 0.5 1 10080 - AVERAGE 0.5 12 43200 - MIN 0.5 12 43200 - MAX 0.5 12 43200 - AVERAGE 0.5 144 7200 - MAX 0.5 144 7200 - MIN 0.5 144 7200 - ''; + step = 30 + pings = 20 + # consfn mrhb steps total + AVERAGE 0.5 1 10080 + AVERAGE 0.5 12 43200 + MIN 0.5 12 43200 + MAX 0.5 12 43200 + AVERAGE 0.5 144 7200 + MAX 0.5 144 7200 + MIN 0.5 144 7200 + ''; description = ''Configure the ping frequency and retention of the rrd files. Once set, changing the interval will require deletion or migration of all the collected data.''; diff --git a/nixos/modules/services/web-apps/matomo-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml index 021a89be3f63..8485492c51c7 100644 --- a/nixos/modules/services/web-apps/matomo-doc.xml +++ b/nixos/modules/services/web-apps/matomo-doc.xml @@ -21,18 +21,18 @@ passwordless database authentication via the UNIX_SOCKET authentication plugin with the following SQL commands: - # For MariaDB - INSTALL PLUGIN unix_socket SONAME 'auth_socket'; - CREATE DATABASE matomo; - CREATE USER 'matomo'@'localhost' IDENTIFIED WITH unix_socket; - GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; +# For MariaDB +INSTALL PLUGIN unix_socket SONAME 'auth_socket'; +CREATE DATABASE matomo; +CREATE USER 'matomo'@'localhost' IDENTIFIED WITH unix_socket; +GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; - # For MySQL - INSTALL PLUGIN auth_socket SONAME 'auth_socket.so'; - CREATE DATABASE matomo; - CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket; - GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; - +# For MySQL +INSTALL PLUGIN auth_socket SONAME 'auth_socket.so'; +CREATE DATABASE matomo; +CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket; +GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; + Then fill in matomo as database user and database name, and leave the password field blank. This authentication works by allowing only the matomo unix user to authenticate as the From 3c14bda7f5a065d3d290399db2ef15457af3906b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 17 Jun 2019 12:17:16 +0200 Subject: [PATCH 066/106] doc: fix spurious whitespace --- doc/contributing.xml | 14 +- doc/functions/appimagetools.xml | 2 +- doc/functions/dockertools.xml | 2 +- doc/functions/prefer-remote-fetch.xml | 18 +- doc/functions/trivial-builders.xml | 26 +-- doc/languages-frameworks/beam.xml | 228 +++++++++++++------------- doc/languages-frameworks/go.xml | 8 +- doc/languages-frameworks/lua.xml | 2 +- doc/languages-frameworks/ocaml.xml | 4 +- doc/languages-frameworks/texlive.xml | 4 +- doc/platform-notes.xml | 70 ++++---- doc/stdenv.xml | 26 +-- doc/submitting-changes.xml | 2 +- 13 files changed, 203 insertions(+), 203 deletions(-) diff --git a/doc/contributing.xml b/doc/contributing.xml index d28442b7a2c6..523c1c9c8f03 100644 --- a/doc/contributing.xml +++ b/doc/contributing.xml @@ -12,9 +12,9 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc You can quickly check your edits with make: - $ cd /path/to/nixpkgs/doc - $ nix-shell - [nix-shell]$ make +$ cd /path/to/nixpkgs/doc +$ nix-shell +[nix-shell]$ make If you experience problems, run make debug to help @@ -24,10 +24,10 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc After making modifications to the manual, it's important to build it before committing. You can do that as follows: - $ cd /path/to/nixpkgs/doc - $ nix-shell - [nix-shell]$ make clean - [nix-shell]$ nix-build . +$ cd /path/to/nixpkgs/doc +$ nix-shell +[nix-shell]$ make clean +[nix-shell]$ nix-build . If the build succeeds, the manual will be in ./result/share/doc/nixpkgs/manual.html. diff --git a/doc/functions/appimagetools.xml b/doc/functions/appimagetools.xml index 4205c6da3851..e6dbc22f48dd 100644 --- a/doc/functions/appimagetools.xml +++ b/doc/functions/appimagetools.xml @@ -52,7 +52,7 @@ spot sensor temperature 0.000000, unit celsius, color scheme 0, calibration: off $ file -k type2.AppImage type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x), scale 232-60668, spot sensor temperature -4.187500, color scheme 15, show scale bar, calibration: offset -0.000000, slope 0.000000 (Lepton 2.x), scale 4111-45000, spot sensor temperature 412442.250000, color scheme 3, minimum point enabled, calibration: offset -75402534979642766821519867692934234112.000000, slope 5815371847733706829839455140374904832.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=79dcc4e55a61c293c5e19edbd8d65b202842579f, stripped\012- data - + Note how the type 1 AppImage is described as an ISO 9660 CD-ROM diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml index e95ce1979ded..a042013b8e70 100644 --- a/doc/functions/dockertools.xml +++ b/doc/functions/dockertools.xml @@ -537,7 +537,7 @@ exportImage { name = someLayeredImage.name; } - + diff --git a/doc/functions/prefer-remote-fetch.xml b/doc/functions/prefer-remote-fetch.xml index 2ccad9218062..3e43fd28ade8 100644 --- a/doc/functions/prefer-remote-fetch.xml +++ b/doc/functions/prefer-remote-fetch.xml @@ -10,16 +10,16 @@ upload while the builder can fetch faster directly from the source. To use it, put the following snippet as a new overlay: - self: super: - (super.prefer-remote-fetch self super) - +self: super: + (super.prefer-remote-fetch self super) + A full configuration example for that sets the overlay up for your own account, could look like this - - $ mkdir ~/.config/nixpkgs/overlays/ - $ cat > ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix <<EOF - self: super: super.prefer-remote-fetch self super - EOF - + +$ mkdir ~/.config/nixpkgs/overlays/ +$ cat > ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix <<EOF + self: super: super.prefer-remote-fetch self super +EOF +
diff --git a/doc/functions/trivial-builders.xml b/doc/functions/trivial-builders.xml index 1fd92ecfe262..0211a4f31728 100644 --- a/doc/functions/trivial-builders.xml +++ b/doc/functions/trivial-builders.xml @@ -35,25 +35,25 @@ An example of using runCommand is provided below. - (import <nixpkgs> {}).runCommand "my-example" {} '' - echo My example command is running +(import <nixpkgs> {}).runCommand "my-example" {} '' + echo My example command is running - mkdir $out + mkdir $out - echo I can write data to the Nix store > $out/message + echo I can write data to the Nix store > $out/message - echo I can also run basic commands like: + echo I can also run basic commands like: - echo ls - ls + echo ls + ls - echo whoami - whoami + echo whoami + whoami - echo date - date - '' - + echo date + date +'' + diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml index ac7a83ed4265..b896b564fb7c 100644 --- a/doc/languages-frameworks/beam.xml +++ b/doc/languages-frameworks/beam.xml @@ -140,7 +140,7 @@ beamPackages.jiffy jiffy-0.14.5 beamPackages.lager lager-3.0.2 beamPackages.meck meck-0.8.3 beamPackages.rebar3-pc pc-1.1.0 - + To install any of those packages into your profile, refer to them by their @@ -149,7 +149,7 @@ beamPackages.rebar3-pc pc-1.1.0 $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse - + The attribute path of any BEAM package corresponds to the name of that @@ -178,22 +178,22 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse - { stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }: +{ stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }: - buildRebar3 rec { - name = "hex2nix"; - version = "0.0.1"; +buildRebar3 rec { + name = "hex2nix"; + version = "0.0.1"; - src = fetchFromGitHub { - owner = "ericbmerritt"; - repo = "hex2nix"; - rev = "${version}"; - sha256 = "1w7xjidz1l5yjmhlplfx7kphmnpvqm67w99hd2m7kdixwdxq0zqg"; - }; + src = fetchFromGitHub { + owner = "ericbmerritt"; + repo = "hex2nix"; + rev = "${version}"; + sha256 = "1w7xjidz1l5yjmhlplfx7kphmnpvqm67w99hd2m7kdixwdxq0zqg"; + }; - beamDeps = [ ibrowse jsx erlware_commons ]; - } - + beamDeps = [ ibrowse jsx erlware_commons ]; +} + Such derivations are callable with @@ -228,29 +228,29 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse - { buildErlangMk, fetchHex, cowlib, ranch }: +{ buildErlangMk, fetchHex, cowlib, ranch }: - buildErlangMk { - name = "cowboy"; - version = "1.0.4"; +buildErlangMk { + name = "cowboy"; + version = "1.0.4"; - src = fetchHex { - pkg = "cowboy"; - version = "1.0.4"; - sha256 = "6a0edee96885fae3a8dd0ac1f333538a42e807db638a9453064ccfdaa6b9fdac"; - }; + src = fetchHex { + pkg = "cowboy"; + version = "1.0.4"; + sha256 = "6a0edee96885fae3a8dd0ac1f333538a42e807db638a9453064ccfdaa6b9fdac"; + }; - beamDeps = [ cowlib ranch ]; + beamDeps = [ cowlib ranch ]; - meta = { - description = '' - Small, fast, modular HTTP server written in Erlang - ''; - license = stdenv.lib.licenses.isc; - homepage = https://github.com/ninenines/cowboy; - }; - } - + meta = { + description = '' + Small, fast, modular HTTP server written in Erlang + ''; + license = stdenv.lib.licenses.isc; + homepage = https://github.com/ninenines/cowboy; + }; +} +
@@ -262,56 +262,56 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse - { buildMix, fetchHex, plug, absinthe }: +{ buildMix, fetchHex, plug, absinthe }: - buildMix { - name = "absinthe_plug"; - version = "1.0.0"; +buildMix { + name = "absinthe_plug"; + version = "1.0.0"; - src = fetchHex { - pkg = "absinthe_plug"; - version = "1.0.0"; - sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33"; - }; + src = fetchHex { + pkg = "absinthe_plug"; + version = "1.0.0"; + sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33"; + }; - beamDeps = [ plug absinthe ]; + beamDeps = [ plug absinthe ]; - meta = { - description = '' - A plug for Absinthe, an experimental GraphQL toolkit - ''; - license = stdenv.lib.licenses.bsd3; - homepage = https://github.com/CargoSense/absinthe_plug; - }; - } - + meta = { + description = '' + A plug for Absinthe, an experimental GraphQL toolkit + ''; + license = stdenv.lib.licenses.bsd3; + homepage = https://github.com/CargoSense/absinthe_plug; + }; +} + Alternatively, we can use buildHex as a shortcut: - { buildHex, buildMix, plug, absinthe }: +{ buildHex, buildMix, plug, absinthe }: - buildHex { - name = "absinthe_plug"; - version = "1.0.0"; +buildHex { + name = "absinthe_plug"; + version = "1.0.0"; - sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33"; + sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33"; - builder = buildMix; + builder = buildMix; - beamDeps = [ plug absinthe ]; + beamDeps = [ plug absinthe ]; - meta = { - description = '' - A plug for Absinthe, an experimental GraphQL toolkit - ''; - license = stdenv.lib.licenses.bsd3; - homepage = https://github.com/CargoSense/absinthe_plug; - }; - } - + meta = { + description = '' + A plug for Absinthe, an experimental GraphQL toolkit + ''; + license = stdenv.lib.licenses.bsd3; + homepage = https://github.com/CargoSense/absinthe_plug; + }; +} +
@@ -330,47 +330,47 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse could do the following: - - $ nix-shell -A beamPackages.ibrowse.env --run "erl" - Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false] + +$ nix-shell -A beamPackages.ibrowse.env --run "erl" +Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false] - Eshell V7.0 (abort with ^G) - 1> m(ibrowse). - Module: ibrowse - MD5: 3b3e0137d0cbb28070146978a3392945 - Compiled: January 10 2016, 23:34 - Object file: /nix/store/g1rlf65rdgjs4abbyj4grp37ry7ywivj-ibrowse-4.2.2/lib/erlang/lib/ibrowse-4.2.2/ebin/ibrowse.beam - Compiler options: [{outdir,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/ebin"}, - debug_info,debug_info,nowarn_shadow_vars, - warn_unused_import,warn_unused_vars,warnings_as_errors, - {i,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/include"}] - Exports: - add_config/1 send_req_direct/7 - all_trace_off/0 set_dest/3 - code_change/3 set_max_attempts/3 - get_config_value/1 set_max_pipeline_size/3 - get_config_value/2 set_max_sessions/3 - get_metrics/0 show_dest_status/0 - get_metrics/2 show_dest_status/1 - handle_call/3 show_dest_status/2 - handle_cast/2 spawn_link_worker_process/1 - handle_info/2 spawn_link_worker_process/2 - init/1 spawn_worker_process/1 - module_info/0 spawn_worker_process/2 - module_info/1 start/0 - rescan_config/0 start_link/0 - rescan_config/1 stop/0 - send_req/3 stop_worker_process/1 - send_req/4 stream_close/1 - send_req/5 stream_next/1 - send_req/6 terminate/2 - send_req_direct/4 trace_off/0 - send_req_direct/5 trace_off/2 - send_req_direct/6 trace_on/0 - trace_on/2 - ok - 2> - +Eshell V7.0 (abort with ^G) +1> m(ibrowse). +Module: ibrowse +MD5: 3b3e0137d0cbb28070146978a3392945 +Compiled: January 10 2016, 23:34 +Object file: /nix/store/g1rlf65rdgjs4abbyj4grp37ry7ywivj-ibrowse-4.2.2/lib/erlang/lib/ibrowse-4.2.2/ebin/ibrowse.beam +Compiler options: [{outdir,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/ebin"}, +debug_info,debug_info,nowarn_shadow_vars, +warn_unused_import,warn_unused_vars,warnings_as_errors, +{i,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/include"}] +Exports: +add_config/1 send_req_direct/7 +all_trace_off/0 set_dest/3 +code_change/3 set_max_attempts/3 +get_config_value/1 set_max_pipeline_size/3 +get_config_value/2 set_max_sessions/3 +get_metrics/0 show_dest_status/0 +get_metrics/2 show_dest_status/1 +handle_call/3 show_dest_status/2 +handle_cast/2 spawn_link_worker_process/1 +handle_info/2 spawn_link_worker_process/2 +init/1 spawn_worker_process/1 +module_info/0 spawn_worker_process/2 +module_info/1 start/0 +rescan_config/0 start_link/0 +rescan_config/1 stop/0 +send_req/3 stop_worker_process/1 +send_req/4 stream_close/1 +send_req/5 stream_next/1 +send_req/6 terminate/2 +send_req_direct/4 trace_off/0 +send_req_direct/5 trace_off/2 +send_req_direct/6 trace_on/0 +trace_on/2 +ok +2> + Notice the -A beamPackages.ibrowse.env. That is the key @@ -408,7 +408,7 @@ let in drv - +
Building in a Shell (for Mix Projects) @@ -474,7 +474,7 @@ plt: analyze: build plt $(NIX_SHELL) --run "mix dialyzer --no-compile" - + Using a shell.nix as described (see @@ -513,9 +513,9 @@ analyze: build plt nixpkgs repository: - -$ nix-build -A beamPackages - + +$ nix-build -A beamPackages + That will attempt to build every package in beamPackages. diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index 6f6e7925a1b5..b2b4962cb5f6 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -218,12 +218,12 @@ deis = buildGoPackage rec { bin includes program binaries. You can test build a Go binary as follows: - $ nix-build -A deis.bin - +$ nix-build -A deis.bin + or build all outputs with: - $ nix-build -A deis.all - +$ nix-build -A deis.all + bin output will be installed by default with nix-env -i or systemPackages. diff --git a/doc/languages-frameworks/lua.xml b/doc/languages-frameworks/lua.xml index 210140299960..5144bb24ff6e 100644 --- a/doc/languages-frameworks/lua.xml +++ b/doc/languages-frameworks/lua.xml @@ -29,7 +29,7 @@ fileSystem = buildLuaPackage { maintainers = with maintainers; [ flosse ]; }; }; - + diff --git a/doc/languages-frameworks/ocaml.xml b/doc/languages-frameworks/ocaml.xml index 0deadf2edd03..b7006ecba998 100644 --- a/doc/languages-frameworks/ocaml.xml +++ b/doc/languages-frameworks/ocaml.xml @@ -62,7 +62,7 @@ buildDunePackage rec { maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; }; } - + Here is a second example, this time using a source archive generated with @@ -93,5 +93,5 @@ buildDunePackage rec { maintainers = [ maintainers.eqyiel ]; }; } - +
diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml index 5792a16963a9..97f274933bef 100644 --- a/doc/languages-frameworks/texlive.xml +++ b/doc/languages-frameworks/texlive.xml @@ -26,7 +26,7 @@ texlive.combine { inherit (texlive) scheme-small collection-langkorean algorithms cm-super; } - + There are all the schemes, collections and a few thousand packages, as defined upstream (perhaps with tiny differences). @@ -44,7 +44,7 @@ texlive.combine { # elem tlType [ "run" "bin" "doc" "source" ] # there are also other attributes: version, name } - + diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml index b75b50dbb962..157d3fe2fcdd 100644 --- a/doc/platform-notes.xml +++ b/doc/platform-notes.xml @@ -20,14 +20,14 @@ scripts. - stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - buildPhase = '' - $CC -o hello hello.c - ''; - } - +stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + buildPhase = '' + $CC -o hello hello.c + ''; +} + @@ -39,12 +39,12 @@ fixupPhase. - stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; - } - +stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; +} + @@ -62,19 +62,19 @@ 1 manpage. - dyld: Library not loaded: /nix/store/7hnmbscpayxzxrixrgxvvlifzlxdsdir-jq-1.5-lib/lib/libjq.1.dylib - Referenced from: /private/tmp/nix-build-jq-1.5.drv-0/jq-1.5/tests/../jq - Reason: image not found - ./tests/jqtest: line 5: 75779 Abort trap: 6 - +dyld: Library not loaded: /nix/store/7hnmbscpayxzxrixrgxvvlifzlxdsdir-jq-1.5-lib/lib/libjq.1.dylib +Referenced from: /private/tmp/nix-build-jq-1.5.drv-0/jq-1.5/tests/../jq +Reason: image not found +./tests/jqtest: line 5: 75779 Abort trap: 6 + - stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - doInstallCheck = true; - installCheckTarget = "check"; - } - +stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + doInstallCheck = true; + installCheckTarget = "check"; +} + @@ -85,15 +85,15 @@ on xcode. - stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - prePatch = '' - substituteInPlace Makefile \ - --replace '/usr/bin/xcrun clang' clang - ''; - } - +stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + prePatch = '' + substituteInPlace Makefile \ + --replace '/usr/bin/xcrun clang' clang + ''; +} + The package xcbuild can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 2447dc451301..dbffdad9fdee 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -343,7 +343,7 @@ let f(h, t, i) = i + (if i <= 0 then h else t - 1) let f(h, h + 1, i) = i + (if i <= 0 then h else (h + 1) - 1) let f(h, h + 1, i) = i + (if i <= 0 then h else h) let f(h, h + 1, i) = i + h - + This is where "sum-like" comes in from above: We can just sum all of the host offsets to get the host offset of the transitive dependency. The target offset is the transitive dependency is simply the host offset + 1, just as @@ -2229,7 +2229,7 @@ someVar=$(stripHash $name) array by doing something like addEnvHooks "$hostOffset" myBashFunction - + @@ -2667,8 +2667,8 @@ addEnvHooks "$hostOffset" myBashFunction that is supposed to be inspected, add breakpointHook to nativeBuildInputs. - nativeBuildInputs = [ breakpointHook ]; - +nativeBuildInputs = [ breakpointHook ]; + When a build failure happens there will be an instruction printed that shows how to attach with cntr to the build sandbox. @@ -2863,7 +2863,7 @@ addEnvHooks "$hostOffset" myBashFunction printf(help_message); ^ cc1plus: some warnings being treated as errors - + @@ -2885,7 +2885,7 @@ cc1plus: some warnings being treated as errors bin/blib.a(bios_console.o): In function `bios_handle_cup': /tmp/nix-build-ipxe-20141124-5cbdc41.drv-0/ipxe-5cbdc41/src/arch/i386/firmware/pcbios/bios_console.c:86: undefined reference to `__stack_chk_fail' - + @@ -2914,19 +2914,19 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup': malloc.c:404:15: error: return type is an incomplete type malloc.c:410:19: error: storage size of 'ms' isn't known - + strdup.h:22:1: error: expected identifier or '(' before '__extension__' - + strsep.c:65:23: error: register name not specified for 'delim' - + installwatch.c:3751:5: error: conflicting types for '__open_2' - + fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments - + @@ -2951,7 +2951,7 @@ fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute erro ccbLfRgg.s: Assembler messages: ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_len@GOTOFF' - + @@ -3015,7 +3015,7 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le intel_drv.so: undefined symbol: vgaHWFreeHWRec - + diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml index bc090fd757ce..bf9e290fa2f7 100644 --- a/doc/submitting-changes.xml +++ b/doc/submitting-changes.xml @@ -514,7 +514,7 @@ The original commit message describing the reason why the world was torn apart. (cherry picked from commit abcdef) Reason: I just had a gut feeling that this would also be wanted by people from the stone age. - + From 2df00be6016f9cf80aa505f13ecbd80d6eef7706 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 10:42:33 -0700 Subject: [PATCH 067/106] byobu: 5.127 -> 5.129 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/byobu/versions --- pkgs/tools/misc/byobu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index 0cd23a907d8b..65196e2a3b66 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python3, perl, textual-window-manager }: stdenv.mkDerivation rec { - version = "5.127"; + version = "5.129"; name = "byobu-" + version; src = fetchurl { url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"; - sha256 = "0fznlj454vgxgzfw3avmvvjpawggs66da5l8k6v0lnzzd75wgbsb"; + sha256 = "1ff20xdi58pncw76hrkf7azqy0y654kwz1zff5irnd8cflh5y4z5"; }; doCheck = true; From 069f2235af96aa5af939f1badfee90ca2a9f42ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 08:20:39 -0700 Subject: [PATCH 068/106] brial: 1.2.4 -> 1.2.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/brial/versions --- pkgs/development/libraries/science/math/brial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index 38b77781867d..16850fb1665e 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.4"; + version = "1.2.5"; name = "brial-${version}"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; rev = version; - sha256 = "08skgmwz190mvpkh0ddx92ilva6bxidxwh1qg16ipi768x92193s"; + sha256 = "1nv56fp3brpzanxj7vwvxqdafqfsfhdgq5imr3m94psw5gdfqwja"; }; # FIXME package boost-test and enable checks From a3f2131eb69c57570a41d036f395df9252c39b8b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 17 Jun 2019 13:25:50 +0200 Subject: [PATCH 069/106] doc: Use prompt more often --- doc/coding-conventions.xml | 10 +-- doc/functions/dockertools.xml | 18 ++-- doc/languages-frameworks/beam.xml | 12 +-- doc/languages-frameworks/perl.xml | 8 +- doc/meta.xml | 4 +- doc/package-notes.xml | 18 ++-- doc/quick-start.xml | 16 ++-- doc/reviewing-contributions.xml | 10 +-- doc/submitting-changes.xml | 4 +- .../manual/administration/cleaning-store.xml | 10 +-- .../administration/container-networking.xml | 4 +- .../manual/administration/control-groups.xml | 2 +- nixos/doc/manual/administration/logging.xml | 6 +- nixos/doc/manual/administration/rollback.xml | 2 +- .../manual/administration/service-mgmt.xml | 4 +- .../administration/store-corruption.xml | 4 +- .../manual/administration/user-sessions.xml | 4 +- .../manual/configuration/ad-hoc-packages.xml | 10 +-- .../configuration/adding-custom-packages.xml | 8 +- .../configuration/declarative-packages.xml | 2 +- nixos/doc/manual/configuration/matrix.xml | 16 ++-- nixos/doc/manual/configuration/modularity.xml | 10 +-- nixos/doc/manual/configuration/wireless.xml | 6 +- nixos/doc/manual/configuration/xfce.xml | 2 +- .../doc/manual/development/building-nixos.xml | 8 +- .../doc/manual/development/building-parts.xml | 20 ++--- .../running-nixos-tests-interactively.xml | 18 ++-- .../development/running-nixos-tests.xml | 8 +- nixos/doc/manual/development/sources.xml | 24 +++--- .../manual/development/testing-installer.xml | 12 +-- .../manual/installation/installing-usb.xml | 10 +-- nixos/doc/manual/installation/installing.xml | 84 +++++++++---------- .../doc/manual/man-nixos-generate-config.xml | 10 +-- nixos/doc/manual/man-nixos-install.xml | 38 ++++----- nixos/doc/manual/man-nixos-option.xml | 12 +-- nixos/doc/manual/man-nixos-rebuild.xml | 40 ++++----- nixos/doc/manual/release-notes/rl-1509.xml | 2 +- .../services/databases/foundationdb.xml | 38 ++++----- .../modules/services/databases/postgresql.xml | 4 +- nixos/modules/services/editors/emacs.xml | 10 +-- nixos/modules/services/misc/gitlab.xml | 12 +-- .../modules/services/misc/taskserver/doc.xml | 2 +- 42 files changed, 271 insertions(+), 271 deletions(-) diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index 58ce9c7e627c..48356247a49e 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -921,7 +921,7 @@ src = fetchFromGitHub { You can convert between formats with nix-hash, for example: -$ nix-hash --type sha256 --to-base32 HASH +$ nix-hash --type sha256 --to-base32 HASH @@ -1038,7 +1038,7 @@ patches = [ ./0001-changes.patch ]; Move to the root directory of the source code you're patching. -$ cd the/program/source +$ cd the/program/source @@ -1046,8 +1046,8 @@ $ cd the/program/source If a git repository is not already present, create one and stage all of the source files. -$ git init -$ git add . +$ git init +$ git add . @@ -1060,7 +1060,7 @@ $ git add . Use git to create a diff, and pipe the output to a patch file: -$ git diff > nixpkgs/pkgs/the/package/0001-changes.patch +$ git diff > nixpkgs/pkgs/the/package/0001-changes.patch diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml index a042013b8e70..3e9281557d51 100644 --- a/doc/functions/dockertools.xml +++ b/doc/functions/dockertools.xml @@ -480,9 +480,9 @@ pullImage { nix-prefetch-docker command can be used to get required image parameters: - -$ nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5 - + +$ nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5 + Since a given imageName may transparently refer to a manifest list of images which support multiple architectures and/or @@ -491,17 +491,17 @@ $ nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql By default it will match the OS and architecture of the host the command is run on. - -$ nix-prefetch-docker --image-name mysql --image-tag 5 --arch x86_64 --os linux - + +$ nix-prefetch-docker --image-name mysql --image-tag 5 --arch x86_64 --os linux + Desired image name and tag can be set using and arguments: - -$ nix-prefetch-docker --image-name mysql --image-tag 5 --final-image-name eu.gcr.io/my-project/mysql --final-image-tag prod - + +$ nix-prefetch-docker --image-name mysql --image-tag 5 --final-image-name eu.gcr.io/my-project/mysql --final-image-tag prod + diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml index b896b564fb7c..dee7f2d74191 100644 --- a/doc/languages-frameworks/beam.xml +++ b/doc/languages-frameworks/beam.xml @@ -131,8 +131,8 @@ in beamPackages, use the following command: - -$ nix-env -f "<nixpkgs>" -qaP -A beamPackages + +$ nix-env -f "<nixpkgs>" -qaP -A beamPackages beamPackages.esqlite esqlite-0.2.1 beamPackages.goldrush goldrush-0.1.7 beamPackages.ibrowse ibrowse-4.2.2 @@ -140,16 +140,16 @@ beamPackages.jiffy jiffy-0.14.5 beamPackages.lager lager-3.0.2 beamPackages.meck meck-0.8.3 beamPackages.rebar3-pc pc-1.1.0 - + To install any of those packages into your profile, refer to them by their attribute path (first column): - -$ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse - + +$ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse + The attribute path of any BEAM package corresponds to the name of that diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml index a675e6665863..d0f124f29d42 100644 --- a/doc/languages-frameworks/perl.xml +++ b/doc/languages-frameworks/perl.xml @@ -47,13 +47,13 @@ foo = import ../path/to/foo.nix { in all-packages.nix. You can test building a Perl package as follows: -$ nix-build -A perlPackages.ClassC3 +$ nix-build -A perlPackages.ClassC3 buildPerlPackage adds perl- to the start of the name attribute, so the package above is actually called perl-Class-C3-0.21. So to install it, you can say: -$ nix-env -i perl-Class-C3 +$ nix-env -i perl-Class-C3 (Of course you can also install using the attribute name: nix-env -i -A perlPackages.ClassC3.) @@ -148,7 +148,7 @@ ClassC3Componentised = buildPerlPackage rec { -$ nix-env -i nix-generate-from-cpan +$ nix-env -i nix-generate-from-cpan @@ -156,7 +156,7 @@ $ nix-env -i nix-generate-from-cpan unpacks the corresponding package, and prints a Nix expression on standard output. For example: -$ nix-generate-from-cpan XML::Simple +$ nix-generate-from-cpan XML::Simple XMLSimple = buildPerlPackage rec { name = "XML-Simple-2.22"; src = fetchurl { diff --git a/doc/meta.xml b/doc/meta.xml index ccbc812a862f..22fb433a1d1b 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -30,7 +30,7 @@ meta = with stdenv.lib; { The meta-attributes of a package can be queried from the command-line using nix-env: -$ nix-env -qa hello --json +$ nix-env -qa hello --json { "hello": { "meta": { @@ -70,7 +70,7 @@ $ nix-env -qa hello --json nix-env knows about the description field specifically: -$ nix-env -qa hello --description +$ nix-env -qa hello --description hello-2.3 A program that produces a familiar, friendly greeting diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 29b6b2420b5b..2b7b4b9bc51b 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -92,9 +92,9 @@ modulesTree = [kernel] If needed you can also run make menuconfig: -$ nix-env -i ncurses -$ export NIX_CFLAGS_LINK=-lncurses -$ make menuconfig ARCH=arch +$ nix-env -i ncurses +$ export NIX_CFLAGS_LINK=-lncurses +$ make menuconfig ARCH=arch @@ -142,8 +142,8 @@ $ make menuconfig ARCH=arch The generator is invoked as follows: -$ cd pkgs/servers/x11/xorg -$ cat tarballs-7.5.list extra.list old.list \ +$ cd pkgs/servers/x11/xorg +$ cat tarballs-7.5.list extra.list old.list \ | perl ./generate-expr-from-tarballs.pl For each of the tarballs in the .list files, the script @@ -160,8 +160,8 @@ $ cat tarballs-7.5.list extra.list old.list \ A file like tarballs-7.5.list contains all tarballs in a X.org release. It can be generated like this: -$ export i="mirror://xorg/X11R7.4/src/everything/" -$ cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \ +$ export i="mirror://xorg/X11R7.4/src/everything/" +$ cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \ | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' \ | sort > tarballs-7.4.list @@ -210,7 +210,7 @@ $ cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \ often available. It is possible to list available Eclipse packages by issuing the command: -$ nix-env -f '<nixpkgs>' -qaP -A eclipses --description +$ nix-env -f '<nixpkgs>' -qaP -A eclipses --description Once an Eclipse variant is installed it can be run using the eclipse command, as expected. From within Eclipse it is @@ -250,7 +250,7 @@ packageOverrides = pkgs: { available for installation using eclipseWithPlugins by running -$ nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description +$ nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 86c17ca4e9fa..4f0952896e45 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -9,8 +9,8 @@ Checkout the Nixpkgs source tree: -$ git clone https://github.com/NixOS/nixpkgs -$ cd nixpkgs +$ git clone https://github.com/NixOS/nixpkgs +$ cd nixpkgs @@ -23,7 +23,7 @@ $ cd nixpkgs See for some hints on the tree organisation. Create a directory for your package, e.g. -$ mkdir pkgs/development/libraries/libfoo +$ mkdir pkgs/development/libraries/libfoo @@ -34,8 +34,8 @@ $ mkdir pkgs/development/libraries/libfoo as arguments, and returns a build of the package in the Nix store. The expression should usually be called default.nix. -$ emacs pkgs/development/libraries/libfoo/default.nix -$ git add pkgs/development/libraries/libfoo/default.nix +$ emacs pkgs/development/libraries/libfoo/default.nix +$ git add pkgs/development/libraries/libfoo/default.nix You can have a look at the existing Nix expressions under @@ -180,7 +180,7 @@ $ git add pkgs/development/libraries/libfoo/default.nix with some descriptive name for the variable, e.g. libfoo. -$ emacs pkgs/top-level/all-packages.nix +$ emacs pkgs/top-level/all-packages.nix The attributes in that file are sorted by category (like “Development / @@ -193,7 +193,7 @@ $ emacs pkgs/top-level/all-packages.nix To test whether the package builds, run the following command from the root of the nixpkgs source tree: -$ nix-build -A libfoo +$ nix-build -A libfoo where libfoo should be the variable name defined in the previous step. You may want to add the flag to keep the temporary build directory in case something fails. If the build @@ -205,7 +205,7 @@ $ nix-build -A libfoo If you want to install the package into your profile (optional), do -$ nix-env -f . -iA libfoo +$ nix-env -f . -iA libfoo diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index 6e3b6face3a5..5aa950625efa 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -153,11 +153,11 @@ nixpkgs-unstable for easier review by running the following commands from a nixpkgs clone. -$ git remote add channels https://github.com/NixOS/nixpkgs-channels.git $ git remote add channels https://github.com/NixOS/nixpkgs-channels.git -$ git fetch channels nixos-unstable -$ git fetch origin pull/PRNUMBER/head -$ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD $ git fetch channels nixos-unstable +$ git fetch origin pull/PRNUMBER/head +$ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD @@ -197,7 +197,7 @@ $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD -$ nix-shell -p nix-review --run "nix-review pr PRNUMBER" +$ nix-shell -p nix-review --run "nix-review pr PRNUMBER" diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml index bf9e290fa2f7..a04ec08b0484 100644 --- a/doc/submitting-changes.xml +++ b/doc/submitting-changes.xml @@ -36,8 +36,8 @@ -$ git checkout 0998212 -$ git checkout -b 'fix/pkg-name-update' +$ git checkout 0998212 +$ git checkout -b 'fix/pkg-name-update' diff --git a/nixos/doc/manual/administration/cleaning-store.xml b/nixos/doc/manual/administration/cleaning-store.xml index f078b8c3ba37..526803e429ba 100644 --- a/nixos/doc/manual/administration/cleaning-store.xml +++ b/nixos/doc/manual/administration/cleaning-store.xml @@ -11,12 +11,12 @@ Nix’s garbage collector to remove old, unreferenced packages. This is easy: -$ nix-collect-garbage +$ nix-collect-garbage Alternatively, you can use a systemd unit that does the same in the background: -# systemctl start nix-gc.service +# systemctl start nix-gc.service You can tell NixOS in configuration.nix to run this unit automatically at certain points in time, for instance, every night at 03:15: @@ -31,11 +31,11 @@ $ nix-collect-garbage configurations. The following command deletes old roots, removing the ability to roll back to them: -$ nix-collect-garbage -d +$ nix-collect-garbage -d You can also do this for specific profiles, e.g. -$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old +$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old Note that NixOS system configurations are stored in the profile /nix/var/nix/profiles/system. @@ -45,7 +45,7 @@ $ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations o Nix store) is to run Nix’s store optimiser, which seeks out identical files in the store and replaces them with hard links to a single copy. -$ nix-store --optimise +$ nix-store --optimise Since this command needs to read the entire Nix store, it can take quite a while to finish. diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml index 2ee8bfdd50f1..42486f01fe8c 100644 --- a/nixos/doc/manual/administration/container-networking.xml +++ b/nixos/doc/manual/administration/container-networking.xml @@ -11,10 +11,10 @@ 10.233.0.0/16. You can get the container’s IPv4 address as follows: -# nixos-container show-ip foo +# nixos-container show-ip foo 10.233.4.2 -$ ping -c1 10.233.4.2 +$ ping -c1 10.233.4.2 64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixos/doc/manual/administration/control-groups.xml index bb8b7f83d9e0..16d03cc0d1ab 100644 --- a/nixos/doc/manual/administration/control-groups.xml +++ b/nixos/doc/manual/administration/control-groups.xml @@ -16,7 +16,7 @@ systemd hierarchy, which is what systemd uses to keep track of the processes belonging to each service or user session: -$ systemd-cgls +$ systemd-cgls ├─user │ └─eelco │ └─c1 diff --git a/nixos/doc/manual/administration/logging.xml b/nixos/doc/manual/administration/logging.xml index a41936b373d6..da4877fcdf08 100644 --- a/nixos/doc/manual/administration/logging.xml +++ b/nixos/doc/manual/administration/logging.xml @@ -11,14 +11,14 @@ The command journalctl allows you to see the contents of the journal. For example, -$ journalctl -b +$ journalctl -b shows all journal entries since the last reboot. (The output of journalctl is piped into less by default.) You can use various options and match operators to restrict output to messages of interest. For instance, to get all messages from PostgreSQL: -$ journalctl -u postgresql.service +$ journalctl -u postgresql.service -- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. -- ... Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down @@ -29,7 +29,7 @@ Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to Or to get all messages since the last reboot that have at least a “critical” severity level: -$ journalctl -b -p crit +$ journalctl -b -p crit Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice] Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1) diff --git a/nixos/doc/manual/administration/rollback.xml b/nixos/doc/manual/administration/rollback.xml index 07c6acaa469c..fb87810ba461 100644 --- a/nixos/doc/manual/administration/rollback.xml +++ b/nixos/doc/manual/administration/rollback.xml @@ -33,7 +33,7 @@ where N is the number of the NixOS system configuration. To get a list of the available configurations, do: -$ ls -l /nix/var/nix/profiles/system-*-link +$ ls -l /nix/var/nix/profiles/system-*-link ... lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055 diff --git a/nixos/doc/manual/administration/service-mgmt.xml b/nixos/doc/manual/administration/service-mgmt.xml index 0c2085c81559..1b9c745eb59f 100644 --- a/nixos/doc/manual/administration/service-mgmt.xml +++ b/nixos/doc/manual/administration/service-mgmt.xml @@ -21,7 +21,7 @@ systemd. Without any arguments, it shows the status of active units: -$ systemctl +$ systemctl -.mount loaded active mounted / swapfile.swap loaded active active /swapfile sshd.service loaded active running SSH Daemon @@ -33,7 +33,7 @@ graphical.target loaded active active Graphical Interface You can ask for detailed status information about a unit, for instance, the PostgreSQL database service: -$ systemctl status postgresql.service +$ systemctl status postgresql.service postgresql.service - PostgreSQL Server Loaded: loaded (/nix/store/pn3q73mvh75gsrl8w7fdlfk3fq5qm5mw-unit/postgresql.service) Active: active (running) since Mon, 2013-01-07 15:55:57 CET; 9h ago diff --git a/nixos/doc/manual/administration/store-corruption.xml b/nixos/doc/manual/administration/store-corruption.xml index a4ca3b651e20..b9d11152d5e1 100644 --- a/nixos/doc/manual/administration/store-corruption.xml +++ b/nixos/doc/manual/administration/store-corruption.xml @@ -18,7 +18,7 @@ If the corruption is in a path in the closure of the NixOS system configuration, you can fix it by doing -# nixos-rebuild switch --repair +# nixos-rebuild switch --repair This will cause Nix to check every path in the closure, and if its cryptographic hash differs from the hash recorded in Nix’s database, the @@ -28,7 +28,7 @@ You can also scan the entire Nix store for corrupt paths: -# nix-store --verify --check-contents --repair +# nix-store --verify --check-contents --repair Any corrupt paths will be redownloaded if they’re available in a binary cache; otherwise, they cannot be repaired. diff --git a/nixos/doc/manual/administration/user-sessions.xml b/nixos/doc/manual/administration/user-sessions.xml index 1d95cfb22b69..80daf6bdbff0 100644 --- a/nixos/doc/manual/administration/user-sessions.xml +++ b/nixos/doc/manual/administration/user-sessions.xml @@ -10,7 +10,7 @@ allows querying and manipulating user sessions. For instance, to list all user sessions: -$ loginctl +$ loginctl SESSION UID USER SEAT c1 500 eelco seat0 c3 0 root seat0 @@ -21,7 +21,7 @@ $ loginctl devices attached to the system; usually, there is only one seat.) To get information about a session: -$ loginctl session-status c3 +$ loginctl session-status c3 c3 - root (0) Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago Leader: 2536 (login) diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixos/doc/manual/configuration/ad-hoc-packages.xml index 19159d8db5b6..c7e882d846fa 100644 --- a/nixos/doc/manual/configuration/ad-hoc-packages.xml +++ b/nixos/doc/manual/configuration/ad-hoc-packages.xml @@ -9,7 +9,7 @@ With the command nix-env, you can install and uninstall packages from the command line. For instance, to install Mozilla Thunderbird: -$ nix-env -iA nixos.thunderbird +$ nix-env -iA nixos.thunderbird If you invoke this as root, the package is installed in the Nix profile /nix/var/nix/profiles/default and visible to all users of the system; otherwise, the package ends up in @@ -25,7 +25,7 @@ $ nix-env -iA nixos.thunderbird Packages come from the NixOS channel. You typically upgrade a package by updating to the latest version of the NixOS channel: -$ nix-channel --update nixos +$ nix-channel --update nixos and then running nix-env -i again. Other packages in the profile are not affected; this is the crucial difference @@ -34,21 +34,21 @@ $ nix-channel --update nixos their current versions in the NixOS channel. You can however upgrade all packages for which there is a newer version by doing: -$ nix-env -u '*' +$ nix-env -u '*' A package can be uninstalled using the flag: -$ nix-env -e thunderbird +$ nix-env -e thunderbird Finally, you can roll back an undesirable nix-env action: -$ nix-env --rollback +$ nix-env --rollback diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml index cdcfa10b8200..182641055e4d 100644 --- a/nixos/doc/manual/configuration/adding-custom-packages.xml +++ b/nixos/doc/manual/configuration/adding-custom-packages.xml @@ -14,8 +14,8 @@ xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs manual. In short, you clone Nixpkgs: -$ git clone https://github.com/NixOS/nixpkgs -$ cd nixpkgs +$ git clone https://github.com/NixOS/nixpkgs +$ cd nixpkgs Then you write and test the package as described in the Nixpkgs manual. Finally, you add it to environment.systemPackages, e.g. @@ -65,8 +65,8 @@ stdenv.mkDerivation rec { This allows testing the package easily: -$ nix-build my-hello.nix -$ ./result/bin/hello +$ nix-build my-hello.nix +$ ./result/bin/hello Hello, world! diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml index c9acbefea60e..5fb3bcb9f8f5 100644 --- a/nixos/doc/manual/configuration/declarative-packages.xml +++ b/nixos/doc/manual/configuration/declarative-packages.xml @@ -22,7 +22,7 @@ You can get a list of the available packages as follows: -$ nix-env -qaP '*' --description +$ nix-env -qaP '*' --description nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded ... diff --git a/nixos/doc/manual/configuration/matrix.xml b/nixos/doc/manual/configuration/matrix.xml index e43b70faf7ac..4c559a71e813 100644 --- a/nixos/doc/manual/configuration/matrix.xml +++ b/nixos/doc/manual/configuration/matrix.xml @@ -141,15 +141,15 @@ in { . To create a new user or admin, run the following after you have set the secret and have rebuilt NixOS: - -$ nix run nixpkgs.matrix-synapse -$ register_new_matrix_user -k <your-registration-shared-secret> http://localhost:8008 -New user localpart: <your-username> -Password: -Confirm password: -Make admin [no]: + +$ nix run nixpkgs.matrix-synapse +$ register_new_matrix_user -k your-registration-shared-secret http://localhost:8008 +New user localpart: your-username +Password: +Confirm password: +Make admin [no]: Success! - + In the example, this would create a user with the Matrix Identifier @your-username:example.org. Note that the registration secret ends up in the nix store and therefore is world-readable by any user diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index 67bb5a47d729..7ad0ae80a48a 100644 --- a/nixos/doc/manual/configuration/modularity.xml +++ b/nixos/doc/manual/configuration/modularity.xml @@ -106,21 +106,21 @@ The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc configuration option is. The command allows you to find out: -$ nixos-option +$ nixos-option true -$ nixos-option +$ nixos-option [ "tun" "ipv6" "loop" ... ] Interactive exploration of the configuration is possible using nix repl, a read-eval-print loop for Nix expressions. A typical use: -$ nix repl '<nixpkgs/nixos>' +$ nix repl '<nixpkgs/nixos>' -nix-repl> config. +nix-repl> config. "mandark" -nix-repl> map (x: x.hostName) config. +nix-repl> map (x: x.hostName) config. [ "example.org" "example.gov" ] diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml index 7c7b3b4a65a5..9c0e3a8d7aa4 100644 --- a/nixos/doc/manual/configuration/wireless.xml +++ b/nixos/doc/manual/configuration/wireless.xml @@ -37,7 +37,7 @@ If you are using WPA2 you can generate pskRaw key using wpa_passphrase: -$ wpa_passphrase ESSID PSK +$ wpa_passphrase ESSID PSK network={ ssid="echelon" #psk="abcdefgh" @@ -54,10 +54,10 @@ network={ or you can use it to directly generate the wpa_supplicant.conf: -# wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf +# wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf After you have edited the wpa_supplicant.conf, you need to restart the wpa_supplicant service. -# systemctl restart wpa_supplicant.service +# systemctl restart wpa_supplicant.service diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index f2967fa3b10a..6ac99c6b2bee 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -64,7 +64,7 @@ Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with db Session and Startup settings panel. Alternatively, you can run this command to do the same thing. -$ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true +$ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true A log-out and re-log will be needed for this to take effect. diff --git a/nixos/doc/manual/development/building-nixos.xml b/nixos/doc/manual/development/building-nixos.xml index 23d9ddf88a77..56a596baed00 100644 --- a/nixos/doc/manual/development/building-nixos.xml +++ b/nixos/doc/manual/development/building-nixos.xml @@ -14,14 +14,14 @@ Default CD/DVD configurations are available inside nixos/modules/installer/cd-dvd. -$ git clone https://github.com/NixOS/nixpkgs.git -$ cd nixpkgs/nixos -$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix +$ git clone https://github.com/NixOS/nixpkgs.git +$ cd nixpkgs/nixos +$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix Before burning your CD/DVD, you can check the content of the image by mounting anywhere like suggested by the following command: -# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso +# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml index b4791b72970f..88369fb891b3 100644 --- a/nixos/doc/manual/development/building-parts.xml +++ b/nixos/doc/manual/development/building-parts.xml @@ -8,8 +8,8 @@ With the command nix-build, you can build specific parts of your NixOS configuration. This is done as follows: -$ cd /path/to/nixpkgs/nixos -$ nix-build -A config.option +$ cd /path/to/nixpkgs/nixos +$ nix-build -A config.option where option is a NixOS option with type “derivation” (i.e. something that can be built). Attributes of interest include: @@ -28,7 +28,7 @@ $ nix-build -A config.option A shortcut to build this is: -$ nix-build -A system +$ nix-build -A system @@ -66,9 +66,9 @@ $ nix-build -A system test whether the kernel and the initial ramdisk boot correctly, by using QEMU’s and options: -$ nix-build -A config.system.build.initialRamdisk -o initrd -$ nix-build -A config.system.build.kernel -o kernel -$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null +$ nix-build -A config.system.build.initialRamdisk -o initrd +$ nix-build -A config.system.build.kernel -o kernel +$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null @@ -99,15 +99,15 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/ contain dots (e.g. httpd.service), you need to put them between quotes, like this: -$ nix-build -A 'config.systemd.units."httpd.service".unit' +$ nix-build -A 'config.systemd.units."httpd.service".unit' You can also test individual units, without rebuilding the whole system, by putting them in /run/systemd/system: -$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ +$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ /run/systemd/system/tmp-httpd.service -# systemctl daemon-reload -# systemctl start tmp-httpd.service +# systemctl daemon-reload +# systemctl start tmp-httpd.service Note that the unit must not have the same name as any unit in /etc/systemd/system since those take precedence over diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml index c15ad448317f..e390d62fde2f 100644 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml @@ -9,17 +9,17 @@ The test itself can be run interactively. This is particularly useful when developing or debugging a test: -$ nix-build nixos/tests/login.nix -A driver -$ ./result/bin/nixos-test-driver +$ nix-build nixos/tests/login.nix -A driver +$ ./result/bin/nixos-test-driver starting VDE switch for network 1 -> +> You can then take any Perl statement, e.g. -> startAll -> testScript -> $machine->succeed("touch /tmp/foo") -> print($machine->succeed("pwd")) # Show stdout of command +> startAll +> testScript +> $machine->succeed("touch /tmp/foo") +> print($machine->succeed("pwd")) # Show stdout of command The function testScript executes the entire test script and drops you back into the test driver command line upon its completion. @@ -30,8 +30,8 @@ starting VDE switch for network 1 To just start and experiment with the VMs, run: -$ nix-build nixos/tests/login.nix -A driver -$ ./result/bin/nixos-run-vms +$ nix-build nixos/tests/login.nix -A driver +$ ./result/bin/nixos-run-vms The script nixos-run-vms starts the virtual machines defined by test. diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml index eadbe1ea4f26..13ae1ed93699 100644 --- a/nixos/doc/manual/development/running-nixos-tests.xml +++ b/nixos/doc/manual/development/running-nixos-tests.xml @@ -12,12 +12,12 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix, you just do: -$ nix-build '<nixpkgs/nixos/tests/login.nix>' +$ nix-build '<nixpkgs/nixos/tests/login.nix>' or, if you don’t want to rely on NIX_PATH: -$ cd /my/nixpkgs/nixos/tests -$ nix-build login.nix +$ cd /my/nixpkgs/nixos/tests +$ nix-build login.nix … running the VM test script machine: QEMU running (pid 8841) @@ -30,7 +30,7 @@ machine: QEMU running (pid 8841) fast, as no disk image needs to be created. Afterwards, you can view a pretty-printed log of the test: -$ firefox result/log.html +$ firefox result/log.html diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index eec9b56b1c07..3c30c782746d 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -11,10 +11,10 @@ modify NixOS, however, you should check out the latest sources from Git. This is as follows: -$ git clone https://github.com/NixOS/nixpkgs -$ cd nixpkgs -$ git remote add channels https://github.com/NixOS/nixpkgs-channels -$ git remote update channels +$ git clone https://github.com/NixOS/nixpkgs +$ cd nixpkgs +$ git remote add channels https://github.com/NixOS/nixpkgs-channels +$ git remote update channels This will check out the latest Nixpkgs sources to ./nixpkgs the NixOS sources to @@ -32,23 +32,23 @@ $ git remote update channels not have caught up yet and you’ll have to rebuild everything from source. So you may want to create a local branch based on your current NixOS version: -$ nixos-version +$ nixos-version 17.09pre104379.6e0b727 (Hummingbird) -$ git checkout -b local 6e0b727 +$ git checkout -b local 6e0b727 Or, to base your local branch on the latest version available in a NixOS channel: -$ git remote update channels -$ git checkout -b local channels/nixos-17.03 +$ git remote update channels +$ git checkout -b local channels/nixos-17.03 (Replace nixos-17.03 with the name of the channel you want to use.) You can use git merge or git rebase to keep your local branch in sync with the channel, e.g. -$ git remote update channels -$ git merge channels/nixos-17.03 +$ git remote update channels +$ git merge channels/nixos-17.03 You can use git cherry-pick to copy commits from your local branch to the upstream branch. @@ -58,7 +58,7 @@ $ git merge channels/nixos-17.03 tell nixos-rebuild about them using the flag: -# nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs +# nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs @@ -67,7 +67,7 @@ $ git merge channels/nixos-17.03 /my/sources/nixpkgs, or change the default by adding a symlink in ~/.nix-defexpr: -$ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs +$ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs You may want to delete the symlink ~/.nix-defexpr/channels_root to prevent root’s NixOS diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixos/doc/manual/development/testing-installer.xml index 63f5f3de7f4d..902f995fbc1b 100644 --- a/nixos/doc/manual/development/testing-installer.xml +++ b/nixos/doc/manual/development/testing-installer.xml @@ -8,15 +8,15 @@ Building, burning, and booting from an installation CD is rather tedious, so here is a quick way to see if the installer works properly: -# mount -t tmpfs none /mnt -# nixos-generate-config --root /mnt -$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install -# ./result/bin/nixos-install +# mount -t tmpfs none /mnt +# nixos-generate-config --root /mnt +$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install +# ./result/bin/nixos-install To start a login shell in the new NixOS installation in /mnt: -$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter -# ./result/bin/nixos-enter +$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter +# ./result/bin/nixos-enter diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index c0372e8ebd9b..83598635acca 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -15,16 +15,16 @@ On macOS - -$ diskutil list + +$ diskutil list [..] /dev/diskN (external, physical): #: TYPE NAME SIZE IDENTIFIER [..] -$ diskutil unmountDisk diskN +$ diskutil unmountDisk diskN Unmount of all volumes on diskN was successful -$ sudo dd if=nix.iso of=/dev/rdiskN - +$ sudo dd if=nix.iso of=/dev/rdiskN + Using the 'raw' rdiskN device instead of diskN completes in minutes instead of hours. After dd completes, a GUI dialog "The disk you inserted was diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index cc5420794aff..742376378dea 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -110,7 +110,7 @@ Create a GPT partition table. -# parted /dev/sda -- mklabel gpt +# parted /dev/sda -- mklabel gpt @@ -118,14 +118,14 @@ Add the root partition. This will fill the disk except for the end part, where the swap will live, and the space left in front (512MiB) which will be used by the boot partition. -# parted /dev/sda -- mkpart primary 512MiB -8GiB +# parted /dev/sda -- mkpart primary 512MiB -8GiB Next, add a swap partition. The size required will vary according to needs, here a 8GiB one is created. -# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% The swap partition size rules are no different than for other Linux @@ -140,8 +140,8 @@ the ESP (EFI system partition) as its /boot partition. It uses the initially reserved 512MiB at the start of the disk. -# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB -# parted /dev/sda -- set 3 boot on +# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB +# parted /dev/sda -- set 3 boot on @@ -172,21 +172,21 @@ Create a MBR partition table. -# parted /dev/sda -- mklabel msdos +# parted /dev/sda -- mklabel msdos Add the root partition. This will fill the the disk except for the end part, where the swap will live. -# parted /dev/sda -- mkpart primary 1MiB -8GiB +# parted /dev/sda -- mkpart primary 1MiB -8GiB Finally, add a swap partition. The size required will vary according to needs, here a 8GiB one is created. -# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% The swap partition size rules are no different than for other Linux @@ -218,7 +218,7 @@ since this makes the file system configuration independent from device changes. For example: -# mkfs.ext4 -L nixos /dev/sda1 +# mkfs.ext4 -L nixos /dev/sda1 @@ -227,7 +227,7 @@ recommended to assign a label to the swap partition: . For example: -# mkswap -L swap /dev/sda2 +# mkswap -L swap /dev/sda2 @@ -242,7 +242,7 @@ it’s recommended to assign a label to the boot partition: . For example: -# mkfs.fat -F 32 -n boot /dev/sda3 +# mkfs.fat -F 32 -n boot /dev/sda3 @@ -273,7 +273,7 @@ Mount the target file system on which NixOS should be installed on /mnt, e.g. -# mount /dev/disk/by-label/nixos /mnt +# mount /dev/disk/by-label/nixos /mnt @@ -287,8 +287,8 @@ Mount the boot file system on /mnt/boot, e.g. -# mkdir -p /mnt/boot -# mount /dev/disk/by-label/boot /mnt/boot +# mkdir -p /mnt/boot +# mount /dev/disk/by-label/boot /mnt/boot @@ -303,7 +303,7 @@ the build actions that it may spawn) may need quite a bit of RAM, depending on your configuration. -# swapon /dev/sda2 +# swapon /dev/sda2 @@ -325,11 +325,11 @@ The command nixos-generate-config can generate an initial configuration file for you: -# nixos-generate-config --root /mnt +# nixos-generate-config --root /mnt You should then edit /mnt/etc/nixos/configuration.nix to suit your needs: -# nano /mnt/etc/nixos/configuration.nix +# nano /mnt/etc/nixos/configuration.nix If you’re using the graphical ISO image, other editors may be available (such as vim). If you have network access, you can also @@ -412,7 +412,7 @@ Do the installation: -# nixos-install +# nixos-install Cross fingers. If this fails due to a temporary problem (such as a network issue while downloading binaries from the NixOS binary cache), you can just re-run nixos-install. Otherwise, fix your @@ -439,7 +439,7 @@ Retype new UNIX password: *** If everything went well: -# reboot +# reboot @@ -460,16 +460,16 @@ Retype new UNIX password: *** You’ll probably want to create some user accounts as well, which can be done with useradd: -$ useradd -c 'Eelco Dolstra' -m eelco -$ passwd eelco +$ useradd -c 'Eelco Dolstra' -m eelco +$ passwd eelco You may also want to install some software. For instance, -$ nix-env -qa \* +$ nix-env -qa \* shows what packages are available, and -$ nix-env -i w3m +$ nix-env -i w3m install the w3m browser. @@ -489,19 +489,19 @@ $ nix-env -i w3m Example partition schemes for NixOS on <filename>/dev/sda</filename> (MBR) -# parted /dev/sda -- mklabel msdos -# parted /dev/sda -- mkpart primary 1MiB -8GiB -# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% +# parted /dev/sda -- mklabel msdos +# parted /dev/sda -- mkpart primary 1MiB -8GiB +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% Example partition schemes for NixOS on <filename>/dev/sda</filename> (UEFI) -# parted /dev/sda -- mklabel gpt -# parted /dev/sda -- mkpart primary 512MiB -8GiB -# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% -# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB -# parted /dev/sda -- set 3 boot on +# parted /dev/sda -- mklabel gpt +# parted /dev/sda -- mkpart primary 512MiB -8GiB +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% +# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB +# parted /dev/sda -- set 3 boot on @@ -509,17 +509,17 @@ $ nix-env -i w3m With a partitioned disk. -# mkfs.ext4 -L nixos /dev/sda1 -# mkswap -L swap /dev/sda2 -# swapon /dev/sda2 -# mkfs.fat -F 32 -n boot /dev/sda3 # (for UEFI systems only) -# mount /dev/disk/by-label/nixos /mnt -# mkdir -p /mnt/boot # (for UEFI systems only) -# mount /dev/disk/by-label/boot /mnt/boot # (for UEFI systems only) -# nixos-generate-config --root /mnt -# nano /mnt/etc/nixos/configuration.nix -# nixos-install -# reboot +# mkfs.ext4 -L nixos /dev/sda1 +# mkswap -L swap /dev/sda2 +# swapon /dev/sda2 +# mkfs.fat -F 32 -n boot /dev/sda3 # (for UEFI systems only) +# mount /dev/disk/by-label/nixos /mnt +# mkdir -p /mnt/boot # (for UEFI systems only) +# mount /dev/disk/by-label/boot /mnt/boot # (for UEFI systems only) +# nixos-generate-config --root /mnt +# nano /mnt/etc/nixos/configuration.nix +# nixos-install +# reboot diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml index 160ada9fff31..61531a8f01ca 100644 --- a/nixos/doc/manual/man-nixos-generate-config.xml +++ b/nixos/doc/manual/man-nixos-generate-config.xml @@ -13,18 +13,18 @@ - nixos-generate-config + nixos-generate-config - + root - + @@ -154,7 +154,7 @@ file systems on /mnt and /mnt/boot, you would run: -$ nixos-generate-config --root /mnt +$ nixos-generate-config --root /mnt The resulting file /mnt/etc/nixos/hardware-configuration.nix might look @@ -204,7 +204,7 @@ $ nixos-generate-config --root /mnt After installation, if your hardware configuration changes, you can run: -$ nixos-generate-config +$ nixos-generate-config to update /etc/nixos/hardware-configuration.nix. Your /etc/nixos/configuration.nix will diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index 25f4f40613ac..4fb94ee7494c 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -13,72 +13,72 @@ - nixos-install + nixos-install path - + root - + path - + - + - + - + - + - + number - + number - + name value - + - + @@ -255,12 +255,12 @@ on an ext4 file system created in /dev/sda1: -$ mkfs.ext4 /dev/sda1 -$ mount /dev/sda1 /mnt -$ nixos-generate-config --root /mnt -$ # edit /mnt/etc/nixos/configuration.nix -$ nixos-install -$ reboot +$ mkfs.ext4 /dev/sda1 +$ mount /dev/sda1 /mnt +$ nixos-generate-config --root /mnt +$ # edit /mnt/etc/nixos/configuration.nix +$ nixos-install +$ reboot diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml index d436cce742a2..3e316e10d4eb 100644 --- a/nixos/doc/manual/man-nixos-option.xml +++ b/nixos/doc/manual/man-nixos-option.xml @@ -13,19 +13,19 @@ - nixos-option + nixos-option path - + - + - + option.name @@ -103,13 +103,13 @@ Examples Investigate option values: -$ nixos-option boot.loader +$ nixos-option boot.loader This attribute set contains: generationsDir grub initScript -$ nixos-option boot.loader.grub.enable +$ nixos-option boot.loader.grub.enable Value: true diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index 0b0c0b8f6ea2..9cec83f1e28b 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -13,39 +13,39 @@ - nixos-rebuild + nixos-rebuild - + - + - + - + - + - + - + - + @@ -54,33 +54,33 @@ - + - + - + - + - + builder-spec - + - + @@ -160,7 +160,7 @@ the current directory, which points to the output of the top-level “system” derivation. This is essentially the same as doing -$ nix-build /path/to/nixpkgs/nixos -A system +$ nix-build /path/to/nixpkgs/nixos -A system Note that you do not need to be root to run nixos-rebuild build. @@ -215,8 +215,8 @@ $ nix-build /path/to/nixpkgs/nixos -A system at the script that starts the VM. Thus, to test a NixOS configuration in a virtual machine, you should do the following: -$ nixos-rebuild build-vm -$ ./result/bin/run-*-vm +$ nixos-rebuild build-vm +$ ./result/bin/run-*-vm @@ -375,7 +375,7 @@ $ ./result/bin/run-*-vm test.nix without affecting the default system profile, you would do: -$ nixos-rebuild switch -p test -I nixos-config=./test.nix +$ nixos-rebuild switch -p test -I nixos-config=./test.nix The new configuration will appear in the GRUB 2 submenu “NixOS - Profile 'test'”. diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index e500c9d63422..5c4d99701785 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -627,7 +627,7 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc In case of an infinite loop, use the --show-trace command line argument and read the line just above the error message. -$ nixos-rebuild build --show-trace +$ nixos-rebuild build --show-trace … while evaluating the module argument `pkgs' in "/etc/nixos/my-module.nix": infinite recursion encountered diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml index bf4b644c9b86..b0b1ebeab45f 100644 --- a/nixos/modules/services/databases/foundationdb.xml +++ b/nixos/modules/services/databases/foundationdb.xml @@ -47,14 +47,14 @@ services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x After running nixos-rebuild, you can verify whether FoundationDB is running by executing fdbcli (which is added to ): - -$ sudo -u foundationdb fdbcli + +$ sudo -u foundationdb fdbcli Using cluster file `/etc/foundationdb/fdb.cluster'. The database is available. Welcome to the fdbcli. For help, type `help'. -fdb> status +fdb> status Using cluster file `/etc/foundationdb/fdb.cluster'. @@ -72,8 +72,8 @@ Cluster: ... -fdb> - +fdb> + @@ -82,8 +82,8 @@ fdb> cluster status, as a quick example. (This example uses nix-shell shebang support to automatically supply the necessary Python modules). - -a@link> cat fdb-status.py + +a@link> cat fdb-status.py #! /usr/bin/env nix-shell #! nix-shell -i python -p python pythonPackages.foundationdb52 @@ -103,11 +103,11 @@ def main(): if __name__ == "__main__": main() -a@link> chmod +x fdb-status.py -a@link> ./fdb-status.py +a@link> chmod +x fdb-status.py +a@link> ./fdb-status.py FoundationDB available: True -a@link> - +a@link> + @@ -266,10 +266,10 @@ services.foundationdb.dataDir = "/data/fdb"; every node a coordinator automatically: - -fdbcli> configure double ssd -fdbcli> coordinators auto - + +fdbcli> configure double ssd +fdbcli> coordinators auto + This will transparently update all the servers within seconds, and @@ -386,10 +386,10 @@ services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ]; You can now perform a backup: - -$ sudo -u foundationdb fdbbackup start -t default -d file:///opt/fdb-backups -$ sudo -u foundationdb fdbbackup status -t default - + +$ sudo -u foundationdb fdbbackup start -t default -d file:///opt/fdb-backups +$ sudo -u foundationdb fdbbackup status -t default +
Known limitations diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index 14f4d4909bc0..00bb02dcc5bf 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -42,11 +42,11 @@ whether PostgreSQL works by running psql: -$ psql +$ psql psql (9.2.9) Type "help" for help. -alice=> +alice=> --> diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 1ac53c818a7f..88d7c4e1daf0 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -238,8 +238,8 @@ in You can check that it works by executing this in a terminal: -$ nix-build emacs.nix -$ ./result/bin/emacs -q +$ nix-build emacs.nix +$ ./result/bin/emacs -q and then typing M-x package-initialize. Check that you can use all the packages you want in this Emacs instance. For example, try @@ -403,9 +403,9 @@ in [...] To start the daemon, execute the following: -$ nixos-rebuild switch # to activate the new configuration.nix -$ systemctl --user daemon-reload # to force systemd reload -$ systemctl --user start emacs.service # to start the Emacs daemon +$ nixos-rebuild switch # to activate the new configuration.nix +$ systemctl --user daemon-reload # to force systemd reload +$ systemctl --user start emacs.service # to start the Emacs daemon The server should now be ready to serve Emacs clients. diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml index ab99d7bd3a60..5ff570a442f6 100644 --- a/nixos/modules/services/misc/gitlab.xml +++ b/nixos/modules/services/misc/gitlab.xml @@ -138,13 +138,13 @@ services.gitlab = { For example, to backup a Gitlab instance: - -$ sudo -u git -H gitlab-rake gitlab:backup:create - + +$ sudo -u git -H gitlab-rake gitlab:backup:create + A list of all availabe rake tasks can be obtained by running: - -$ sudo -u git -H gitlab-rake -T - + +$ sudo -u git -H gitlab-rake -T +
diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml index 5eac8d9ef784..5656bb85b373 100644 --- a/nixos/modules/services/misc/taskserver/doc.xml +++ b/nixos/modules/services/misc/taskserver/doc.xml @@ -105,7 +105,7 @@ Now in order to import the alice user to another machine alicebox, all we need to do is something like this: -$ ssh server nixos-taskserver user export my-company alice | sh +$ ssh server nixos-taskserver user export my-company alice | sh Of course, if no SSH daemon is available on the server you can also copy & paste it directly into a shell. From a0bbe1aa27f7a0d97813e87087baf16e069c8067 Mon Sep 17 00:00:00 2001 From: Nikola Knezevic Date: Mon, 17 Jun 2019 15:06:02 +0200 Subject: [PATCH 070/106] fswatch: Enable FSEvents API on Darwin On Darwin we can benefit from FSEvents API (that fswatch supports) in order to have better monitoring of file system changes. --- pkgs/development/tools/misc/fswatch/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 0e4af1348902..73de8eb8cb61 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -6,6 +6,7 @@ , libtool , makeWrapper , texinfo +, CoreServices }: stdenv.mkDerivation rec { @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1d1fvm36qgh6a5j9v24wai61d297pvzxr14jngjlhh4i474ff21i"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; buildInputs = [ gettext libtool makeWrapper texinfo ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fecf53c3f4d6..f276ade4029f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9188,7 +9188,9 @@ in fsatrace = callPackage ../development/tools/misc/fsatrace { }; - fswatch = callPackage ../development/tools/misc/fswatch { }; + fswatch = callPackage ../development/tools/misc/fswatch { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; From bffebedb2121d69d7ac2983a0d03202d91bad314 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 13:24:38 -0700 Subject: [PATCH 071/106] drumkv1: 0.9.7 -> 0.9.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/drumkv1/versions --- pkgs/applications/audio/drumkv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index f6430c7ee655..22613da7cabb 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.9.7"; + version = "0.9.8"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "1361dqdasrc98q9hcjdwsjx6agfimwnay430887fryi3pslkyd81"; + sha256 = "010p8nwnmqgj5mw324psig3hxi1g2gylxrigd6sj6sgcpy3kdm23"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; From 1dc837c8cbf9d9d5bcdd488661612a8f5212dca0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 13:17:28 -0700 Subject: [PATCH 072/106] dpkg: 1.19.6 -> 1.19.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dpkg/versions --- pkgs/tools/package-management/dpkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 33620bb51f17..40c9fcc769b2 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.19.6"; + version = "1.19.7"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "0s1pyj7g8ign630biqq1ycjy8cw733fk1dgas9w59mav3wns3caf"; + sha256 = "1s4nlaqz4c3p5r85f4il8m21825sfy2s9wgz4ajhl332vzggw9sc"; }; configureFlags = [ From 29474ece788de3c4652387c861fa9af75d242308 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 11:20:17 -0700 Subject: [PATCH 073/106] cimg: 2.6.4 -> 2.6.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cimg/versions --- pkgs/development/libraries/cimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 4025d386d77b..bffbf4011deb 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "cimg-${version}"; - version = "2.6.4"; + version = "2.6.5"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "0hvr030588jnm5s8zgxvhkg13al83dy6273rbdi801cmgfcwxq29"; + sha256 = "1q409xrri67vqhda6f6jfqnvzj1b3b9xlpi27vm9vl10k2lv4m3a"; }; nativeBuildInputs = [ unzip ]; From 7b2b0187cc0c1192252a0aa7fe4d188fff74258f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 08:01:54 -0700 Subject: [PATCH 074/106] bitwarden_rs-vault: 2.10.0 -> 2.10.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bitwarden_rs-vault/versions --- pkgs/tools/security/bitwarden_rs/vault.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index f5ddfe9ea582..44c8047684fd 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.10.0"; + version = "2.10.1"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "0i0hdh8sxqfyhdv4h696cf595bmkg47bww4ixlvy51h6i14v5pn7"; + sha256 = "1avgxlsxi7mb8zpqai3j1qb43qq09ya5ngb7l4q7mj0d89lxrzhb"; }; buildCommand = '' From 4b4cdb0cf28efac717f56f7c409bd3f80888eb1d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 06:29:34 -0700 Subject: [PATCH 075/106] aravis: 0.6.2 -> 0.6.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/aravis/versions --- pkgs/development/libraries/aravis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index ba68f046b0a0..9d506b10e353 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation rec { pname = "aravis"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "AravisProject"; repo = pname; rev= "ARAVIS_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "0zlmw040iv0xx9qw7ygzbl96bli6ivll2fbziv19f4bdc0yhqjpw"; + sha256 = "0lmgx854z522dwcxsg37bxdyiai9fnycpx1nvgayksj38h39kfn2"; }; outputs = [ "bin" "dev" "out" "lib" ]; From 2779dd85e607d3cba01beae536f4d9f556ce963b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 06:24:44 -0700 Subject: [PATCH 076/106] mod_wsgi: 4.6.5 -> 4.6.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mod_wsgi/versions --- pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 19a9be8e86e8..f51574e68e7d 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mod_wsgi-${version}"; - version = "4.6.5"; + version = "4.6.6"; src = fetchurl { url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; - sha256 = "1q75ifadjd5frr5i2b9swbjiwfv4fr4ny8npsm09w6mjp7w0bgjw"; + sha256 = "1ic5lafqlwpld5jz2irj3yws883xhxldjyyh514w1lad1v085sbq"; }; buildInputs = [ apacheHttpd python2 ]; From 10a25e9b52e11da86ea3c1a29e33d871424feb91 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 07:14:55 -0700 Subject: [PATCH 077/106] bacula: 9.4.3 -> 9.4.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bacula/versions --- pkgs/tools/backup/bacula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index e2a9944bd480..02b37784eaa9 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }: stdenv.mkDerivation rec { - name = "bacula-9.4.3"; + name = "bacula-9.4.4"; src = fetchurl { url = "mirror://sourceforge/bacula/${name}.tar.gz"; - sha256 = "07ablpfc4q7yr6hmff21dssqpg8gvvq2xfnfs9s3danwc321rd2g"; + sha256 = "1gi0zkkzh6a87xk4sm051hwz5bv4qc4kbl6hk40752knr817mqqg"; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] From 2b51328002dd38ff706cecd3855cd502d08c76a1 Mon Sep 17 00:00:00 2001 From: xbreak Date: Mon, 17 Jun 2019 16:23:52 +0200 Subject: [PATCH 078/106] waf: Added support for optional extra tools (#63042) The list of tools `withTools` are included as extra tools when building waf. Example: mywaf = callPackage ../development/tools/build-managers/waf { python = python3; withTools = [ "doxygen" ]; }; --- .../development/tools/build-managers/waf/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index f9dc33a36e0e..c3346ad7e993 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -1,5 +1,11 @@ -{ stdenv, fetchFromGitLab, fetchpatch, python, ensureNewerSourcesForZipFilesHook }: - +{ stdenv, fetchFromGitLab, fetchpatch, python, ensureNewerSourcesForZipFilesHook +# optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]` +, withTools ? null +}: +let + wafToolsArg = with stdenv.lib.strings; + optionalString (!isNull withTools) " --tools=\"${concatStringsSep "," withTools}\""; +in stdenv.mkDerivation rec { name = "waf-${version}"; version = "2.0.15"; @@ -24,7 +30,7 @@ stdenv.mkDerivation rec { python waf-light configure ''; buildPhase = '' - python waf-light build + python waf-light build${wafToolsArg} ''; installPhase = '' install waf $out From 5e6a89de7d9ccae0211b545c63d1bae4d375acf7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 08:28:29 -0700 Subject: [PATCH 079/106] pulseeffects: 4.6.2 -> 4.6.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pulseeffects/versions --- pkgs/applications/audio/pulseeffects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index a84914120c72..b2fd3a52a2d9 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -47,13 +47,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.6.2"; + version = "4.6.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "042qc48h1h8kr4arlbk1psqw6s0cvhspzfi8ih2xqqyifwl1i93g"; + sha256 = "1gp23hpsnbiymbbhn6hp8sg1pnysgf04bj9k4h9dfinbgshlq6m7"; }; nativeBuildInputs = [ From 80e8c6104a335387f8585b21c740908565968530 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 08:45:18 -0700 Subject: [PATCH 080/106] python37Packages.apprise: 0.7.7 -> 0.7.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-apprise/versions --- pkgs/development/python-modules/apprise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 632600a8fe34..e067504987d8 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.7.7"; + version = "0.7.8"; src = fetchPypi { inherit pname version; - sha256 = "c3c7922f7b80107620f541a6c16435485e7045771b3ecfb998deacee0eb90753"; + sha256 = "15xv7lhivjhgsaw5j30w1fkk8y33r8nkr2hwp8z1jmsxhdv9l03y"; }; nativeBuildInputs = [ Babel ]; From 9b98d400d171c1f80cf63fdaac96cf09666d6761 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 10:31:53 -0700 Subject: [PATCH 081/106] python37Packages.django_2_2: 2.2.1 -> 2.2.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-django/versions --- pkgs/development/python-modules/django/2_2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix index 8f3065633a1d..d2d8682ade22 100644 --- a/pkgs/development/python-modules/django/2_2.nix +++ b/pkgs/development/python-modules/django/2_2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.1"; + version = "2.2.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1spa701phl8ha7qmfr89hwpa43kf52zbrs3xyc0rlvxianykrk3g"; + sha256 = "1xbqsa016szsqx6pnggrlxs81169hd8adzmdvp969007xg9k0gbm"; }; patches = stdenv.lib.optional withGdal From 7124645c7fc1739d65998c3b921dcbeef79e2c6c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 17 Jun 2019 19:47:23 +0200 Subject: [PATCH 082/106] html-proofer: 3.10.2 -> 3.11.0 --- pkgs/tools/misc/html-proofer/Gemfile.lock | 14 ++++----- pkgs/tools/misc/html-proofer/gemset.nix | 38 +++++++++++------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index 6441513071f1..d24cac78fab6 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -8,18 +8,17 @@ GEM tzinfo (~> 1.1) addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) - colorize (0.8.1) concurrent-ruby (1.1.5) ethon (0.12.0) ffi (>= 1.3.0) - ffi (1.10.0) - html-proofer (3.10.2) + ffi (1.11.1) + html-proofer (3.11.0) activesupport (>= 4.2, < 6.0) addressable (~> 2.3) - colorize (~> 0.8) mercenary (~> 0.3.2) nokogiri (~> 1.9) parallel (~> 1.3) + rainbow (~> 3.0) typhoeus (~> 1.3) yell (~> 2.0) i18n (1.6.0) @@ -30,13 +29,14 @@ GEM nokogiri (1.10.3) mini_portile2 (~> 2.4.0) parallel (1.17.0) - public_suffix (3.0.3) + public_suffix (3.1.0) + rainbow (3.0.0) thread_safe (0.3.6) typhoeus (1.3.1) ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - yell (2.1.0) + yell (2.2.0) PLATFORMS ruby @@ -45,4 +45,4 @@ DEPENDENCIES html-proofer BUNDLED WITH - 1.17.2 + 1.14.6 diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index 182f75e50c56..1d1991dcd929 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -21,16 +21,6 @@ }; version = "2.6.0"; }; - colorize = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b"; - type = "gem"; - }; - version = "0.8.1"; - }; concurrent-ruby = { groups = ["default"]; platforms = []; @@ -57,21 +47,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.1"; }; html-proofer = { - dependencies = ["activesupport" "addressable" "colorize" "mercenary" "nokogiri" "parallel" "typhoeus" "yell"]; + dependencies = ["activesupport" "addressable" "mercenary" "nokogiri" "parallel" "rainbow" "typhoeus" "yell"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qwy5cdl5l6rl9cqpcydl4126rwv1f4l9ixf3z6j2rdy979l2jaf"; + sha256 = "1ywgnx7g7fv9f0hbm7xrv55qndvhgvbsp247zyrcg8mfgwxcbd66"; type = "gem"; }; - version = "3.10.2"; + version = "3.11.0"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -140,10 +130,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l"; type = "gem"; }; - version = "3.0.3"; + version = "3.1.0"; + }; + rainbow = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + type = "gem"; + }; + version = "3.0.0"; }; thread_safe = { groups = ["default"]; @@ -182,9 +182,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "161kfwyv7aq983m2gd90c67sqcs0p1z6nhjall2mdr7iz0gqf9wn"; + sha256 = "1394pf8wsv4wx2lf1d9iqqx6lcww9bgmgh9sms3dbga804cns0n8"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; } \ No newline at end of file From 3775ef0acd5cc3c7dfff8bf644b5ff9ded7171a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 11:56:12 -0700 Subject: [PATCH 083/106] jmol: 14.29.42 -> 14.29.46 (#63277) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jmol/versions --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index ee184943b7d3..84c01cbfd673 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.29.42"; + version = "14.29.46"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "0fpsicxc6aazmz45q1bgnjfwcdmxmzl9h24hpz2q1gdk9cz5aqnp"; + sha256 = "00ig1f1fz5qbkam0h06vs1gsb95hdqa0iyhsp4qbyjjfxir7m59l"; }; patchPhase = '' From 17c719f7ccdc5dc9b01d268b834c0fafa49793a7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 11:58:14 -0700 Subject: [PATCH 084/106] python37Packages.html5-parser: 0.4.6 -> 0.4.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-html5-parser/versions --- pkgs/development/python-modules/html5-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 2c24d7b9d6a6..a09ed7b94208 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "html5-parser"; - version = "0.4.6"; + version = "0.4.7"; src = fetchPypi { inherit pname version; - sha256 = "0pxcwk5lc8ljil77xqywr0bq1xxj11z92lpfj185ac72d2b1sma5"; + sha256 = "1gzs9fa38m80y509fg58ylwhxgy7w28ww968pi6wmfrih9ib6l93"; }; nativeBuildInputs = [ pkgconfig ]; From 0e6843b46fb5df85ff0d2463bc8dcfab1d36cea3 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Mon, 17 Jun 2019 12:00:57 -0700 Subject: [PATCH 085/106] picolisp: include httpGate tool https://software-lab.de/doc/httpGate.html httpGate is a central element of the PicoLisp application server architecture. Its purpose is to perform the following tasks: * Provide a single application entry port (e.g. 80 or 443). * Allow PicoLisp applications to run as non-root. * Start application servers on demand. * Handle HTTPS/SSL communication. --- pkgs/development/interpreters/picolisp/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index a7e6f6e2dc74..01cffe93024f 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk, w3m, makeWrapper }: +{ stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }: with stdenv.lib; stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "https://www.software-lab.de/${name}.tgz"; sha256 = "0hvgq2vc03bki528jqn95xmvv7mw8xx832spfczhxc16wwbrnrhk"; }; - buildInputs = [makeWrapper] ++ optional stdenv.is64bit jdk; + buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk; patchPhase = '' sed -i "s/which java/command -v java/g" mkAsm @@ -23,6 +23,9 @@ stdenv.mkDerivation rec { ''} ''; sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}''; + postBuild = '' + cd ../src; make gate + ''; installPhase = '' cd .. @@ -30,6 +33,7 @@ stdenv.mkDerivation rec { cp -r . "$out/share/picolisp/build-dir" ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp" ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp" + ln -s "$out/lib/picolisp/bin/httpGate" "$out/bin/httpGate" makeWrapper $out/bin/picolisp $out/bin/pil \ From f4b609bf54e37d87896d9f7a67551e18a7c7ceaf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 00:20:56 -0700 Subject: [PATCH 086/106] lttng-tools: 2.10.6 -> 2.10.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lttng-tools/versions --- pkgs/development/tools/misc/lttng-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index b671a27ac747..42ca1a1b7d54 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lttng-tools-${version}"; - version = "2.10.6"; + version = "2.10.7"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "0z2kh6svszi332012id373bjwzcmzj6fks993f6yi35zpqmzapgh"; + sha256 = "04hkga0hnyjmv42mxj3njaykqmq9x4abd5qfyds5r62x1khfnwgd"; }; nativeBuildInputs = [ pkgconfig ]; From 97b78363e35b1c91279a11ddceb6656083e9ee12 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 01:54:51 -0700 Subject: [PATCH 087/106] munin: 2.0.43 -> 2.0.49 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/munin/versions --- pkgs/servers/monitoring/munin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 5153fcc5ef61..34beada87e82 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.43"; + version = "2.0.49"; name = "munin-${version}"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "1ydhf9hcb3n5h0ss5f1zf9yz4r4njqxazlz931ixvx5gyhj9gq5l"; + sha256 = "13m56wh5cq82pwvv4ngav1zyn2sajxxjigljrz8ycjriw0wvncsf"; }; buildInputs = [ From 48108096250ee491f4171d95270ef8aa5d020b84 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 17 Jun 2019 19:43:41 +0000 Subject: [PATCH 088/106] linux_4_4: 4.4.181 -> 4.4.182 CVE-2019-11477 CVE-2019-11478 CVE-2019-11479 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index f0a78b5fccd6..ed80eabb18ae 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.181"; + version = "4.4.182"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1lw1qsql9dv8dllz6hglahxdfgzg34rpl9c9gwdrpm4j660nkaxj"; + sha256 = "09w5v06c2ghai2pyz04kbhgfnqr22v4dkm9npb5kg6ndc67xh2f4"; }; } // (args.argsOverride or {})) From 9ccdf3c9f546e29df5745950fc1be601214c0320 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 17 Jun 2019 19:43:44 +0000 Subject: [PATCH 089/106] linux_4_9: 4.9.181 -> 4.9.182 CVE-2019-11477 CVE-2019-11478 CVE-2019-11479 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 1b81fef394e6..8433d4478539 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.181"; + version = "4.9.182"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1vgwfjsn31fy0ikcnpaqbw8w0r0xb25xp3633f0258yb24z25kcg"; + sha256 = "15cnk5bmd7kd4ggjzrbs9fpc21wliqdrnfnpg623cf0639l14vmi"; }; } // (args.argsOverride or {})) From 84de6aed790f546b9dc9a4a7190a0c055eae8c9f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 17 Jun 2019 19:43:45 +0000 Subject: [PATCH 090/106] linux_4_14: 4.14.126 -> 4.14.127 CVE-2019-11477 CVE-2019-11478 CVE-2019-11479 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 5b54a86a2761..da4e5dcf1a59 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.126"; + version = "4.14.127"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0w1rccjz3i91jj0hbdwp4vznn0nfzw304fklmcrb2q459m88jbka"; + sha256 = "1cvmxh8habwgfczly0zl780d8sa63xkliy79i9a4dvndg4ilqinp"; }; } // (args.argsOverride or {})) From d5bf0ae8040e1020c7deaf414692bd00056a50d1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 17 Jun 2019 19:43:47 +0000 Subject: [PATCH 091/106] linux_4_19: 4.19.51 -> 4.19.21 CVE-2019-11477 CVE-2019-11478 CVE-2019-11479 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index be7b7ffdb189..415f7f9f97f9 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.51"; + version = "4.19.52"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0w4dbadmh1y3h84ha543qmhckk650b62cl7d7kya733gfw6r5yks"; + sha256 = "07iqlh5p68md4xa83bqcfqcwkzvzhbb706bnjjp8jdhcc9aycvi6"; }; } // (args.argsOverride or {})) From 73e0f13bac20c7ef99391ce759ff1261425b51ca Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 17 Jun 2019 19:43:48 +0000 Subject: [PATCH 092/106] linux_5_1: 5.1.10 -> 5.1.11 CVE-2019-11477 CVE-2019-11478 CVE-2019-11479 --- pkgs/os-specific/linux/kernel/linux-5.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix index 7953e48d019e..e6b7a12ca2ab 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.1.10"; + version = "5.1.11"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1kzvm6zklfri5g3kkkc3qp0kjrlf78qkfn5bkxzcny95ad0k01ir"; + sha256 = "06fjjwbfky1vjf77km8fxvxqil214028njr8mn4j69whf8h97z8i"; }; } // (args.argsOverride or {})) From a7d85f5ae15c4e68f544648c8f275ace39b24547 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 13:08:03 -0700 Subject: [PATCH 093/106] linbox: 1.6.2 -> 1.6.3 (#63288) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/linbox/versions --- pkgs/development/libraries/linbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 500015f61c63..9af0c20d7014 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "linbox"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "linbox-team"; repo = "${pname}"; rev = "v${version}"; - sha256 = "038br15hhc8dc1hq0pkv6vb1qx9hjr7hjv3w9fq9qwkd870h2v1q"; + sha256 = "10j6dspbsq7d2l4q3y0c1l1xwmaqqba2fxg59q5bhgk9h5d7q571"; }; nativeBuildInputs = [ From 7dbb4e22bd87ecddfb6d8c2751cdc3e2ba705f8d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 14:00:56 -0700 Subject: [PATCH 094/106] python37Packages.micawber: 0.4.0 -> 0.4.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-micawber/versions --- pkgs/development/python-modules/micawber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index e3dffbfcb489..d3b5c79e967a 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "micawber"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "2e19cd5e9ce5b8b57714389e4b709af7dedc4f8f44e9df5566a9d3ccefaac38e"; + sha256 = "002g31h4fcrrlfcrcbqa94aggszadm0p91c28n19vgssinmbz0ia"; }; propagatedBuildInputs = [ beautifulsoup4 ]; From e6c575e199a84c471789032576aeaa043d279f11 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 14:53:07 -0700 Subject: [PATCH 095/106] python37Packages.Nuitka: 0.6.3.1 -> 0.6.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-nuitka/versions --- pkgs/development/python-modules/nuitka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index bf5ca3d55830..f825a7eb262d 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -13,13 +13,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.3.1"; + version = "0.6.4"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "0h05krv871ymz55k6lrdlfyqndck6lwyy69dk5v4sakgfd5iawqf"; + sha256 = "18np970h6s97m7j6ymqizq1ylnhb6l5msmxqgnayrllirhg7a8pf"; }; checkInputs = [ vmprof pyqt4 ]; From 23f54782f7cd63d1c078b0129b04d34a41e4656b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 15:35:09 -0700 Subject: [PATCH 096/106] python37Packages.plotly: 3.9.0 -> 3.10.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-plotly/versions --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 55963299f9c8..f5be6ec308e9 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.9.0"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "498c35a2a482f7c7937fc2f3681fec653a0191dd21e40e754a6b774234cd167e"; + sha256 = "164aav7i3ann1lv3xbb76ylpph4hissl0wsnmil1s3m0r7sk7jsx"; }; propagatedBuildInputs = [ From a53e95fccc608c52e6364026d05006b6060e7d45 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 16:38:46 -0700 Subject: [PATCH 097/106] python37Packages.pymc3: 3.6 -> 3.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pymc3/versions --- pkgs/development/python-modules/pymc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index a683c07d3afd..35e5f7aa69a2 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.6"; + version = "3.7"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "c00c0778d2451a348a9508f8b956fe280a0f9affd3f85140ac3948bc2902f5e9"; + sha256 = "0ijna2ghvniryllr56qr4vi4k9q58mq21yx36nj5kg2j17f7rkbr"; }; # No need for coverage stats in Nix builds From 58f93fa3e876e91036ce874947d49424c398284f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 19:28:30 -0700 Subject: [PATCH 098/106] python37Packages.twilio: 6.27.1 -> 6.28.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-twilio/versions --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index d6fed4b9007f..a30c173b68b6 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.27.1"; + version = "6.28.0"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "1yd4cpl4y01d3a956gsdg13vx02rb176wyh7mzr0aznkp38nyw5w"; + sha256 = "161s4nb4hhqgb8kc5wiq3s4jkv9a3fg9vycf5ga804vzfr04zlki"; }; buildInputs = [ nose mock ]; From 56ecd04641a4e540cc748baea175437a3c1e41f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 19:34:55 -0700 Subject: [PATCH 099/106] python37Packages.trustme: 0.5.1 -> 0.5.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-trustme/versions --- pkgs/development/python-modules/trustme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 27831a0359c3..6daa99aca6a6 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "8d12837c6242afe1660dee08d44d96f40c9a5074cc58caf39f8c8fdf4b526529"; + sha256 = "103f8n0c60593r0z8hh1zvk1bagxwnhrv3203xpiiddwqxalr04b"; }; checkInputs = [ pytest pyopenssl service-identity ]; From c9fb683e8d5076ec96cdd6f2ddc03008af5b53ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 18:51:16 -0700 Subject: [PATCH 100/106] python37Packages.sphinxcontrib_plantuml: 0.15 -> 0.17 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-sphinxcontrib-plantuml/versions --- .../python-modules/sphinxcontrib_plantuml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index f66265ba5e06..7e1d08eb21b9 100644 --- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.15"; + version = "0.17"; src = fetchPypi { inherit pname version; - sha256 = "06yl6aiw8gpq3wmi6wxy5lahfgbbmlw6nchq9h1ssi5lipwaxn7a"; + sha256 = "1e388ea0c8bc933adecf438f5243857ca238050a107d2768e5ffb490bbb733d7"; }; # No tests included. @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; - homepage = https://bitbucket.org/birkenfeld/sphinx-contrib; + homepage = "https://github.com/sphinx-contrib/plantuml/"; license = with licenses; [ bsd2 ]; }; From e1cbd3e615156a08cf65db076334d81e205dd247 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Jun 2019 19:07:35 -0700 Subject: [PATCH 101/106] python37Packages.stripe: 2.29.3 -> 2.30.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-stripe/versions --- pkgs/development/python-modules/stripe/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 180ff7580806..9c252aa9ce25 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,8 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi, requests, toml, pytest, pytestcov, pytest-mock, pytest_xdist }: +{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytestcov, pytest-mock, pytest_xdist }: buildPythonPackage rec { pname = "stripe"; - version = "2.29.3"; + version = "2.30.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,14 +10,10 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "73f9af72ef8125e0d1c713177d006f1cbe95602beb3e10cb0b0a4ae358d1ae86"; + sha256 = "de6be07c9e8a350d588278186316f66c72af7036aa5e917d1a924fb875249034"; }; - postPatch = '' - substituteInPlace setup.py --replace "toml>=0.9,<0.10" "toml>=0.9" - ''; - - propagatedBuildInputs = [ toml requests ]; + propagatedBuildInputs = [ requests ]; checkInputs = [ pytest pytestcov pytest-mock pytest_xdist ]; From 93965ed86bed961ed8ea9037f925a4fd2843b8b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 15:48:15 -0700 Subject: [PATCH 102/106] folly: 2019.05.27.00 -> 2019.06.17.00 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/folly/versions --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 00ac6abbc8eb..61a96af618a4 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2019.05.27.00"; + version = "2019.06.17.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "00xacaziqllps069xzg7iz68rj5hr8mj3rbi4shkrr9jq51y9ikj"; + sha256 = "0v639yqk029c585x3140rdfbz3xrdjwc858bqfy4yv31pyrn608l"; }; nativeBuildInputs = [ cmake ]; From 08bb1b5612087e222ad7bced6689fd6842139913 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 10:39:07 -0700 Subject: [PATCH 103/106] buck: 2019.05.22.01 -> 2019.06.17.01 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/buck/versions --- pkgs/development/tools/build-managers/buck/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index 6963ccd161a1..30e88b497ad9 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "buck"; - version = "2019.05.22.01"; + version = "2019.06.17.01"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "1fxprw18kd3cw1lzv4xi1lnbdni06hs4vm9yh0w548rsfn3wnmxq"; + sha256 = "1nmphjxqwp51j16qajgvi853dm7654x1w1737xr81zzpcbjw6qig"; }; patches = [ ./pex-mtime.patch ]; @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://buckbuild.com/; + homepage = "https://buck.build/"; description = "A high-performance build tool"; - maintainers = [ maintainers.jgertm ]; + maintainers = [ maintainers.jgertm maintainers.marsam ]; license = licenses.asl20; platforms = platforms.all; }; From dbb6f70006ac7b565a932d1e8c9fb30d118f6bca Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 12 Jun 2019 08:16:31 +0000 Subject: [PATCH 104/106] coqPackages.bignums: enable for Coq 8.10 --- pkgs/development/coq-modules/bignums/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 14a7f2dc4e24..a074b27ff658 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -17,6 +17,10 @@ let params = { rev = "V8.9.0"; sha256 = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01"; }; + "8.10" = { + rev = "V8.10+beta1"; + sha256 = "1slw227idwjw9a21vj3s6kal22mrmvvlpg8r7xk590ml99bn6404"; + }; }; param = params."${coq.coq-version}"; in From 5e241a691b746d5a7b2bd2c2fa9c0456cd47d2b2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 12 Jun 2019 08:16:37 +0000 Subject: [PATCH 105/106] coqPackages.coqprime: enable for Coq 8.10 --- pkgs/development/coq-modules/coqprime/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index 191812b3f2eb..c67342f1a2f7 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -13,6 +13,7 @@ let params = }; "8.8" = v_8_8; "8.9" = v_8_8; + "8.10" = v_8_8; }; param = params."${coq.coq-version}" ; in From 51ef6acb0bf3dadf85d4f15e9325b5890d063c36 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 18 Jun 2019 09:47:46 +0100 Subject: [PATCH 106/106] pythonPackages.poetry: 0.12.10 -> 0.12.16 --- pkgs/development/python-modules/poetry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 1b593ff0e6c6..9aa3b7eb64a3 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -32,11 +32,11 @@ let in buildPythonPackage rec { pname = "poetry"; - version = "0.12.10"; + version = "0.12.16"; src = fetchPypi { inherit pname version; - sha256 = "00npb0jlimnk4r01zkhfmns4843j1hfhd388s326da5pd8n0dq7l"; + sha256 = "0h4ldchggsh6gli16p1z25c4jj1in3yyzgqf285zidnjc6rlrqc8"; }; postPatch = ''