From c74d784771c9cee62bfd85b302f4568894df291e Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 4 Feb 2022 23:39:25 +0100 Subject: [PATCH 001/106] network-interfaces: use altered interface name for setting use_tempaddr Fixes #86764 --- nixos/modules/tasks/network-interfaces.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 1dac405ac30..f55320162f3 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1438,7 +1438,7 @@ in sysctl-value = tempaddrValues.${cfg.tempAddresses}.sysctl; in '' # enable and prefer IPv6 privacy addresses by default - ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.bash}/bin/sh -c 'echo ${sysctl-value} > /proc/sys/net/ipv6/conf/%k/use_tempaddr'" + ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.bash}/bin/sh -c 'echo ${sysctl-value} > /proc/sys/net/ipv6/conf/$name/use_tempaddr'" ''; }) (pkgs.writeTextFile rec { From c67758484f85a677c346af2fdbdb5d03e92cd2b5 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Sat, 19 Feb 2022 20:56:06 -0300 Subject: [PATCH 002/106] nixos/factorio: add bind address option --- nixos/modules/services/games/factorio.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index 96fcd6d2c8b..ff73d7a46ed 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -53,6 +53,14 @@ in ''; }; + bind = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + The address to which the service should bind. + ''; + }; + admins = mkOption { type = types.listOf types.str; default = []; @@ -241,6 +249,7 @@ in "${cfg.package}/bin/factorio" "--config=${cfg.configFile}" "--port=${toString cfg.port}" + "--bind=${cfg.bind}" "--start-server=${mkSavePath cfg.saveName}" "--server-settings=${serverSettingsFile}" (optionalString (cfg.mods != []) "--mod-directory=${modDir}") From fb6dbccbfadaac68d9175a30089795704866c577 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Sat, 19 Mar 2022 15:14:39 +0100 Subject: [PATCH 003/106] joycond: don't use dkms hid-nintendo on kernel 5.16 or newer The module has since been mainlined into the kernel. See #163929. --- nixos/modules/services/hardware/joycond.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/hardware/joycond.nix b/nixos/modules/services/hardware/joycond.nix index ffef4f8a4e1..d81c1bb6d63 100644 --- a/nixos/modules/services/hardware/joycond.nix +++ b/nixos/modules/services/hardware/joycond.nix @@ -22,13 +22,9 @@ with lib; }; config = mkIf cfg.enable { - environment.systemPackages = [ - kernelPackages.hid-nintendo - cfg.package - ]; + environment.systemPackages = [ cfg.package ]; - boot.extraModulePackages = [ kernelPackages.hid-nintendo ]; - boot.kernelModules = [ "hid_nintendo" ]; + boot.extraModulePackages = optional (versionOlder kernelPackages.kernel.version "5.16") kernelPackages.hid-nintendo; services.udev.packages = [ cfg.package ]; From 12200d74572e1551eae857541a31ae25fa9d6bf8 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Tue, 22 Mar 2022 11:15:02 +0700 Subject: [PATCH 004/106] tonelib-metal: init at 1.1.0 --- .../audio/tonelib-metal/default.nix | 60 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/applications/audio/tonelib-metal/default.nix diff --git a/pkgs/applications/audio/tonelib-metal/default.nix b/pkgs/applications/audio/tonelib-metal/default.nix new file mode 100644 index 00000000000..9acb6982c6a --- /dev/null +++ b/pkgs/applications/audio/tonelib-metal/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, dpkg +, alsa-lib +, freetype +, libglvnd +, mesa +, curl +, libXcursor +, libXinerama +, libXrandr +, libXrender +, libjack2 +}: + +stdenv.mkDerivation rec { + pname = "tonelib-metal"; + version = "1.1.0"; + + src = fetchurl { + url = "https://www.tonelib.net/download/220218/ToneLib-Metal-amd64.deb"; + sha256 = "sha256-F5EKwNQ9f/kdZLFI+QDZHvwevV/vDnxMdSmT/vnX6ug="; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg ]; + + buildInputs = [ + stdenv.cc.cc.lib + alsa-lib + freetype + libglvnd + mesa + ] ++ runtimeDependencies; + + runtimeDependencies = map lib.getLib [ + curl + libXcursor + libXinerama + libXrandr + libXrender + libjack2 + ]; + + unpackCmd = "dpkg -x $curSrc source"; + + installPhase = '' + mv usr $out + substituteInPlace $out/share/applications/ToneLib-Metal.desktop --replace /usr/ $out/ + ''; + + meta = with lib; { + description = "ToneLib Metal – Guitar amp simulator targeted at metal players"; + homepage = "https://tonelib.net/"; + license = licenses.unfree; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 575ca2a4c02..ad6a568d611 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29342,6 +29342,8 @@ with pkgs; tonelib-zoom = callPackage ../applications/audio/tonelib-zoom { }; + tonelib-metal = callPackage ../applications/audio/tonelib-metal { }; + tony = libsForQt514.callPackage ../applications/audio/tony { }; toot = callPackage ../applications/misc/toot { }; From 557e8963e8c7970e280bfbaa9d7e8cae79f98420 Mon Sep 17 00:00:00 2001 From: Rocky Breslow <1774125+rbreslow@users.noreply.github.com> Date: Wed, 23 Mar 2022 10:40:27 -0400 Subject: [PATCH 005/106] maintainers: add rbreslow --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4a66ffa1eaf..5e75f9d6b44 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10283,6 +10283,16 @@ githubId = 16487165; name = "Rafael Basso"; }; + rbreslow = { + name = "Rocky Breslow"; + email = "1774125+rbreslow@users.noreply.github.com"; + github = "rbreslow"; + githubId = 1774125; + keys = [{ + longkeyid = "ed25519/0xA0D32ACCA38B88ED"; + fingerprint = "B5B7 BCA0 EE6F F31E 263A 69E3 A0D3 2ACC A38B 88ED"; + }]; + }; rbrewer = { email = "rwb123@gmail.com"; github = "rbrewer123"; From 7ab1fd262ffae10c85f4100027872d5954e60797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 19 Mar 2022 09:41:32 +0100 Subject: [PATCH 006/106] vimUtils.makeCustomizable: rewrite to include more things The current wrapper only includes vim, gvim and the man pages (optionally). This rewrite distinguishes two scenarios, which I expect cover the majority of use cases: - standalone mode, when `name != "vim"`, means the user already has a vim in scope and only wants to add a customized version with a different name. In this case we only include wrappers for `/bin/*vim`. - non-standalone mode, when `name == "vim"`, means the user expects a normal vim package that uses the specified configuration. In this case we include everything in the original derivation, with wrappers for all the executables that accept a vimrc. --- doc/languages-frameworks/vim.section.md | 5 +- .../from_md/release-notes/rl-2205.section.xml | 48 +++++++ .../manual/release-notes/rl-2205.section.md | 9 ++ .../editors/vim/plugins/vim-utils.nix | 126 ++++++++++-------- 4 files changed, 133 insertions(+), 55 deletions(-) diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index a615d585b15..04cb271a43b 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -18,7 +18,7 @@ Adding custom .vimrc lines can be done using the following code: ```nix vim_configurable.customize { - # `name` specifies the name of the executable and package + # `name` optionally specifies the name of the executable and package name = "vim-with-plugins"; vimrcConfig.customRC = '' @@ -28,6 +28,9 @@ vim_configurable.customize { ``` This configuration is used when Vim is invoked with the command specified as name, in this case `vim-with-plugins`. +You can also omit `name` to customize Vim itself. See the +[definition of `vimUtils.makeCustomizable`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-utils.nix#L408) +for all supported options. For Neovim the `configure` argument can be overridden to achieve the same: diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index fc7cb28ffdf..c128be6423b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -794,6 +794,54 @@ LGPL3+ and BSD3 with optional unfree unRAR licensed code + + + The vim.customize function produced by + vimUtils.makeCustomizable now has a + slightly different interface: + + + + + The wrapper now includes everything in the given Vim + derivation if name is + "vim" (the default). This + makes the wrapManual argument obsolete, + but this behavior can be overriden by setting the + standalone argument. + + + + + All the executables present in the given derivation (or, + in standalone mode, only the + *vim ones) are wrapped. This makes the + wrapGui argument obsolete. + + + + + The vimExecutableName and + gvimExecutableName arguments were + replaced by a single executableName + argument in which the shell variable + $exe can be used to refer to the + wrapped executable’s name. + + + + + See the comments in + pkgs/applications/editors/vim/plugins/vim-utils.nix + for more details. + + + vimUtils.vimWithRC was removed. You should + instead use customize on a Vim derivation, + which now accepts vimrcFile and + gvimrcFile arguments. + + tilp2 was removed together with its module diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 2ff5865b735..b00a4781c4c 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -315,6 +315,15 @@ In addition to numerous new and upgraded packages, this release has the followin - `pkgs._7zz` is now correctly licensed as LGPL3+ and BSD3 with optional unfree unRAR licensed code +- The `vim.customize` function produced by `vimUtils.makeCustomizable` now has a slightly different interface: + * The wrapper now includes everything in the given Vim derivation if `name` is `"vim"` (the default). This makes the `wrapManual` argument obsolete, but this behavior can be overriden by setting the `standalone` argument. + * All the executables present in the given derivation (or, in `standalone` mode, only the `*vim` ones) are wrapped. This makes the `wrapGui` argument obsolete. + * The `vimExecutableName` and `gvimExecutableName` arguments were replaced by a single `executableName` argument in which the shell variable `$exe` can be used to refer to the wrapped executable's name. + + See the comments in `pkgs/applications/editors/vim/plugins/vim-utils.nix` for more details. + + `vimUtils.vimWithRC` was removed. You should instead use `customize` on a Vim derivation, which now accepts `vimrcFile` and `gvimrcFile` arguments. + - `tilp2` was removed together with its module - The F-PROT antivirus (`fprot` package) and its service module were removed because it diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 4183b621435..b291928f25a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -1,5 +1,6 @@ # tests available at pkgs/test/vim -{ lib, stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin +{ lib, stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText +, runCommand, makeWrapper , nix-prefetch-hg, nix-prefetch-git , fetchFromGitHub, runtimeShell , hasLuaModule @@ -16,7 +17,7 @@ Install Vim like this eg using nixos option environment.systemPackages which wil vim-with-plugins in PATH: vim_configurable.customize { - name = "vim-with-plugins"; + name = "vim-with-plugins"; # optional # add custom .vimrc lines like this: vimrcConfig.customRC = '' @@ -404,64 +405,81 @@ rec { inherit vimrcContent; inherit packDir; - # shell script with custom name passing [-u vimrc] [-U gvimrc] to vim - vimWithRC = { - vimExecutable, - gvimExecutable, - vimManPages, - wrapManual, - wrapGui, - name ? "vim", - vimrcFile ? null, - gvimrcFile ? null, - vimExecutableName, - gvimExecutableName, - }: - let - rcOption = o: file: lib.optionalString (file != null) "-${o} ${file}"; - vimWrapperScript = writeScriptBin vimExecutableName '' - #!${runtimeShell} - exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" - ''; - gvimWrapperScript = writeScriptBin gvimExecutableName '' - #!${stdenv.shell} - exec ${gvimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" - ''; - in - buildEnv { - inherit name; - paths = [ - vimWrapperScript - ] ++ lib.optional wrapGui gvimWrapperScript - ++ lib.optional wrapManual vimManPages - ; - }; + makeCustomizable = let + mkVimrcFile = vimrcFile; # avoid conflict with argument name + in vim: vim // { + # Returns a customized vim that uses the specified vimrc configuration. + customize = + { # The name of the derivation. + name ? "vim" + , # A shell word used to specify the names of the customized executables. + # The shell variable $exe can be used to refer to the wrapped executable's name. + # Examples: "my-$exe", "$exe-with-plugins", "\${exe/vim/v1m}" + executableName ? + if lib.hasInfix "vim" name then + lib.replaceStrings [ "vim" ] [ "$exe" ] name + else + "\${exe/vim/${lib.escapeShellArg name}}" + , # A custom vimrc configuration, treated as an argument to vimrcContent (see the documentation in this file). + vimrcConfig ? null + , # A custom vimrc file. + vimrcFile ? null + , # A custom gvimrc file. + gvimrcFile ? null + , # If set to true, return the *vim wrappers only. + # If set to false, overlay the wrappers on top of the original vim derivation. + # This ensures that things like man pages and .desktop files are available. + standalone ? name != "vim" && wrapManual != true - # add a customize option to a vim derivation - makeCustomizable = vim: vim // { - customize = { - name, - vimrcConfig, - wrapManual ? true, - wrapGui ? false, - vimExecutableName ? name, - gvimExecutableName ? (lib.concatStrings [ "g" name ]), - }: vimWithRC { - vimExecutable = "${vim}/bin/vim"; - gvimExecutable = "${vim}/bin/gvim"; - inherit name wrapManual wrapGui vimExecutableName gvimExecutableName; - vimrcFile = vimrcFile vimrcConfig; - vimManPages = buildEnv { - name = "vim-doc"; - paths = [ vim ]; - pathsToLink = [ "/share/man" ]; - }; - }; + , # deprecated arguments (TODO: remove eventually) + wrapManual ? null, wrapGui ? null, vimExecutableName ? null, gvimExecutableName ? null, + }: + lib.warnIf (wrapManual != null) '' + vim.customize: wrapManual is deprecated: the manual is now included by default if `name == "vim"`. + ${if wrapManual == true && name != "vim" then "Set `standalone = false` to include the manual." + else if wrapManual == false && name == "vim" then "Set `standalone = true` to get the *vim wrappers only." + else ""}'' + lib.warnIf (wrapGui != null) + "vim.customize: wrapGui is deprecated: gvim is now automatically included if present" + lib.throwIfNot (vimExecutableName == null && gvimExecutableName == null) + "vim.customize: (g)vimExecutableName is deprecated: use executableName instead (see source code for examples)" + (let + vimrc = + if vimrcFile != null then vimrcFile + else if vimrcConfig != null then mkVimrcFile vimrcConfig + else throw "at least one of vimrcConfig and vimrcFile must be specified"; + bin = runCommand "${name}-bin" { buildInputs = [ makeWrapper ]; } '' + vimrc=${lib.escapeShellArg vimrc} + gvimrc=${if gvimrcFile != null then lib.escapeShellArg gvimrcFile else ""} + + mkdir -p "$out/bin" + for exe in ${ + if standalone then "{,g,r,rg,e}vim {,g}vimdiff" + else "{,g,r,rg,e}{vim,view} {,g}vimdiff ex" + }; do + if [[ -e ${vim}/bin/$exe ]]; then + dest="$out/bin/${executableName}" + if [[ -e $dest ]]; then + echo "ambiguous executableName: ''${dest##*/} already exists" + continue + fi + makeWrapper ${vim}/bin/"$exe" "$dest" \ + --add-flags "-u ''${vimrc@Q} ''${gvimrc:+-U ''${gvimrc@Q}}" + fi + done + ''; + in if standalone then bin else + buildEnv { + inherit name; + paths = [ (lib.lowPrio vim) bin ]; + }); override = f: makeCustomizable (vim.override f); overrideAttrs = f: makeCustomizable (vim.overrideAttrs f); }; + vimWithRC = throw "vimWithRC was removed, please use vim.customize instead"; + pluginnames2Nix = {name, namefiles} : vim_configurable.customize { inherit name; vimrcConfig.vam.knownPlugins = vimPlugins; From 65a6e2cb0df39aafa8d14b1b5e752688d0ba9290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 19 Mar 2022 20:04:20 +0100 Subject: [PATCH 007/106] vim_configurable: don't rewrap See discussion at https://github.com/NixOS/nixpkgs/commit/40dea2488fec71f6224944c1b9dae280c2fcc2dc#commitcomment-68982753 Also remove the patchelf call on gvim since it's a symlink now. --- .../applications/editors/vim/configurable.nix | 36 ++++--------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 01561f4c272..9f17bfa767e 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -3,7 +3,7 @@ , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE , vimPlugins -, makeWrapper +, makeWrapper, makeBinaryWrapper , wrapGAppsHook , runtimeShell @@ -134,7 +134,9 @@ in stdenv.mkDerivation rec { ++ lib.optional wrapPythonDrv makeWrapper ++ lib.optional nlsSupport gettext ++ lib.optional perlSupport perl - ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook + # Make the inner wrapper binary to avoid double wrapping issues with wrapPythonDrv + # (https://github.com/NixOS/nixpkgs/pull/164163) + ++ lib.optional (guiSupport == "gtk3") (wrapGAppsHook.override { makeWrapper = makeBinaryWrapper; }) ; buildInputs = [ @@ -177,37 +179,13 @@ in stdenv.mkDerivation rec { patchelf --set-rpath \ "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ "$out"/bin/vim - if [[ -e "$out"/bin/gvim ]]; then - patchelf --set-rpath \ - "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ - "$out"/bin/gvim - fi ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc - '' + lib.optionalString wrapPythonDrv '' + ''; + + postFixup = lib.optionalString wrapPythonDrv '' wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin" \ --set NIX_PYTHONPATH "${python3}/${python3.sitePackages}" - '' + lib.optionalString (guiSupport == "gtk3") '' - - rewrap () { - rm -f "$out/bin/$1" - echo -e '#!${runtimeShell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1" - chmod a+x "$out/bin/$1" - } - - rewrap ex -e - rewrap view -R - rewrap gvim -g - rewrap gex -eg - rewrap gview -Rg - rewrap rvim -Z - rewrap rview -RZ - rewrap rgvim -gZ - rewrap rgview -RgZ - rewrap evim -y - rewrap eview -yR - rewrap vimdiff -d - rewrap gvimdiff -gd ''; dontStrip = true; From 0eb92176bf486dab758ce55c494623f24937e45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 19 Mar 2022 22:56:44 +0100 Subject: [PATCH 008/106] vim_configurable: don't accept arbitrary arguments This hides potential errors. --- pkgs/applications/editors/vim/configurable.nix | 1 - pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 9f17bfa767e..b436c5db5b2 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -25,7 +25,6 @@ , ximSupport ? config.vim.xim or true # less than 15KB, needed for deadkeys , darwinSupport ? config.vim.darwin or false # Enable Darwin support , ftNixSupport ? config.vim.ftNix or true # Add .nix filetype detection and minimal syntax highlighting support -, ... }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8e159718ce..62a8598c8ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24717,7 +24717,7 @@ with pkgs; assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { }; astroid = callPackage ../applications/networking/mailreaders/astroid { - vim = vim_configurable.override { features = "normal"; gui = "auto"; }; + vim = vim_configurable.override { features = "normal"; }; }; aucatctl = callPackage ../applications/audio/aucatctl { }; @@ -29721,8 +29721,6 @@ with pkgs; vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; inherit (darwin) libobjc; - gtk2 = if stdenv.isDarwin then gtk2-x11 else gtk2; - gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; }); vim-darwin = (vim_configurable.override { From e6ff028cfa9990336a9ae4ee094c1513d7796d83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 20 Mar 2022 10:55:20 +0100 Subject: [PATCH 009/106] vim_configurable: drop patchelf It doesn't seem to change the RPATH even with all features enabled. --- pkgs/applications/editors/vim/configurable.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index b436c5db5b2..bc317b91597 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -175,10 +175,6 @@ in stdenv.mkDerivation rec { postInstall = '' ln -s $out/bin/vim $out/bin/vi '' + lib.optionalString stdenv.isLinux '' - patchelf --set-rpath \ - "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ - "$out"/bin/vim - ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc ''; From 21e45db6f1b196678e967b516a0761922bdf5dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 19 Mar 2022 20:03:47 +0100 Subject: [PATCH 010/106] vim: make customizable --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62a8598c8ea..f91166a3bc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29706,9 +29706,9 @@ with pkgs; veusz = libsForQt5.callPackage ../applications/graphics/veusz { }; - vim = callPackage ../applications/editors/vim { + vim = vimUtils.makeCustomizable (callPackage ../applications/editors/vim { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; + }); vimiv = callPackage ../applications/graphics/vimiv { }; From b84f13964d35651fb7bde47ba4b0088f98f8b6e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Mar 2022 23:06:50 +0000 Subject: [PATCH 011/106] gotify-desktop: 1.2.0 -> 1.3.1 --- pkgs/tools/misc/gotify-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gotify-desktop/default.nix b/pkgs/tools/misc/gotify-desktop/default.nix index 1da729c706d..e34afda9424 100644 --- a/pkgs/tools/misc/gotify-desktop/default.nix +++ b/pkgs/tools/misc/gotify-desktop/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gotify-desktop"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "desbma"; repo = pname; rev = version; - sha256 = "sha256-QQpZeXFv8BqFOQ+7ANWmtsgNlMakAL2ML4rlG2cFZJE="; + sha256 = "sha256-EDLOSxmODC7OzVSZJxwKNnFA2yh+QKE8aXmYJ+Dnv40="; }; - cargoSha256 = "sha256-zcSAsI/yGGJer7SPKDKZ6NQ3UgTdBcDighS6VTNITMo="; + cargoSha256 = "sha256-opSXndOjdmYG5DJ3CDUHWhN6O7AQp4Cleldzq1Hfr1o="; nativeBuildInputs = [ pkg-config ]; From cb1c5dbb15f1c2f0802007c7ac661d371d00babf Mon Sep 17 00:00:00 2001 From: Roland Synnestvedt Date: Sat, 26 Mar 2022 17:53:26 -0700 Subject: [PATCH 012/106] nixos/unifi-video: convert int to string in default command --- nixos/modules/services/video/unifi-video.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/video/unifi-video.nix b/nixos/modules/services/video/unifi-video.nix index 43208a9fe4c..366a7111fde 100644 --- a/nixos/modules/services/video/unifi-video.nix +++ b/nixos/modules/services/video/unifi-video.nix @@ -16,7 +16,7 @@ let -pidfile ${cfg.pidFile} \ -procname unifi-video \ -Djava.security.egd=file:/dev/./urandom \ - -Xmx${cfg.maximumJavaHeapSize}M \ + -Xmx${toString cfg.maximumJavaHeapSize}M \ -Xss512K \ -XX:+UseG1GC \ -XX:+UseStringDeduplication \ From 95a3f6ad266c1a340630bbdb4787e202bf9bd883 Mon Sep 17 00:00:00 2001 From: Roland Synnestvedt Date: Sat, 26 Mar 2022 17:59:54 -0700 Subject: [PATCH 013/106] nixos/unifi-video: rename openPorts to openFirewall --- nixos/modules/services/video/unifi-video.nix | 24 +++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/video/unifi-video.nix b/nixos/modules/services/video/unifi-video.nix index 366a7111fde..53acb9d79b9 100644 --- a/nixos/modules/services/video/unifi-video.nix +++ b/nixos/modules/services/video/unifi-video.nix @@ -145,13 +145,6 @@ in ''; }; - openPorts = mkOption { - type = types.bool; - default = true; - description = '' - Whether or not to open the required ports on the firewall. - ''; - }; maximumJavaHeapSize = mkOption { type = types.nullOr types.int; @@ -168,6 +161,13 @@ in defaultText = literalExpression ''"''${config.${opt.dataDir}}/unifi-video.pid"''; description = "Location of unifi-video pid file."; }; + openFirewall = mkOption { + type = types.bool; + default = true; + description = '' + Whether or not to open the required ports on the firewall. + ''; + }; }; @@ -182,7 +182,7 @@ config = mkIf cfg.enable { groups.unifi-video = {}; }; - networking.firewall = mkIf cfg.openPorts { + networking.firewall = mkIf cfg.openFirewall { # https://help.ui.com/hc/en-us/articles/217875218-UniFi-Video-Ports-Used allowedTCPPorts = [ 7080 # HTTP portal @@ -261,7 +261,9 @@ config = mkIf cfg.enable { }; - meta = { - maintainers = with lib.maintainers; [ rsynnest ]; - }; + imports = [ + (mkRenamedOptionModule [ "services" "unifi-video" "openPorts" ] [ "services" "unifi-video" "openFirewall" ]) + ]; + + meta.maintainers = with lib.maintainers; [ rsynnest ]; } From 76a6908a09c8187215cb28515ed58ad34b04b350 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Mar 2022 09:19:53 +0000 Subject: [PATCH 014/106] monit: 5.31.0 -> 5.32.0 --- pkgs/tools/system/monit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 0f116c04618..4fe7f995e84 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "monit"; - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { url = "${meta.homepage}dist/monit-${version}.tar.gz"; - sha256 = "sha256-6ucfKJQftmPux0waWbaVRsZZUpeWVQvZwMVE6bUqwFU="; + sha256 = "sha256-EHcFLUxOhIrEfRT5s3dU1GQZrsvoyaB+H4ackU+vMhY="; }; nativeBuildInputs = [ bison flex ]; From d3fb4568b3e963bb3843cb43c1b6e58f122b66b8 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 27 Mar 2022 17:15:21 +0200 Subject: [PATCH 015/106] monit: don't abuse meta.homepage --- pkgs/tools/system/monit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 4fe7f995e84..93fc74f0554 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "5.32.0"; src = fetchurl { - url = "${meta.homepage}dist/monit-${version}.tar.gz"; + url = "https://mmonit.com/monit/dist/monit-${version}.tar.gz"; sha256 = "sha256-EHcFLUxOhIrEfRT5s3dU1GQZrsvoyaB+H4ackU+vMhY="; }; From 60e62c36df25e882d73881a627b8cd6816340bee Mon Sep 17 00:00:00 2001 From: Roland Synnestvedt Date: Sun, 27 Mar 2022 13:39:19 -0700 Subject: [PATCH 016/106] nixos/unifi-video: clean up indentation and formatting --- nixos/modules/services/video/unifi-video.nix | 138 +++++++++---------- 1 file changed, 68 insertions(+), 70 deletions(-) diff --git a/nixos/modules/services/video/unifi-video.nix b/nixos/modules/services/video/unifi-video.nix index 53acb9d79b9..7456736c8b2 100644 --- a/nixos/modules/services/video/unifi-video.nix +++ b/nixos/modules/services/video/unifi-video.nix @@ -91,76 +91,61 @@ let stateDir = "/var/lib/unifi-video"; in - { +{ - options.services.unifi-video = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether or not to enable the unifi-video service. - ''; - }; + options.services.unifi-video = { - jrePackage = mkOption { - type = types.package; - default = pkgs.jre8; - defaultText = literalExpression "pkgs.jre8"; - description = '' - The JRE package to use. Check the release notes to ensure it is supported. - ''; - }; + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether or not to enable the unifi-video service. + ''; + }; - unifiVideoPackage = mkOption { - type = types.package; - default = pkgs.unifi-video; - defaultText = literalExpression "pkgs.unifi-video"; - description = '' - The unifi-video package to use. - ''; - }; + jrePackage = mkOption { + type = types.package; + default = pkgs.jre8; + defaultText = literalExpression "pkgs.jre8"; + description = '' + The JRE package to use. Check the release notes to ensure it is supported. + ''; + }; - mongodbPackage = mkOption { - type = types.package; - default = pkgs.mongodb-4_0; - defaultText = literalExpression "pkgs.mongodb"; - description = '' - The mongodb package to use. - ''; - }; + unifiVideoPackage = mkOption { + type = types.package; + default = pkgs.unifi-video; + defaultText = literalExpression "pkgs.unifi-video"; + description = '' + The unifi-video package to use. + ''; + }; - logDir = mkOption { - type = types.str; - default = "${stateDir}/logs"; - description = '' - Where to store the logs. - ''; - }; + mongodbPackage = mkOption { + type = types.package; + default = pkgs.mongodb-4_0; + defaultText = literalExpression "pkgs.mongodb"; + description = '' + The mongodb package to use. + ''; + }; - dataDir = mkOption { - type = types.str; - default = "${stateDir}/data"; - description = '' - Where to store the database and other data. - ''; - }; + logDir = mkOption { + type = types.str; + default = "${stateDir}/logs"; + description = '' + Where to store the logs. + ''; + }; + dataDir = mkOption { + type = types.str; + default = "${stateDir}/data"; + description = '' + Where to store the database and other data. + ''; + }; - maximumJavaHeapSize = mkOption { - type = types.nullOr types.int; - default = 1024; - example = 4096; - description = '' - Set the maximimum heap size for the JVM in MB. - ''; - }; - - pidFile = mkOption { - type = types.path; - default = "${cfg.dataDir}/unifi-video.pid"; - defaultText = literalExpression ''"''${config.${opt.dataDir}}/unifi-video.pid"''; - description = "Location of unifi-video pid file."; - }; openFirewall = mkOption { type = types.bool; default = true; @@ -169,18 +154,33 @@ in ''; }; -}; + maximumJavaHeapSize = mkOption { + type = types.nullOr types.int; + default = 1024; + example = 4096; + description = '' + Set the maximimum heap size for the JVM in MB. + ''; + }; -config = mkIf cfg.enable { - users = { - users.unifi-video = { + pidFile = mkOption { + type = types.path; + default = "${cfg.dataDir}/unifi-video.pid"; + defaultText = literalExpression ''"''${config.${opt.dataDir}}/unifi-video.pid"''; + description = "Location of unifi-video pid file."; + }; + + }; + + config = mkIf cfg.enable { + + users.users.unifi-video = { description = "UniFi Video controller daemon user"; home = stateDir; group = "unifi-video"; isSystemUser = true; }; - groups.unifi-video = {}; - }; + users.groups.unifi-video = {}; networking.firewall = mkIf cfg.openFirewall { # https://help.ui.com/hc/en-us/articles/217875218-UniFi-Video-Ports-Used @@ -237,7 +237,6 @@ config = mkIf cfg.enable { "L+ '${stateDir}/conf/server.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/server.xml" "L+ '${stateDir}/conf/tomcat-users.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/tomcat-users.xml" "L+ '${stateDir}/conf/web.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/web.xml" - ]; systemd.services.unifi-video = { @@ -258,7 +257,6 @@ config = mkIf cfg.enable { WorkingDirectory = "${stateDir}"; }; }; - }; imports = [ From 83712ae183c16f789e605e2c5e1e40dfa5862fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 20:55:44 +0200 Subject: [PATCH 017/106] python39Packages.google-auth-oauthlib: 0.4.6 -> 0.5.1 --- .../python-modules/google-auth-oauthlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 1d23af5a3d4..6ee0cb06540 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.4.6"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qQoHL2mT8sMnBnv2UnAEY4TNpajssguU6ppofx8jOno="; + sha256 = "sha256-MFlrgk/GgI/ayi8EjkmYzED7SzWZ6upm0o3HCFs2xbg="; }; propagatedBuildInputs = [ From 8923ef18cf3d8c1f2e4d61700c5246edb8c8fe0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Mar 2022 12:27:02 +0200 Subject: [PATCH 018/106] python39Packages.tensorflow-tensorboard: relax version constraint --- .../python-modules/tensorflow-tensorboard/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index ceebad2a476..a4a04d89856 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -42,7 +42,8 @@ buildPythonPackage rec { pushd unpacked/tensorboard-${version} substituteInPlace tensorboard-${version}.dist-info/METADATA \ - --replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)" + --replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)" \ + --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<0.6,>=0.4.1)" popd wheel pack ./unpacked/tensorboard-${version} From fd50b86920839582243c3ef62e43b32ce7f945e4 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 7 Mar 2022 21:33:13 +0100 Subject: [PATCH 019/106] flycast: init at 1.2 --- .../emulators/flycast/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/applications/emulators/flycast/default.nix diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/applications/emulators/flycast/default.nix new file mode 100644 index 00000000000..67ba4590db6 --- /dev/null +++ b/pkgs/applications/emulators/flycast/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, alsa-lib +, libX11 +, libevdev +, udev +, libpulseaudio +, SDL2 +, libzip +, miniupnpc +}: + +stdenv.mkDerivation rec { + pname = "flycast"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "flyinghead"; + repo = "flycast"; + rev = "v${version}"; + sha256 = "sha256-MzHAGK++oukIs84OR/l6gBwCJssdi8Iyte5Rtro2+Q0="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + alsa-lib + libX11 + libevdev + udev + libpulseaudio + SDL2 + libzip + miniupnpc + ]; + + meta = with lib; { + homepage = "https://github.com/flyinghead/flycast"; + changelog = "https://github.com/flyinghead/flycast/releases/tag/v${version}"; + description = "A multi-platform Sega Dreamcast, Naomi and Atomiswave emulator"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7889ac2919f..a73e2e47711 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12145,6 +12145,8 @@ with pkgs; flasm = callPackage ../development/compilers/flasm { }; + flycast = callPackage ../applications/emulators/flycast { }; + flyctl = callPackage ../development/web/flyctl { }; fluidd = callPackage ../applications/misc/fluidd { }; From 6e822b50dfe52a53fb1ca257465691ddffdc659b Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 7 Mar 2022 21:38:25 +0100 Subject: [PATCH 020/106] reicast: remove Reicast is unmaintained, and the upstream repository has been archived. Use the maintained fork flycast instead. --- .../emulators/reicast/default.nix | 52 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 pkgs/applications/emulators/reicast/default.nix diff --git a/pkgs/applications/emulators/reicast/default.nix b/pkgs/applications/emulators/reicast/default.nix deleted file mode 100644 index f9e8e4d6937..00000000000 --- a/pkgs/applications/emulators/reicast/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, curl -, alsa-lib -, libGLU -, libX11 -, libevdev -, udev -, libpulseaudio -}: - -stdenv.mkDerivation rec { - pname = "reicast"; - version = "20.04"; - - src = fetchFromGitHub { - owner = "reicast"; - repo = "reicast-emulator"; - rev = "r${version}"; - sha256 = "0vz3b1hg1qj6nycnqq5zcpzqpcbxw1c2ffamia5z3x7rapjx5d71"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ - curl - alsa-lib - libGLU - libX11 - libevdev - udev - libpulseaudio - ]; - - # No rule to make target 'install' - installPhase = '' - runHook preInstall - - install -D ./reicast $out/bin/reicast - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://reicast.com/"; - description = "A multi-platform Sega Dreamcast emulator"; - license = with licenses; [ bsd3 gpl2Only lgpl2Only ]; - platforms = ["x86_64-linux" ]; - maintainers = [ maintainers.ivar ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a793fa063f9..20cb6183bcd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1010,6 +1010,7 @@ mapAliases ({ readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # Added 2021-04-22 redkite = throw "redkite was archived by upstream"; # Added 2021-04-12 redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25 + reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07 renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2"; # Added 2022-01-12 residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27 retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a73e2e47711..4be745c8988 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9470,8 +9470,6 @@ with pkgs; repseek = callPackage ../applications/science/biology/repseek { }; - reicast = callPackage ../applications/emulators/reicast { }; - reredirect = callPackage ../tools/misc/reredirect { }; retext = libsForQt5.callPackage ../applications/editors/retext { }; From c75a58bb927d010f90c66f54999d42e5a93c1f6c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 28 Mar 2022 22:29:15 +0800 Subject: [PATCH 021/106] bless: fix build with meson 0.61 doc/user/meson.build:73:6: ERROR: Program 'itstool' not found or not executable --- pkgs/applications/editors/bless/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/bless/default.nix b/pkgs/applications/editors/bless/default.nix index e613747aeab..c40a44bbb46 100644 --- a/pkgs/applications/editors/bless/default.nix +++ b/pkgs/applications/editors/bless/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , pkg-config , mono @@ -12,6 +13,7 @@ , libxslt , docbook_xsl , python3 +, itstool }: stdenv.mkDerivation rec { @@ -47,6 +49,7 @@ stdenv.mkDerivation rec { libxslt docbook_xsl python3 + itstool ]; preFixup = '' From bcdb2fdee603dd13066f184b0fe6c2b744752428 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 28 Mar 2022 22:52:26 +0800 Subject: [PATCH 022/106] mate.mate-backgrounds: fix build with meson 0.61 abstract/meson.build:3:5: ERROR: Function does not take positional arguments. --- pkgs/desktops/mate/mate-backgrounds/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 9384d49e2a3..3076a7170cb 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, mateUpdateScript }: +{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-backgrounds"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0379hngy3ap1r5kmqvmzs9r710k2c9nal2ps3hq765df4ir15j8d"; }; + patches = [ + # Fix build with meson 0.61, can be removed on next update. + # https://github.com/mate-desktop/mate-backgrounds/pull/39 + (fetchpatch { + url = "https://github.com/mate-desktop/mate-backgrounds/commit/0096e237d420e6247a75a1c6940a818e309ac2a7.patch"; + sha256 = "HEF8VWunFO+NCG18fZA7lbE2l8pc6Z3jcD+rSZ1Jsqg="; + }) + ]; + nativeBuildInputs = [ gettext meson From a8aaeb6e5379f8b6455fa1072822de0c8099bbbe Mon Sep 17 00:00:00 2001 From: Konstantin Bogdanov Date: Fri, 18 Mar 2022 17:15:31 +0100 Subject: [PATCH 023/106] clickhouse 21.8.12.29 -> 22.3.2.2 --- pkgs/servers/clickhouse/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 7 ++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index be067e477a8..793ee917966 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "clickhouse"; - version = "21.8.12.29"; + version = "22.3.2.2"; broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685 @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "ClickHouse"; rev = "v${version}-lts"; fetchSubmodules = true; - sha256 = "1qqacb7v7mhr9k162yll8mcbh0cxa347f5hypz0a8l54v1dz5fyl"; + sha256 = "0rhzgm0gvwpx4h5xyr7y393y7s9slcr4a7grw9316f5m70frxg2v"; }; nativeBuildInputs = [ cmake libtool llvm-bintools ninja ]; @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { --replace 'git rev-parse --show-toplevel' '$src' substituteInPlace utils/check-style/check-ungrouped-includes.sh \ --replace 'git rev-parse --show-toplevel' '$src' - substituteInPlace utils/generate-ya-make/generate-ya-make.sh \ - --replace 'git rev-parse --show-toplevel' '$src' substituteInPlace utils/list-licenses/list-licenses.sh \ --replace 'git rev-parse --show-toplevel' '$src' substituteInPlace utils/check-style/check-style \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1584e5c0d9..6bce869fbb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21177,9 +21177,10 @@ with pkgs; clamsmtp = callPackage ../servers/mail/clamsmtp { }; clickhouse = callPackage ../servers/clickhouse { - # upstream requires llvm10 as of v20.11.4.13 - inherit (llvmPackages_10) clang-unwrapped lld llvm; - llvm-bintools = llvmPackages_10.bintools; + # upstream requires llvm12 as of v22.3.2.2 + inherit (llvmPackages_12) clang-unwrapped lld llvm; + llvm-bintools = llvmPackages_12.bintools; + stdenv = llvmPackages_12.stdenv; }; clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; From 58f636511e753e04ff07d43dc54bfbeec086e305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Mar 2022 17:23:41 +0200 Subject: [PATCH 024/106] python27Packages.pathlib2: fix build --- pkgs/development/python-modules/pathlib2/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index bbaff273102..86d3ed87166 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -5,7 +5,8 @@ , pythonOlder , scandir ? null , glibcLocales -, mock ? null +, mock +, typing }: buildPythonPackage rec { @@ -17,8 +18,10 @@ buildPythonPackage rec { sha256 = "sha256-n+DtrYmLg8DD4ZnIQrJ+0hZkXS4Xd1ey3Wc4TUETxkE="; }; - propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; - checkInputs = [ glibcLocales ] ++ lib.optional (pythonOlder "3.3") mock; + propagatedBuildInputs = [ six ] + ++ lib.optionals (pythonOlder "3.5") [ scandir typing ]; + checkInputs = [ glibcLocales ] + ++ lib.optional (pythonOlder "3.3") mock; preCheck = '' export LC_ALL="en_US.UTF-8" From c1a3665786ab5670a94953fa2b3801bfe72e9ea0 Mon Sep 17 00:00:00 2001 From: David Worms Date: Mon, 28 Mar 2022 18:18:05 +0200 Subject: [PATCH 025/106] dancing-script: init at 2.0 Notes, version is coming from the .glyphs source file and is called 2.000 in the readme https://raw.githubusercontent.com/impallari/DancingScript/master/sources/DancingScript.glyphs --- maintainers/maintainer-list.nix | 6 +++++ pkgs/data/fonts/dancing-script/default.nix | 27 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/data/fonts/dancing-script/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d1f6dbdc9ae..ede634608d9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13215,6 +13215,12 @@ githubId = 34962284; name = "wchresta"; }; + wdavidw = { + name = "David Worms"; + email = "david@adaltas.com"; + github = "wdavidw"; + githubId = 46896; + }; wedens = { email = "kirill.wedens@gmail.com"; name = "wedens"; diff --git a/pkgs/data/fonts/dancing-script/default.nix b/pkgs/data/fonts/dancing-script/default.nix new file mode 100644 index 00000000000..5129f4bc5a5 --- /dev/null +++ b/pkgs/data/fonts/dancing-script/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub }: + +let + pname = "dancing-script"; + version = "2.0"; +in fetchFromGitHub { + name = "${pname}-${version}"; + + owner = "impallari"; + repo = "DancingScript"; + rev = "f7f54bc1b8836601dae8696666bfacd306f77e34"; + sha256 = "dfFvh8h+oMhAQL9XKMrNr07VUkdQdxAsA8+q27KWWCA="; + + postFetch = '' + tar xf $downloadedFile --strip=1 + install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf + ''; + + meta = with lib; { + description = "Dancing Script"; + longDescription = "A lively casual script where the letters bounce and change size slightly."; + homepage = "https://github.com/impallari/DancingScript"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ wdavidw ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8576f032457..27544a735d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2844,6 +2844,8 @@ with pkgs; damon = callPackage ../tools/admin/damon { }; + dancing-script = callPackage ../data/fonts/dancing-script { }; + dante = callPackage ../servers/dante { }; dapr-cli = callPackage ../development/tools/dapr/cli {}; From 603e9d7b6483e43fd7d1742875d278bd7c3dff87 Mon Sep 17 00:00:00 2001 From: Rocky Breslow <1774125+rbreslow@users.noreply.github.com> Date: Wed, 23 Mar 2022 10:41:58 -0400 Subject: [PATCH 026/106] flywheel-cli: init at 16.2.0 --- .../science/biology/flywheel-cli/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/science/biology/flywheel-cli/default.nix diff --git a/pkgs/applications/science/biology/flywheel-cli/default.nix b/pkgs/applications/science/biology/flywheel-cli/default.nix new file mode 100644 index 00000000000..7db8b006626 --- /dev/null +++ b/pkgs/applications/science/biology/flywheel-cli/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchurl +, unzip +}: + +let + inherit (stdenv.targetPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + os = { + x86_64-darwin = "darwin"; + x86_64-linux = "linux"; + }.${system} or throwSystem; + + sha256 = { + x86_64-darwin = "sha256-OIyEu3Hsobui9s5+T9nC10SxMw0MhgmTA4SN9Ridyzo="; + x86_64-linux = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78="; + }.${system} or throwSystem; +in +stdenv.mkDerivation rec { + pname = "flywheel-cli"; + version = "16.2.0"; + + src = fetchurl { + url = "https://storage.googleapis.com/flywheel-dist/cli/${version}/fw-${os}_amd64-${version}.zip"; + inherit sha256; + }; + + nativeBuildInputs = [ unzip ]; + + unpackPhase = '' + unzip ${src} + ''; + + installPhase = '' + runHook preInstall + install -Dt $out/bin ./${os}_amd64/fw + runHook postInstall + ''; + + meta = with lib; { + description = "Library and command line interface for interacting with a Flywheel site"; + homepage = "https://gitlab.com/flywheel-io/public/python-cli"; + license = licenses.mit; + maintainers = with maintainers; [ rbreslow ]; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5ee3327e03..969317d33f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32209,6 +32209,8 @@ with pkgs; febio-studio = libsForQt5.callPackage ../applications/science/biology/febio-studio { }; + flywheel-cli = callPackage ../applications/science/biology/flywheel-cli { }; + hisat2 = callPackage ../applications/science/biology/hisat2 { }; htslib = callPackage ../development/libraries/science/biology/htslib { }; From e87b6f72d11ff413b7647681c8c84b6474b6be37 Mon Sep 17 00:00:00 2001 From: "Aaron L. Zeng" Date: Mon, 28 Mar 2022 12:20:05 -0400 Subject: [PATCH 027/106] ocamlPackages.{macaddr,ipaddr}: 5.2.0 -> 5.3.0 --- pkgs/development/ocaml-modules/macaddr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index f81529ed3a2..4f5790fdc0c 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -4,15 +4,15 @@ buildDunePackage rec { pname = "macaddr"; - version = "5.2.0"; + version = "5.3.0"; useDune2 = true; minimumOCamlVersion = "4.04"; src = fetchurl { - url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-v${version}.tbz"; - sha256 = "f98d237cc1f783a0ba7dff0c6c69b5f519fec056950e3e3e7c15e5511ee5b7ec"; + url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz"; + sha256 = "0mdp38mkvk2f5h2q7nb9fc70a8hyssblnl7kam0d8r5lckgrx5rn"; }; checkInputs = [ ppx_sexp_conv ounit ]; From 4ced0ddc9825f535d7365636e987432283d67d69 Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Mon, 28 Mar 2022 19:21:29 -0300 Subject: [PATCH 028/106] clojure-lsp: 2022.02.23-12.12.12 -> 2022.03.26-18.47.08 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 6a372fb40f1..4d39387991b 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.02.23-12.12.12"; + version = "2022.03.26-18.47.08"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-PfO1G66Z3zQ+Hyjb6J0bomsT8juQURwF2mPKJY5auMw="; + sha256 = "sha256-tlI4h9/DTc3JwqCM58YC5x4FDpuPm7Qeik3PJe64nVA="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "sha256-f8bEALl9j0aDkKZtThLTseqibeYIUeOx4ulelPWQkoo="; + sha256 = "4973f5cf45f0b8120206d057d88d6a7fca03e071c8ad1ecd7229db46a0604ed2"; }; extraNativeImageBuildArgs = [ @@ -42,9 +42,9 @@ buildGraalvmNativeImage rec { latest_version=$(curl -s https://api.github.com/repos/clojure-lsp/clojure-lsp/releases/latest | jq --raw-output .tag_name) - old_jar_hash=$(nix-instantiate --eval --strict -A "clojure-lsp-standalone.jar.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g') + old_jar_hash=$(nix-instantiate --eval --strict -A "clojure-lsp.jar.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g') - curl -o clojure-lsp.jar -sL https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp-standalone.jar + curl -o clojure-lsp-standalone.jar -sL https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp-standalone.jar new_jar_hash=$(nix-hash --flat --type sha256 clojure-lsp-standalone.jar | sed -re 's|[+]|\\&|g') rm -f clojure-lsp-standalone.jar From d56a4c822c7c05ca1e69c80a12bd038703dcc0ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Mar 2022 23:18:48 +0000 Subject: [PATCH 029/106] traefik: 2.6.1 -> 2.6.2 --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 2b764f39bf3..2dbed400650 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.6.1"; + version = "2.6.2"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-uaROz7DQcy5FlR9/U/QmanqA1qJPJj/ix725Gnei2U0="; + sha256 = "sha256-DVmszzDre0pWXARUqXuqGfY3pX1Ijh33G0Gsdmp8f98="; stripRoot = false; }; - vendorSha256 = "sha256-H67oCOCkS/xpkCZ4C3BuIzpUKuLvItDqC4tNSNKjv0E="; + vendorSha256 = "sha256-tqrfCpZ/fRYZBZ/SBAvvJebLBeD2M/AVJEPiseehJHY="; doCheck = false; From e994ca8597bf837b249347f1f575718f55f95dbe Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Mon, 28 Mar 2022 17:40:43 -0600 Subject: [PATCH 030/106] sslmate-agent: init at 1.99.11 --- .../tools/sslmate-agent/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/tools/sslmate-agent/default.nix diff --git a/pkgs/development/tools/sslmate-agent/default.nix b/pkgs/development/tools/sslmate-agent/default.nix new file mode 100644 index 00000000000..ecbaeb816f0 --- /dev/null +++ b/pkgs/development/tools/sslmate-agent/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook }: + +stdenv.mkDerivation rec { + pname = "sslmate-agent"; + version = "1.99.11"; + + src = fetchurl { + url = "https://packages.sslmate.com/debian/pool/sslmate2/s/sslmate-client/${pname}_${version}-1_amd64.deb"; + sha256 = "sha256-LBiZI0pGAFWnvTigEhtkhHq4FGdbYiMzjLheMuP0YTU="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + ]; + + unpackCmd = '' + dpkg-deb -x ${src} ./sslmate-agent-${pname} + ''; + + installPhase = '' + runHook preInstall + + # Not moving etc because it only contains init.rd setttings + mv usr $out + mv lib $out + + substituteInPlace $out/lib/systemd/system/sslmate-agent.service \ + --replace "/usr/s" "$out/" + + runHook postInstall + ''; + + meta = with lib; { + description = "Daemon for managing SSL/TLS certificates on a server"; + homepage = "https://sslmate.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40672ae4dd5..45f5097c165 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10229,6 +10229,8 @@ with pkgs; sslmate = callPackage ../development/tools/sslmate { }; + sslmate-agent = callPackage ../development/tools/sslmate-agent { }; + sshoogr = callPackage ../tools/networking/sshoogr { }; ssmtp = callPackage ../tools/networking/ssmtp { }; From f24ae9654df290aeace55bfdf522b97ada707e3b Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Mon, 28 Mar 2022 17:41:18 -0600 Subject: [PATCH 031/106] nixos/sslmate-agent: init --- .../services/security/sslmate-agent.nix | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 nixos/modules/services/security/sslmate-agent.nix diff --git a/nixos/modules/services/security/sslmate-agent.nix b/nixos/modules/services/security/sslmate-agent.nix new file mode 100644 index 00000000000..c850eb22a03 --- /dev/null +++ b/nixos/modules/services/security/sslmate-agent.nix @@ -0,0 +1,32 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.sslmate-agent; + +in { + meta.maintainers = with maintainers; [ wolfangaukang ]; + + options = { + services.sslmate-agent = { + enable = mkEnableOption "sslmate-agent, a daemon for managing SSL/TLS certificates on a server"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ sslmate-agent ]; + + systemd = { + packages = [ pkgs.sslmate-agent ]; + services.sslmate-agent = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ConfigurationDirectory = "sslmate-agent"; + LogsDirectory = "sslmate-agent"; + StateDirectory = "sslmate-agent"; + }; + }; + }; + }; +} From 351ce2ecfea82033036f8bb0d26c604f827fc2c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Mar 2022 23:57:24 +0000 Subject: [PATCH 032/106] tilt: 0.26.2 -> 0.26.3 --- pkgs/applications/networking/cluster/tilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 35ca7464df7..c13c08c44a4 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.26.2"; + version = "0.26.3"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UYvTsoNJwH8DOa/Ns9QlckcMVf/+k9/5UX8gO/el0jw="; + sha256 = "sha256-jrVf6vNlEkTgALS93o3kIiticvsyFHm5oA2Fh1edAGY="; }; vendorSha256 = null; From b69780ecdb4093d31f18f438580934a49d8f68ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Mar 2022 23:59:52 +0000 Subject: [PATCH 033/106] python310Packages.jsbeautifier: 1.14.0 -> 1.14.1 --- pkgs/development/python-modules/jsbeautifier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index a0818e1e571..ad98ea38b3b 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.14.0"; + version = "1.14.1"; propagatedBuildInputs = [ six editorconfig ]; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "84fdb008d8af89619269a6aca702288b48f837a99427a0f529aa57ecfb36ee3c"; + sha256 = "sha256-ZfT3dLDkywIutJmbRc1ndi92Qnxe80CCq6VLwdjvI+s="; }; meta = with lib; { From 7ef7e3092bccd4fdd664c59b895aa311b55dca45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Mar 2022 00:50:42 +0000 Subject: [PATCH 034/106] python310Packages.mypy-boto3-builder: 7.5.3 -> 7.5.4 --- .../development/python-modules/mypy-boto3-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index c0e0fd56aa1..a9e4a3eed5c 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.5.3"; + version = "7.5.4"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - hash = "sha256-nG4V2xA5nZfprMjiP+QePHelE0ZvryYH+kCfobKpAMQ="; + hash = "sha256-NS8lFetL/8hcvCnIHw+GDtdEKFsN81MPybEA4PGaP/Q="; }; nativeBuildInputs = [ From b0c31dc06f79a77897310000a0a09ff0076398dd Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 28 Mar 2022 16:03:33 -0700 Subject: [PATCH 035/106] python3Packages.wandb: disable failing test on darwin --- pkgs/development/python-modules/wandb/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index ef8e6cfd247..7f21877f1fb 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -114,6 +114,10 @@ buildPythonPackage rec { "tests/test_tables.py" ]; + # Disable test that fails on darwin due to issue with python3Packages.psutil: + # https://github.com/giampaolo/psutil/issues/1219 + disabledTests = lib.optional stdenv.isDarwin "test_tpu_system_stats"; + checkInputs = [ azure-core bokeh From 6de6d6009a3ad380824ba154bae8a3ac87f159d0 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 24 Feb 2022 13:20:41 -0800 Subject: [PATCH 036/106] openai: add python3Packages.wandb dependency --- pkgs/development/python-modules/openai/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 4fb744826b7..a8b65ea5894 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -9,6 +9,7 @@ , pandas-stubs , requests , tqdm +, wandb # Check dependencies , pytest-mock @@ -35,6 +36,7 @@ buildPythonPackage rec { pandas-stubs requests tqdm + wandb ]; pythonImportsCheck = [ "openai" ]; From 33b04f2a80aa6a4556a0cbc102f82c2b8d788fe0 Mon Sep 17 00:00:00 2001 From: Roland Synnestvedt Date: Mon, 28 Mar 2022 09:20:53 -0700 Subject: [PATCH 037/106] nixos/unifi-video: add deprecation warning for openFirewall --- .../doc/manual/from_md/release-notes/rl-2205.section.xml | 9 +++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 3 +++ nixos/modules/services/video/unifi-video.nix | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 66f2ac7ae26..bc37478ddbb 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1210,6 +1210,15 @@ using this default will print a warning when rebuilt. + + + The services.unifi-video.openPorts option + default value of true is now deprecated and + will be changed to false in 22.11. + Configurations using this default will print a warning when + rebuilt. + + security.acme certificates will now diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 01893993955..288f6c045f5 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -454,6 +454,9 @@ In addition to numerous new and upgraded packages, this release has the followin - The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11. Configurations using this default will print a warning when rebuilt. +- The `services.unifi-video.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11. + Configurations using this default will print a warning when rebuilt. + - `security.acme` certificates will now correctly check for CA revokation before reaching their minimum age. diff --git a/nixos/modules/services/video/unifi-video.nix b/nixos/modules/services/video/unifi-video.nix index 7456736c8b2..11d9fe30547 100644 --- a/nixos/modules/services/video/unifi-video.nix +++ b/nixos/modules/services/video/unifi-video.nix @@ -174,6 +174,10 @@ in config = mkIf cfg.enable { + warnings = optional + (options.services.unifi-video.openFirewall.highestPrio >= (mkOptionDefault null).priority) + "The current services.unifi-video.openFirewall = true default is deprecated and will change to false in 22.11. Set it explicitly to silence this warning."; + users.users.unifi-video = { description = "UniFi Video controller daemon user"; home = stateDir; From 0bc4ac64dbdd9549bde7245ed9e5e6a8e28b4ee8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 29 Mar 2022 10:57:01 +0800 Subject: [PATCH 038/106] bless: disable tests via mesonFlags --- pkgs/applications/editors/bless/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/bless/default.nix b/pkgs/applications/editors/bless/default.nix index c40a44bbb46..f79d7279231 100644 --- a/pkgs/applications/editors/bless/default.nix +++ b/pkgs/applications/editors/bless/default.nix @@ -27,11 +27,6 @@ stdenv.mkDerivation rec { hash = "sha256-rS+vJX0y9v1TiPsRfABroHiTuENQKEOxNsyKwagRuHM="; }; - postPatch = '' - sed "s|get_option('tests')|false|g" -i meson.build - patchShebangs . - ''; - buildInputs = [ gtk-sharp-2_0 mono @@ -52,6 +47,14 @@ stdenv.mkDerivation rec { itstool ]; + mesonFlags = [ + "-Dtests=false" # requires NUnit + ]; + + postPatch = '' + patchShebangs . + ''; + preFixup = '' MPATH="${gtk-sharp-2_0}/lib/mono/gtk-sharp-2.0:${glib.out}/lib:${gtk2-x11}/lib:${gtk-sharp-2_0}/lib" wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH" --prefix PATH : ${lib.makeBinPath [ mono ]} From 93fb6f2bbc9d59c358ce1d455fe4bc4388825997 Mon Sep 17 00:00:00 2001 From: Joel Date: Tue, 29 Mar 2022 14:37:53 +1000 Subject: [PATCH 039/106] obsidian: 0.13.31 -> 0.14.2 https://github.com/obsidianmd/obsidian-releases/releases/tag/v0.14.2 filename for darwin needed updating (obsidian -> Obsidian) --- pkgs/applications/misc/obsidian/default.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 813ef5a8577..3dad5c84695 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "0.13.31"; + version = "0.14.2"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; @@ -21,23 +21,12 @@ let maintainers = with maintainers; [ conradmearns zaninime opeik ]; }; + filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { - url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}${extension}"; - inherit sha256; + url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; + sha256 = if stdenv.isDarwin then "128kgqkf54ljkglwqa6i0qnfqhhmsv7hwbaqnml95n5dzyxrbm4s" else "00gip6pvkbywywlx71j87sxyh8yhkd36i1ydncbpnhsplr6smsq3"; }; - sha256 = rec { - x86_64-linux = "v3Zm5y8V1KyWDQeJxhryBojz56OTT7gfT+pLGDUD4zs="; - x86_64-darwin = "m/81uuDhMJJ1tHTUPww+xNdwsaYCOmeNtbjdwMAwhBU="; - aarch64-darwin = x86_64-darwin; - }.${system}; - - extension = rec { - x86_64-linux = ".tar.gz"; - x86_64-darwin = "-universal.dmg"; - aarch64-darwin = x86_64-darwin; - }.${system}; - linux = stdenv.mkDerivation rec { icon = fetchurl { url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; From 9ec6f8fc9bb351c4ab47de9666763d602b9d68c2 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 29 Mar 2022 00:38:38 -0500 Subject: [PATCH 040/106] fac-build: fix darwin build --- pkgs/development/tools/build-managers/fac/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix index b6481c621e9..ae5a5b30146 100644 --- a/pkgs/development/tools/build-managers/fac/default.nix +++ b/pkgs/development/tools/build-managers/fac/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchCrate, git }: +{ lib, stdenv, rustPlatform, fetchCrate, git, CoreServices }: rustPlatform.buildRustPackage rec { pname = "fac-build"; @@ -10,6 +10,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+JJVuKUdnjJoQJ4a2EE0O6jZdVoFxPwbPgfD2LfiDPI="; }; + + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; cargoSha256 = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk="; # fac includes a unit test called ls_files_works which assumes it's @@ -40,7 +42,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://physics.oregonstate.edu/~roundyd/fac"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ dpercy ]; mainProgram = "fac"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fa2d5eb471..fca9768b378 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34999,7 +34999,9 @@ with pkgs; unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; - fac-build = callPackage ../development/tools/build-managers/fac {}; + fac-build = callPackage ../development/tools/build-managers/fac { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; treefmt = callPackage ../development/tools/treefmt { }; From aeb65012faef8aa9329b4caccfab94fda0684c77 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 Mar 2022 06:30:59 +0200 Subject: [PATCH 041/106] ocamlPackages.{macaddr,ipaddr}: minor cleaning --- pkgs/development/ocaml-modules/ipaddr/cstruct.nix | 2 +- pkgs/development/ocaml-modules/ipaddr/default.nix | 2 +- pkgs/development/ocaml-modules/ipaddr/sexp.nix | 2 +- pkgs/development/ocaml-modules/macaddr/cstruct.nix | 4 +--- pkgs/development/ocaml-modules/macaddr/default.nix | 4 +--- pkgs/development/ocaml-modules/macaddr/sexp.nix | 4 +--- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix index d1386230452..c2621584f34 100644 --- a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix +++ b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix @@ -5,7 +5,7 @@ buildDunePackage rec { pname = "ipaddr-cstruct"; - inherit (ipaddr) version src useDune2 minimumOCamlVersion; + inherit (ipaddr) version src; propagatedBuildInputs = [ ipaddr cstruct ]; diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index 3090066c2f4..c4eefb637fb 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "ipaddr"; - inherit (macaddr) version src useDune2 minimumOCamlVersion; + inherit (macaddr) version src; propagatedBuildInputs = [ macaddr domain-name stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/pkgs/development/ocaml-modules/ipaddr/sexp.nix index 1ede3c064ad..373b5a87e49 100644 --- a/pkgs/development/ocaml-modules/ipaddr/sexp.nix +++ b/pkgs/development/ocaml-modules/ipaddr/sexp.nix @@ -5,7 +5,7 @@ buildDunePackage rec { pname = "ipaddr-sexp"; - inherit (ipaddr) version src useDune2 minimumOCamlVersion; + inherit (ipaddr) version src; propagatedBuildInputs = [ ipaddr ]; diff --git a/pkgs/development/ocaml-modules/macaddr/cstruct.nix b/pkgs/development/ocaml-modules/macaddr/cstruct.nix index 14323040892..db543c0574e 100644 --- a/pkgs/development/ocaml-modules/macaddr/cstruct.nix +++ b/pkgs/development/ocaml-modules/macaddr/cstruct.nix @@ -5,9 +5,7 @@ buildDunePackage { pname = "macaddr-cstruct"; - inherit (macaddr) version src minimumOCamlVersion; - - useDune2 = true; + inherit (macaddr) version src; propagatedBuildInputs = [ macaddr cstruct ]; diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index 4f5790fdc0c..7eb74ff064d 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -6,9 +6,7 @@ buildDunePackage rec { pname = "macaddr"; version = "5.3.0"; - useDune2 = true; - - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.04"; src = fetchurl { url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/macaddr/sexp.nix b/pkgs/development/ocaml-modules/macaddr/sexp.nix index 35cc7c6b440..1f03c1326a5 100644 --- a/pkgs/development/ocaml-modules/macaddr/sexp.nix +++ b/pkgs/development/ocaml-modules/macaddr/sexp.nix @@ -5,9 +5,7 @@ buildDunePackage { pname = "macaddr-sexp"; - inherit (macaddr) version src minimumOCamlVersion; - - useDune2 = true; + inherit (macaddr) version src; propagatedBuildInputs = [ ppx_sexp_conv ]; From 5b45f1458f69c697e9da6235df589f18a2fdb02e Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 29 Mar 2022 01:15:23 -0500 Subject: [PATCH 042/106] picoc: fix darwin build --- pkgs/development/interpreters/picoc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index 2c674754935..47e18cbdcd8 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + postPatch = '' substituteInPlace Makefile --replace '`svnversion -n`' "${version}" ''; @@ -46,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/zsaleeba/picoc"; downloadPage = "https://code.google.com/p/picoc/downloads/list"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; }; } From db282610c604bc0c625121665503b1237b3719bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Mar 2022 08:24:56 +0200 Subject: [PATCH 043/106] python3Packages.jsbeautifier: switch to pytestCheckHook, add pythonImportsCheck --- .../python-modules/jsbeautifier/default.nix | 38 +++++++++++++++---- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index ad98ea38b3b..746619a6144 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -1,21 +1,45 @@ -{ lib, fetchPypi, buildPythonApplication, editorconfig, pytest, six }: +{ lib +, fetchPypi +, buildPythonApplication +, editorconfig +, pytestCheckHook +, pythonOlder +, six +}: buildPythonApplication rec { pname = "jsbeautifier"; version = "1.14.1"; + format = "setuptools"; - propagatedBuildInputs = [ six editorconfig ]; - checkInputs = [ pytest ]; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZfT3dLDkywIutJmbRc1ndi92Qnxe80CCq6VLwdjvI+s="; + hash = "sha256-ZfT3dLDkywIutJmbRc1ndi92Qnxe80CCq6VLwdjvI+s="; }; + propagatedBuildInputs = [ + editorconfig + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "jsbeautifier" + ]; + + pytestFlagsArray = [ + "jsbeautifier/tests/testindentation.py" + ]; + meta = with lib; { - homepage = "http://jsbeautifier.org"; - description = "JavaScript unobfuscator and beautifier."; - license = licenses.mit; + description = "JavaScript unobfuscator and beautifier"; + homepage = "http://jsbeautifier.org"; + license = licenses.mit; maintainers = with maintainers; [ apeyroux ]; }; } From 4a0bc9ae527a6a72da4e37afd865e90f6352f717 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Mar 2022 06:35:22 +0000 Subject: [PATCH 044/106] python310Packages.azure-keyvault-certificates: 4.3.0 -> 4.4.0 --- .../python-modules/azure-keyvault-certificates/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index f1a6c5359d6..7e6a39fb351 100644 --- a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-keyvault-certificates"; - version = "4.3.0"; + version = "4.4.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "4e0a9bae9fd4c222617fbce6b31f97e2e0622774479de3c387239cbfbb828d87"; + sha256 = "sha256-DAFU84AbI4Tdf6TtYDZvSwrpERxf/MqHjQU2igBLh88="; }; propagatedBuildInputs = [ From 69ec8f29f583715e15049fe8dc46bc0fd70e69b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Mar 2022 08:42:04 +0200 Subject: [PATCH 045/106] python3Packages.sense-energy: 0.10.3 -> 0.10.4 --- pkgs/development/python-modules/sense-energy/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index d5e9b4da0eb..b3f2d695570 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , aiohttp +, pythonOlder , requests , websocket-client , websockets @@ -9,14 +10,16 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.10.3"; + version = "0.10.4"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "scottbonline"; repo = "sense"; rev = version; - hash = "sha256-oekzLnEQleJPYO6QI2EwflXsbnrQVbqXQOZOnCfEHdg="; + hash = "sha256-yflI17lLZMXXB0ye+jz3VWWMdZtcBTwbg8deA4ENmWw="; }; propagatedBuildInputs = [ From 92a37b613cda93a3eeea5d71c596afbb7dc8141f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Mar 2022 08:51:57 +0200 Subject: [PATCH 046/106] python3Packages.rokuecp: 0.15.0 -> 0.16.0 --- pkgs/development/python-modules/rokuecp/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 358c2ed600e..fefec51c2bc 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -6,7 +6,7 @@ , buildPythonPackage , cachetools , fetchFromGitHub -, poetry +, poetry-core , pytest-asyncio , pytestCheckHook , pythonOlder @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.15.0"; + version = "0.16.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,12 +25,11 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = version; - hash = "sha256-yNmnCoHIBlpQCLd+YcsKCKd1wWh8WZNpILWmChZGWH4="; + hash = "sha256-MeugjIZorwO8d0Yb7bthI6f4NNo6GX9JrRbxrVSdWv0="; }; nativeBuildInputs = [ - # Requires poetry not poetry-core - poetry + poetry-core ]; propagatedBuildInputs = [ @@ -50,12 +49,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' \ --replace " --cov" "" ''; disabledTests = [ - # https://github.com/ctalkington/python-rokuecp/issues/249 + # Network related tests are having troube in the sandbox "test_resolve_hostname" + "test_get_dns_state" # Assertion issue "test_guess_stream_format" ]; From 790d23bf71787e649a3dbf901a32445aec4870a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Mar 2022 06:55:00 +0000 Subject: [PATCH 047/106] python310Packages.pyrogram: 1.4.9 -> 1.4.12 --- pkgs/development/python-modules/pyrogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 0bafd17a8eb..971b8015a41 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "1.4.9"; + version = "1.4.12"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "Pyrogram"; inherit version; - hash = "sha256-iAPzQDHRyFl8m/23zTGOFXA3v5ONU5BGp7KT1ZSywA4="; + hash = "sha256-rNGdWnZuhCU0Kg/CkeNjazKb76h8/VanZdF4yi0KWGU="; }; propagatedBuildInputs = [ From 90d6045851f2086701e4dafedd66216e79af3ac9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Mar 2022 08:55:38 +0200 Subject: [PATCH 048/106] python3Packages.azure-keyvault-certificates: disable on older Python releases --- .../azure-keyvault-certificates/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index 7e6a39fb351..4dba9f408b8 100644 --- a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -5,16 +5,20 @@ , azure-core , msrest , msrestazure +, pythonOlder }: buildPythonPackage rec { pname = "azure-keyvault-certificates"; version = "4.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-DAFU84AbI4Tdf6TtYDZvSwrpERxf/MqHjQU2igBLh88="; + hash = "sha256-DAFU84AbI4Tdf6TtYDZvSwrpERxf/MqHjQU2igBLh88="; }; propagatedBuildInputs = [ @@ -24,11 +28,16 @@ buildPythonPackage rec { msrestazure ]; - pythonNamespaces = [ "azure.keyvault" ]; + pythonNamespaces = [ + "azure.keyvault" + ]; # has no tests doCheck = false; - pythonImportsCheck = [ "azure.keyvault.certificates" ]; + + pythonImportsCheck = [ + "azure.keyvault.certificates" + ]; meta = with lib; { description = "Microsoft Azure Key Vault Certificates Client Library for Python"; From 9dde893c70ecde505e900764e076c6714cfd7537 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Mar 2022 08:59:35 +0200 Subject: [PATCH 049/106] python3Packages.aioairzone: 0.2.0 -> 0.2.1 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index f17ff4f71c6..cda625d4953 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = version; - hash = "sha256-jMmPACC8eVDYqBI2642R/ChKFObmK+yWRzRBQUmi1C0="; + hash = "sha256-R5OK/B7fq15lpt8nKECiHMmfK9xmiLPtoKC65C7H/7c="; }; propagatedBuildInputs = [ From 1c48b0f89609e7dc242d0ad20477cb9355ea3bf3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 Mar 2022 08:17:54 +0200 Subject: [PATCH 050/106] ocamlPackages.mimic: remove spurious dependencies --- pkgs/development/ocaml-modules/mimic/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/mimic/default.nix b/pkgs/development/ocaml-modules/mimic/default.nix index 69d6d97da5e..348a1b39cdd 100644 --- a/pkgs/development/ocaml-modules/mimic/default.nix +++ b/pkgs/development/ocaml-modules/mimic/default.nix @@ -1,14 +1,13 @@ { lib, buildDunePackage, fetchurl -, fmt, mirage-flow, result, rresult, cstruct, logs, ke, lwt -, alcotest, alcotest-lwt, bigstringaf, bigarray-compat +, fmt, mirage-flow, cstruct, logs, ke, lwt +, alcotest, alcotest-lwt, bigstringaf }: buildDunePackage rec { pname = "mimic"; version = "0.0.4"; - minimumOCamlVersion = "4.08"; - useDune2 = true; + minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz"; @@ -19,8 +18,6 @@ buildDunePackage rec { fmt lwt mirage-flow - result - rresult logs ]; @@ -29,7 +26,6 @@ buildDunePackage rec { alcotest alcotest-lwt bigstringaf - bigarray-compat cstruct ke ]; From d9e7d63cc53ff6cc669168f4ed0bc573bb78d670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 5 Mar 2022 16:07:04 +0100 Subject: [PATCH 051/106] sam-ba: 2.16 -> 3.5 * Much fewer libs needed now. * patchelf works now, so use autoPatchelfHook instead of an LD_LIBRARY_PATH wrapper. * Package is hosted on microchip.com (was atmel.com). * Updated license. --- pkgs/tools/misc/sam-ba/default.nix | 51 ++++++++++++++---------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix index 60853d2cf7e..291063f43cb 100644 --- a/pkgs/tools/misc/sam-ba/default.nix +++ b/pkgs/tools/misc/sam-ba/default.nix @@ -1,40 +1,35 @@ -{ lib, stdenv, fetchzip, libX11, libXScrnSaver, libXext, libXft, libXrender -, freetype, zlib, fontconfig -}: +{ lib, stdenv, fetchzip, glib, zlib, libglvnd, python3, autoPatchelfHook }: -let - maybe64 = if stdenv.isx86_64 then "_64" else ""; - libPath = lib.makeLibraryPath - [ stdenv.cc.cc.lib libX11 libXScrnSaver libXext libXft libXrender freetype - zlib fontconfig - ]; -in stdenv.mkDerivation rec { - version = "2.16"; + version = "3.5"; pname = "sam-ba"; src = fetchzip { - url = "http://www.atmel.com/dyn/resources/prod_documents/sam-ba_${version}_linux.zip"; - sha256 = "18lsi4747900cazq3bf0a87n3pc7751j5papj9sxarjymcz9vks4"; + url = "https://ww1.microchip.com/downloads/en/DeviceDoc/sam-ba_${version}-linux_x86_64.tar.gz"; + sha256 = "1k0nbgyc98z94nphm2q7s82b274clfnayf4a2kv93l5594rzdbp1"; }; - # Pre-built binary package. Install everything to /opt/sam-ba to not mess up - # the internal directory structure. Then create wrapper in /bin. Attemts to - # use "patchelf --set-rpath" instead of setting LD_PRELOAD_PATH failed. + buildInputs = [ + glib + libglvnd + zlib + + (python3.withPackages (ps: [ps.pyserial])) + ]; + + nativeBuildInputs = [ autoPatchelfHook ]; + installPhase = '' + runHook preInstall + mkdir -p "$out/bin/" \ "$out/opt/sam-ba/" cp -a . "$out/opt/sam-ba/" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/opt/sam-ba/sam-ba${maybe64}" - cat > "$out/bin/sam-ba" << EOF - export LD_LIBRARY_PATH="${libPath}" - exec "$out/opt/sam-ba/sam-ba${maybe64}" - EOF - chmod +x "$out/bin/sam-ba" - ''; + ln -sr "$out/opt/sam-ba/sam-ba" "$out/bin/" + ln -sr "$out/opt/sam-ba/multi_sam-ba.py" "$out/bin/" - # Do our own thing - dontPatchELF = true; + runHook postInstall + ''; meta = with lib; { description = "Programming tools for Atmel SAM3/7/9 ARM-based microcontrollers"; @@ -42,10 +37,10 @@ stdenv.mkDerivation rec { Atmel SAM-BA software provides an open set of tools for programming the Atmel SAM3, SAM7 and SAM9 ARM-based microcontrollers. ''; + # Alternatively: https://www.microchip.com/en-us/development-tool/SAM-BA-In-system-Programmer homepage = "http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools"; - # License in /doc/readme.txt - license = "BSD-like (partly binary-only)"; # according to Buildroot - platforms = [ "x86_64-linux" ]; # patchelf fails on i686-linux + license = lib.licenses.gpl2Only; + platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.bjornfor ]; }; } From 9a2de8ca73e84455276d84c044791b7dbc3d77e9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 Mar 2022 10:06:39 +0200 Subject: [PATCH 052/106] =?UTF-8?q?Revert=20"gnome.gnome-color-manager:=20?= =?UTF-8?q?3.32.0=20=E2=86=92=203.36.0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was bumped accidentaly, it removes gcm-calibrate, which is still used gnome-control-center. This reverts commit 133d326efdb7f1f0f98d58c3dc0bdb0a7fa0dd3d. --- pkgs/desktops/gnome/core/gnome-color-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix index 65a9daa5745..dae367f1d5b 100644 --- a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-color-manager"; - version = "3.36.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "nduea2Ry4RmAE4H5CQUzLsHUJYmBchu6gxyiRs6zrTs="; + sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w"; }; nativeBuildInputs = [ From 16b40423732c1ffb728182838422f8a772174e1a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 28 Mar 2022 18:41:22 +0000 Subject: [PATCH 053/106] =?UTF-8?q?gnome.gnome-terminal:=203.43.90=20?= =?UTF-8?q?=E2=86=92=203.44.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-terminal/-/compare/3.43.90...3.44.0 --- pkgs/desktops/gnome/core/gnome-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 719c0eabce1..85918f0e31c 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.43.90"; + version = "3.44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "pQpyOodNNkoP78GfmU2IVUWqYKUdaBimL/kPgv9TydY="; + sha256 = "qpZxie62CUWebApGigHqcMuMRTDaHVALLT9PxDi4/io="; }; nativeBuildInputs = [ From ae92c8f516a90b9bf8d96c7cab77a22134a889f1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 28 Mar 2022 18:41:46 +0000 Subject: [PATCH 054/106] =?UTF-8?q?gnome.yelp:=2042.0=20=E2=86=92=2042.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/yelp/-/compare/42.0...42.1 --- pkgs/desktops/gnome/core/yelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index 3fdf7f3e546..4ae54200d09 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "yelp"; - version = "42.0"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-IIglVqnF29MHWTAkXnA3HGusMOqnpe0Jx9sSfNogE/c="; + sha256 = "sha256-JbEUarhUmIilqNoGf2O0cLDw+AC2roicrNEU0B1xO0E="; }; nativeBuildInputs = [ From 9b7f392f756e55ec9e5bc88f2defee626b1325f3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 28 Mar 2022 18:43:49 +0000 Subject: [PATCH 055/106] =?UTF-8?q?vte:=200.67.90=20=E2=86=92=200.68.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.67.90...0.68.0 --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 9e944208290..16a80011094 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.67.90"; + version = "0.68.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-RkCe1x/DqkfX3DkCSaU+i4E6xsCYvawVFuEL23wg2zg="; + sha256 = "sha256-E+fUeJyiFqM3gAMNJGybE92/0ECUxjFu6n/5IoTdF0k="; }; patches = [ From bb35948c1ccd81a8e3b6165a6b01c7f54523f629 Mon Sep 17 00:00:00 2001 From: timothy <387270+timothyklim@users.noreply.github.com> Date: Tue, 29 Mar 2022 15:40:37 +0700 Subject: [PATCH 056/106] gerrit: 3.4.1 -> 3.5.1 (#166178) --- pkgs/applications/version-management/gerrit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 20b8c3c04d1..ea785bab49b 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "sha256-pHomYKYpV60SIKLoST5y9i3FprMV1VGy+5GjhpRhBUo="; + sha256 = "3fb5de878b6470dc8ef65ce22f2709cb8baecb5f16d89497dfaa33a0f33f7920"; }; buildCommand = '' From 1fff543a34647f34eab621084b160c4bc4dc147e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 10:45:23 +0200 Subject: [PATCH 057/106] neovim: remove with lib over entire file --- pkgs/applications/editors/neovim/neovim-remote.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 2b1281ae21b..50aebf406ba 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,8 +4,6 @@ , neovim }: -with lib; - with python3.pkgs; buildPythonApplication rec { pname = "neovim-remote"; version = "2.4.0"; @@ -35,7 +33,7 @@ with python3.pkgs; buildPythonApplication rec { "test_escape_double_quotes_in_filenames" ]; - meta = { + meta = with lib; { description = "A tool that helps controlling nvim processes from a terminal"; homepage = "https://github.com/mhinz/neovim-remote/"; license = licenses.mit; From 6319376cb644a9741fa9e9383b2f30cd0e5e1df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Mar 2022 17:23:51 +0200 Subject: [PATCH 058/106] python39Packages.pathlib2: update homepage, add SuperSandro2000 as maintainer --- pkgs/development/python-modules/pathlib2/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 86d3ed87166..f0f0163652c 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -27,9 +27,10 @@ buildPythonPackage rec { export LC_ALL="en_US.UTF-8" ''; - meta = { + meta = with lib; { description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems."; - homepage = "https://pypi.python.org/pypi/pathlib2/"; - license = with lib.licenses; [ mit ]; + homepage = "https://pypi.org/project/pathlib2/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 3491c5ea290bca5437845b6348919fcb23950af9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 29 Mar 2022 13:51:26 +1000 Subject: [PATCH 059/106] runc: 1.1.0 -> 1.1.1 https://github.com/opencontainers/runc/releases/tag/v1.1.1 --- pkgs/applications/virtualization/runc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 0dd3da4b37c..e295a51637a 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "runc"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "sha256-svLxxfiRDLWkdRuHXaDyH5Ta6qmptI8z+s41iZKgbWM="; + sha256 = "sha256-6g2km+Y45INo2MTWMFFQFhfF8DAR5Su+YrJS8k3LYBY="; }; vendorSha256 = null; From 9f715a3d31a743630e49d1a8886b0372a305a88a Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 29 Mar 2022 10:53:39 +0200 Subject: [PATCH 060/106] nixos/grafana: Add foldersFromFilesStructure option for dashboard provisioning (#132348) --- nixos/modules/services/monitoring/grafana.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 81fca33f5fe..b959379d331 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -214,6 +214,11 @@ let type = types.path; description = "Path grafana will watch for dashboards."; }; + foldersFromFilesStructure = mkOption { + type = types.bool; + default = false; + description = "Use folder names from filesystem to create folders in Grafana."; + }; }; }; }; From 66d28a38c04dfc53a6d50c4c0803bf05ca8e1caf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Mar 2022 09:06:22 +0000 Subject: [PATCH 061/106] python310Packages.ansible-later: 2.0.6 -> 2.0.8 --- pkgs/development/python-modules/ansible-later/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index 9857c810ddb..9ed54dee25e 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "2.0.6"; + version = "2.0.8"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = pname; rev = "v${version}"; - hash = "sha256-vg9ryzl9ZeOGuFLL1yeJ3vGNPdo3ONmCQozY6DK6miY="; + hash = "sha256-oPlm9uxyN3hyf4gFv37YWEn/HOkg0QQ1Ya3tjLd53rQ="; }; nativeBuildInputs = [ From 54066822a56a217514f9cfce6e66588546be7e48 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 29 Mar 2022 00:11:42 -0500 Subject: [PATCH 062/106] nbench: fix darwin build --- pkgs/tools/misc/nbench/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix index dc9dcb1e5be..16e67b848d6 100644 --- a/pkgs/tools/misc/nbench/default.nix +++ b/pkgs/tools/misc/nbench/default.nix @@ -9,13 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1b01j7nmm3wd92ngvsmn2sbw43sl9fpx4xxmkrink68fz1rx0gbj"; }; - buildInputs = [ stdenv.cc.libc.static ]; prePatch = '' substituteInPlace nbench1.h --replace '"NNET.DAT"' "\"$out/NNET.DAT\"" + substituteInPlace sysspec.h --replace "malloc.h" "stdlib.h" + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile --replace "-static" "" ''; - preBuild = '' - makeFlagsArray=(CC=$CC) - ''; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + installPhase = '' mkdir -p $out/bin cp nbench $out/bin @@ -25,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.math.utah.edu/~mayer/linux/bmark.html"; description = "A synthetic computing benchmark program"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with lib.maintainers; [ bennofs ]; }; } From e4e8a630d72247e6f8e35bb8ec97170e66d1ec31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Mar 2022 10:00:02 +0000 Subject: [PATCH 063/106] clojure: 1.11.0.1097 -> 1.11.0.1100 --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index fbd733cb84d..cd63e506a55 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.11.0.1097"; + version = "1.11.0.1100"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-8n/XOguemlqzVq9Vihd3QT5PsHSKcW3tTlOJtClrzKs="; + sha256 = "sha256-9KEsO32118fvKE1Gls+9nAeRdlhTKfmJylsiSYCoKKU="; }; nativeBuildInputs = [ From 51ec00354b7af264d5db042a56c98ba4fe1afe35 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 27 Feb 2022 10:27:57 +0100 Subject: [PATCH 064/106] lowdown: 0.10.0 -> 0.11.1 https://github.com/kristapsdz/lowdown/blob/VERSION_0_11_0/versions.xml#L1227-L1282 https://github.com/kristapsdz/lowdown/blob/VERSION_0_11_1/versions.xml#L1284-L1309 --- pkgs/tools/typesetting/lowdown/default.nix | 44 +++++++++++++++++---- pkgs/tools/typesetting/lowdown/shared.patch | 42 -------------------- 2 files changed, 36 insertions(+), 50 deletions(-) delete mode 100644 pkgs/tools/typesetting/lowdown/shared.patch diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 1cb9c8d4017..88e3a9720d0 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -1,16 +1,26 @@ -{ lib, stdenv, fetchurl, fixDarwinDylibNames, which }: +{ lib, stdenv, fetchurl, fixDarwinDylibNames, which +, enableShared ? !(stdenv.hostPlatform.isStatic) +, enableStatic ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.10.0"; + version = "0.11.1"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "3gq6awxvkz2hb8xzcwqhdhdqgspvqjfzm50bq9i29qy2iisq9vzb91bdp3f4q2sqcmk3gms44xyxyn3ih2hwlzsnk0f5prjzyg97fjj"; + sha512 = "1l0055g8v0dygyxvk5rchp4sn1g2lakbf6hhq0wkj6nxkfpl43mkyc4vpb02r7v6iqfdwq4461dmdi78blsb3nj8b1gcjx75v7x9pa1"; }; + # Upstream always passes GNU-style "soname", but cctools expects "install_name". + # Whatever name is inserted will be replaced by fixDarwinDylibNames. + # https://github.com/kristapsdz/lowdown/issues/87 + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile --replace soname install_name + ''; + nativeBuildInputs = [ which ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; @@ -27,12 +37,30 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - # Fix lib extension so that fixDarwinDylibNames detects it - postInstall = lib.optionalString stdenv.isDarwin '' - mv $lib/lib/liblowdown.{so,dylib} - ''; + makeFlags = [ + "bins" # prevents shared object from being built unnecessarily + ]; - patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch; + installTargets = [ + "install" + ] ++ lib.optionals enableShared [ + "install_shared" + ] ++ lib.optionals enableStatic [ + "install_static" + ]; + + # Fix lib extension so that fixDarwinDylibNames detects it + # Symlink liblowdown.so to liblowdown.so.1 (or equivalent) + postInstall = + let + inherit (stdenv.hostPlatform.extensions) sharedLibrary; + in + + lib.optionalString (enableShared && stdenv.isDarwin) '' + mv $lib/lib/liblowdown.{so.1,1.dylib} + '' + lib.optionalString enableShared '' + ln -s $lib/lib/liblowdown*${sharedLibrary}* $lib/lib/liblowdown${sharedLibrary} + ''; doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; installCheckPhase = '' diff --git a/pkgs/tools/typesetting/lowdown/shared.patch b/pkgs/tools/typesetting/lowdown/shared.patch deleted file mode 100644 index 75ee03da970..00000000000 --- a/pkgs/tools/typesetting/lowdown/shared.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/Makefile b/Makefile -index 955f737..2c9532c 100644 ---- a/Makefile -+++ b/Makefile -@@ -80,7 +80,7 @@ REGRESS_ARGS += "--parse-no-autolink" - REGRESS_ARGS += "--parse-no-cmark" - REGRESS_ARGS += "--parse-no-deflists" - --all: lowdown lowdown-diff lowdown.pc -+all: lowdown lowdown-diff liblowdown.so lowdown.pc - - www: $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512 - -@@ -101,6 +101,10 @@ lowdown-diff: lowdown - liblowdown.a: $(OBJS) $(COMPAT_OBJS) - $(AR) rs $@ $(OBJS) $(COMPAT_OBJS) - -+%.o: CFLAGS += -fPIC -+liblowdown.so: $(OBJS) $(COMPAT_OBJS) -+ $(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) -+ - install: all - mkdir -p $(DESTDIR)$(BINDIR) - mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig -@@ -111,7 +114,7 @@ install: all - $(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig - $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR) - $(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR) -- $(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR) -+ $(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR) - for f in $(MANS) ; do \ - name=`basename $$f .html` ; \ -@@ -199,7 +202,7 @@ main.o: lowdown.h - - clean: - rm -f $(OBJS) $(COMPAT_OBJS) main.o -- rm -f lowdown lowdown-diff liblowdown.a lowdown.pc -+ rm -f lowdown lowdown-diff liblowdown.so lowdown.pc - rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz - rm -f $(PDFS) $(HTMLS) $(THUMBS) - From c01faddbd5881f6667703fa176baf5f8fe5c776e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 12:27:06 +0200 Subject: [PATCH 065/106] kubecolor: fix --kubecolor-version, add SuperSandro2000 as maintainer --- pkgs/applications/networking/cluster/kubecolor/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kubecolor/default.nix b/pkgs/applications/networking/cluster/kubecolor/default.nix index 8a3c2d12d1b..a295a48a192 100644 --- a/pkgs/applications/networking/cluster/kubecolor/default.nix +++ b/pkgs/applications/networking/cluster/kubecolor/default.nix @@ -13,11 +13,13 @@ buildGoModule rec { vendorSha256 = "sha256-C1K7iEugA4HBLthcOI7EZ6H4YHW6el8X6FjVN1BeJR0="; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; + meta = with lib; { description = "Colorizes kubectl output"; homepage = "https://github.com/hidetatz/kubecolor"; changelog = "https://github.com/hidetatz/kubecolor/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.ivankovnatsky ]; + maintainers = with maintainers; [ ivankovnatsky SuperSandro2000 ]; }; } From 20a5de1e431d2ef4a4f0ccbeca0fb0f7b6c233a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Mar 2022 10:51:50 +0000 Subject: [PATCH 066/106] python310Packages.scmrepo: 0.0.13 -> 0.0.14 --- pkgs/development/python-modules/scmrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 90d435fc6c0..23ce846ecc5 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.0.13"; + version = "0.0.14"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = version; - hash = "sha256-VWdewy4sfnM5zwDmeL8PdNZINN07rBosg4+GOWkkhVE="; + hash = "sha256-/J8cCcGAWGrJmUvznOKXtNiHasdOJ3CzsGMeakgL0sY="; }; propagatedBuildInputs = [ From 35c43df71174c913245f84f51df1cf4e372add8f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 29 Mar 2022 12:59:08 +0200 Subject: [PATCH 067/106] scsh: switch to fetchFromGitHub --- pkgs/development/interpreters/scsh/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index cc7caeb02eb..b57cc64fb8d 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchgit, autoreconfHook, scheme48 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, scheme48 }: stdenv.mkDerivation { pname = "scsh"; version = "0.7pre"; - src = fetchgit { - url = "https://github.com/scheme/scsh.git"; + src = fetchFromGitHub { + owner = "scheme"; + repo = "scsh"; rev = "f99b8c5293628cfeaeb792019072e3a96841104f"; + sha256 = "sha256-vcVtqoUhozdJq1beUN8/rcI2qOJYUN+0CPSiDWGCIjI="; fetchSubmodules = true; - sha256 = "0ci2h9hhv8pl12sdyl2qwal3dhmd7zgm1pjnmd4kg8r1hnm6vidx"; }; nativeBuildInputs = [ autoreconfHook ]; From fa1a23392dfd62daf816f7be7a52ace62d0de1a2 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 29 Mar 2022 13:03:55 +0200 Subject: [PATCH 068/106] nixui: switch to fetchFromGitHub --- .../tools/package-management/nixui/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix index 47518a3ead0..c5aef5c1754 100644 --- a/pkgs/tools/package-management/nixui/default.nix +++ b/pkgs/tools/package-management/nixui/default.nix @@ -1,12 +1,6 @@ -{ lib, stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem +{ lib, stdenv, pkgs, fetchFromGitHub, nix, node_webkit, makeDesktopItem , writeScript }: let - version = "0.2.1"; - src = fetchgit { - url = "https://github.com/matejc/nixui.git"; - rev = "845a5f4a33f1d0c509c727c130d0792a5b450a38"; - sha256 = "1ay3i4lgzs3axbby06l4vvspxi0aa9pwiil84qj0dqq1jb6isara"; - }; nixui = (import ./nixui.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; @@ -24,9 +18,15 @@ let genericName = "NixUI"; }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "nixui"; - inherit version src; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "matejc"; + repo = "nixui"; + rev = version; + sha256 = "sha256-KisdzZIB4wYkJojGyG9SCsR+9d6EGuDX6mro/yiJw6s="; + }; installPhase = '' mkdir -p $out/bin ln -s ${script} $out/bin/nixui From b4c72db1782e54fdfce0b500ea0181e6cb8a424b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 29 Mar 2022 13:04:13 +0200 Subject: [PATCH 069/106] carddav-util: switch to fetchFromGitHub --- pkgs/tools/networking/carddav-util/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix index d300fe9f27a..e788de13df8 100644 --- a/pkgs/tools/networking/carddav-util/default.nix +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, python3Packages, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python3Packages, makeWrapper }: stdenv.mkDerivation { pname = "carddav"; version = "0.1-2014-02-26"; - src = fetchgit { - url = "https://github.com/ljanyst/carddav-util"; + src = fetchFromGitHub { + owner = "ljanyst"; + repo = "carddav-util"; rev = "53b181faff5f154bcd180467dd04c0ce69405564"; - sha256 = "0f0raffdy032wlnxfck6ky60r163nhqfbr311y4ry55l60s4497n"; + sha256 = "sha256-9iRCNDC0FJ+JD2Hk5TC0w4QMjJ9mMtct5WIA35xTGTg="; }; nativeBuildInputs = [ makeWrapper ]; From cdf7d5d62d4de2603b20da14006d082ade5c1048 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 29 Mar 2022 13:04:42 +0200 Subject: [PATCH 070/106] pa_applet: switch to fetchFromGitHub --- pkgs/tools/audio/pa-applet/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index 6454a14b426..4f67c86864d 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: +{ lib, stdenv, fetchFromGitHub, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: stdenv.mkDerivation { pname = "pa-applet"; version = "unstable-2012-04-11"; - src = fetchgit { - url = "https://github.com/fernandotcl/pa-applet.git"; + src = fetchFromGitHub { + owner = "fernandotcl"; + repo = "pa-applet"; rev = "005f192df9ba6d2e6491f9aac650be42906b135a"; - sha256 = "1242sdri67wnm1cd0hr40mxarkh7qs7mb9n2m0g9dbz0f4axj6wa"; + sha256 = "sha256-ihvZFXHgr5YeqMKmVY/GB86segUkQ9BYqJYfE3PTgog="; }; nativeBuildInputs = [ pkg-config ]; From ab7a5fa31cd4648341fd15233b545ad3f4d3f04b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 29 Mar 2022 13:05:01 +0200 Subject: [PATCH 071/106] disk_indicator: switch to fetchFromGitHub --- pkgs/os-specific/linux/disk-indicator/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index ac30a947ad9..44dd19b27df 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, libX11 }: +{ lib, stdenv, fetchFromGitHub, libX11 }: stdenv.mkDerivation { pname = "disk-indicator"; version = "unstable-2014-05-19"; - src = fetchgit { - url = "https://github.com/MeanEYE/Disk-Indicator.git"; + src = fetchFromGitHub { + owner = "MeanEYE"; + repo = "Disk-Indicator"; rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da"; - sha256 = "10jx6mx9qarn21p2l2jayxkn1gmqhvck1wymgsr4jmbwxl8ra5kd"; + sha256 = "sha256-bRaVEe18VUmyftXzMNmGuL5gZ/dKCipuEDYrnHo1XYI="; }; buildInputs = [ libX11 ]; From 88ca581508c64c88dcb1aaef176885ad10381598 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 29 Mar 2022 13:05:17 +0200 Subject: [PATCH 072/106] hammer: switch to fetchFromGitHub --- pkgs/development/tools/parsing/hammer/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index 46f1982a6fa..86697c0acdc 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, glib, pkg-config, scons }: +{ lib, stdenv, fetchFromGitHub, glib, pkg-config, scons }: stdenv.mkDerivation { pname = "hammer"; version = "e7aa734"; - src = fetchgit { - url = "https://github.com/UpstandingHackers/hammer"; - sha256 = "01l0wbhz7dymxlndacin2vi8sqwjlw81ds2i9xyi200w51nsdm38"; + src = fetchFromGitHub { + owner = "UpstandingHackers"; + repo = "hammer"; rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533"; + sha256 = "sha256-aNSmbSgcABF9T1HoFhCnkmON4hY2MtUs7dW38+HigAY="; }; nativeBuildInputs = [ pkg-config scons ]; From da2cbf54e8ec3e66e2e24d2c55823bce98a7f96b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 29 Mar 2022 13:06:21 +0200 Subject: [PATCH 073/106] haskellPackages.ghcjs-base_0_2_0_3: switch to fetchFromGitHub --- pkgs/development/compilers/ghcjs/ghcjs-base.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/ghcjs-base.nix b/pkgs/development/compilers/ghcjs/ghcjs-base.nix index 17fec9fea0a..b0c604a4aea 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs-base.nix +++ b/pkgs/development/compilers/ghcjs/ghcjs-base.nix @@ -1,5 +1,5 @@ { mkDerivation, aeson, array, attoparsec, base, binary, bytestring -, containers, deepseq, directory, dlist, fetchgit, ghc-prim +, containers, deepseq, directory, dlist, fetchFromGitHub, ghc-prim , ghcjs-prim, hashable, HUnit, integer-gmp, primitive, QuickCheck , quickcheck-unicode, random, scientific, test-framework , test-framework-hunit, test-framework-quickcheck2, text, time @@ -9,10 +9,11 @@ mkDerivation { pname = "ghcjs-base"; version = "0.2.0.3"; - src = fetchgit { - url = "https://github.com/ghcjs/ghcjs-base"; - sha256 = "15fdkjv0l7hpbbsn5238xxgzfdg61g666nzbv2sgxkwryn5rycv0"; + src = fetchFromGitHub { + owner = "ghcjs"; + repo = "ghcjs-base"; rev = "85e31beab9beffc3ea91b954b61a5d04e708b8f2"; + sha256 = "sha256-YDOfi/WZz/602OtbY8wL5jX3X+9oiGL1WhceCraczZU="; }; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers deepseq dlist From 191351907106a82c985a4d0ed7467aad8b3aecec Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 29 Mar 2022 13:06:47 +0200 Subject: [PATCH 074/106] darcs-to-git: switch to fetchFromGitHub --- .../git-and-tools/darcs-to-git/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix index 9b29a6aaa7a..895e4610f4f 100644 --- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }: +{ lib, stdenv, fetchFromGitHub, ruby, gnugrep, diffutils, git, darcs }: stdenv.mkDerivation { pname = "darcs-to-git"; version = "2015-06-04"; - src = fetchgit { - url = "https://github.com/purcell/darcs-to-git.git"; + src = fetchFromGitHub { + owner = "purcell"; + repo = "darcs-to-git"; rev = "e5fee32495908fe0f7d700644c7b37347b7a0a5b"; - sha256 = "0lxcx0x0m1cv2j4x9ykpjf6r2zg6lh5rya016x93vkmlzxm3f0ji"; + sha256 = "sha256-UQI3av+0zj1SNwEonwuk5n2RjZN3+tSJFJuFCjrorFM="; }; patchPhase = let From 2612a06b21efbb6b15255ad3710fa805729b8d36 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 29 Mar 2022 13:07:08 +0200 Subject: [PATCH 075/106] twister: switch to fetchFromGitHub --- pkgs/applications/networking/p2p/twister/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index cb48a790b54..c8e3c4ce7b9 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2 -, boost, db, openssl, geoip, libiconv, miniupnpc -, srcOnly, fetchgit +, boost, db, openssl, geoip, libiconv, miniupnpc, srcOnly }: let twisterHTML = srcOnly { name = "twister-html"; - src = fetchgit { - url = "https://github.com/miguelfreitas/twister-html.git"; + src = fetchFromGitHub { + owner = "miguelfreitas"; + repo = "twister-html"; rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b"; - sha256 = "0scjbin6s1kmi0bqq0dx0qyjw4n5xgmj567n0156i39f9h0dabqy"; + sha256 = "sha256-Hi/VAEwujWhKAPaYIuvrxRIuPQa9AYwXiHUGbWxckmk="; }; }; From 28e54219279388e71feca63470d9857b5e36109f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 29 Mar 2022 13:07:22 +0200 Subject: [PATCH 076/106] slic3r: switch to fetchFromGitHub --- pkgs/applications/misc/slic3r/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 164c08fa561..8d929e0eef5 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, perl, makeWrapper +{ lib, stdenv, fetchFromGitHub, perl, makeWrapper , makeDesktopItem, which, perlPackages, boost }: @@ -6,10 +6,11 @@ stdenv.mkDerivation rec { version = "1.3.0"; pname = "slic3r"; - src = fetchgit { - url = "https://github.com/alexrj/Slic3r"; + src = fetchFromGitHub { + owner = "alexrj"; + repo = "Slic3r"; rev = version; - sha256 = "1pg4jxzb7f58ls5s8mygza8kqdap2c50kwlsdkf28bz1xi611zbi"; + sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0="; }; buildInputs = From 29d6ea9c6cbf329972fa715815283553569551bf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 28 Mar 2022 14:36:34 +0200 Subject: [PATCH 077/106] python3.pkgs.paramiko: 2.9.2 -> 2.10.3 --- pkgs/development/python-modules/paramiko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index d7be0348d54..0c64f6c3085 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "paramiko"; - version = "2.9.2"; + version = "2.10.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "944a9e5dbdd413ab6c7951ea46b0ab40713235a9c4c5ca81cfe45c6f14fa677b"; + sha256 = "sha256-3bGXeFOu+CgEs11yoOWXskT6MmxATDUL0AxbAdv+5xo="; }; propagatedBuildInputs = [ From 3b8a5bfefa327d0163707748c4a9bff678d7e0a3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 28 Mar 2022 14:40:07 +0200 Subject: [PATCH 078/106] python3.pkgs.paramiko: apply patch to fix usage of dsa keys --- pkgs/development/python-modules/paramiko/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 0c64f6c3085..aef257fcb4f 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -9,6 +9,7 @@ , pynacl , pytest-relaxed , pytestCheckHook +, fetchpatch }: buildPythonPackage rec { @@ -48,6 +49,15 @@ buildPythonPackage rec { "paramiko" ]; + patches = [ + # Fix usage of dsa keys + # https://github.com/paramiko/paramiko/pull/1606/ + (fetchpatch { + url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; + sha256 = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; + }) + ]; + __darwinAllowLocalNetworking = true; meta = with lib; { From 22773bb820a745a5d442012acac0d4c61bc76242 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sun, 27 Mar 2022 11:28:43 -0500 Subject: [PATCH 079/106] python3Packages.sip: fix builds of dependents on non-x86 Linux --- .../python-modules/sip/default.nix | 7 +++++++ .../sip/fix-manylinux-version.patch | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/sip/fix-manylinux-version.patch diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 5cd8136f84e..6904714a60c 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -10,6 +10,13 @@ buildPythonPackage rec { sha256 = "a1cf8431a8eb9392b3ff6dc61d832d0447bfdcae5b3e4256a5fa74dbc25b0734"; }; + patches = [ + # on non-x86 Linux platforms, sip incorrectly detects the manylinux version + # and PIP will refuse to install the resulting wheel. + # remove once upstream fixes this, hopefully in 6.5.2 + ./fix-manylinux-version.patch + ]; + propagatedBuildInputs = [ packaging toml ]; # There aren't tests diff --git a/pkgs/development/python-modules/sip/fix-manylinux-version.patch b/pkgs/development/python-modules/sip/fix-manylinux-version.patch new file mode 100644 index 00000000000..4b8e99ae8e4 --- /dev/null +++ b/pkgs/development/python-modules/sip/fix-manylinux-version.patch @@ -0,0 +1,19 @@ +diff --git a/sipbuild/project.py b/sipbuild/project.py +--- a/sipbuild/project.py ++++ b/sipbuild/project.py +@@ -336,13 +336,13 @@ class Project(AbstractProject, Configurable): + # We expect a two part tag so leave anything else unchanged. + parts = platform_tag.split('-') + if len(parts) == 2: +- if self.minimum_glibc_version > (2, 17): ++ if self.minimum_glibc_version > (2, 17) or parts[1] not in {"x86_64", "i686", "aarch64", "armv7l", "ppc64", "ppc64le", "s390x"}: + # PEP 600. + parts[0] = 'manylinux' + parts.insert(1, + '{}.{}'.format(self.minimum_glibc_version[0], + self.minimum_glibc_version[1])) +- elif self.minimum_glibc_version > (2, 12): ++ elif self.minimum_glibc_version > (2, 12) or parts[1] not in {"x86_64", "i686"}: + # PEP 599. + parts[0] = 'manylinux2014' + elif self.minimum_glibc_version > (2, 5): From 13baee8253b0d6cf678691a0d75e44cd334e3b95 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 29 Mar 2022 10:37:31 +0200 Subject: [PATCH 080/106] terraform-providers.utils: init at 0.17.17 This provides the Cloud Posse Terraform Provider for various utilities (e.g. deep merging, stack configuration management). --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index dfc96d2f692..56743624efa 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1141,6 +1141,15 @@ "vendorSha256": null, "version": "1.31.0" }, + "utils": { + "owner": "cloudposse", + "provider-source-address": "registry.terraform.io/cloudposse/utils", + "repo": "terraform-provider-utils", + "rev": "0.17.17", + "sha256": "sha256-QJtdCEw8bnVku4fqAX5MBU9tkPv5jwjra9lGPfUPGQw=", + "vendorSha256": "sha256-5EelFIfHVLRiRJig6EeJG6KGJuQ05LX3M5CNxUxQAas=", + "version": "0.17.17" + }, "vault": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", From 2f3e0789fdc7c7f594d4ab2e879deb4f3023c6c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 13:33:16 +0200 Subject: [PATCH 081/106] python39Packages.pymarshal: remove pytest-cov, pytest-runner --- .../python-modules/pymarshal/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pymarshal/default.nix b/pkgs/development/python-modules/pymarshal/default.nix index 0da93a6d8a4..7da93852642 100644 --- a/pkgs/development/python-modules/pymarshal/default.nix +++ b/pkgs/development/python-modules/pymarshal/default.nix @@ -3,9 +3,6 @@ , fetchFromGitHub , pythonOlder , bson -, pytest -, pytest-cov -, pytest-runner , pytestCheckHook , pyyaml , setuptools @@ -23,9 +20,15 @@ buildPythonPackage rec { sha256 = "sha256-Ds8JV2mtLRcKXBvPs84Hdj3MxxqpeV5muKCSlAFCj1A="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + substituteInPlace setup.cfg \ + --replace "--cov=pymarshal --cov-report=html --cov-report=term" "" + ''; + nativeBuildInputs = [ setuptools - pytest-runner ]; propagatedBuildInputs = [ @@ -35,8 +38,6 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook bson - pytest - pytest-cov pyyaml ]; From 9fe1eae494c581ebb4023c1c4fce88d96f9a7a77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Mar 2022 12:05:35 +0000 Subject: [PATCH 082/106] bluej: 5.0.2 -> 5.0.3 --- pkgs/applications/editors/bluej/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index 100178f7daf..b8a651b2d44 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bluej"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder # to unpack than the deb. url = "https://www.bluej.org/download/files/BlueJ-linux-${builtins.replaceStrings ["."] [""] version}.deb"; - sha256 = "sha256-9sWfVQF/wCiVDKBmesMpM+5BHjFUPszm6U1SgJNQ8lE="; + sha256 = "sha256-OarqmptxZc7xEEYeoCVqHXkAvfzfSYx5nUp/iWPyoqw="; }; nativeBuildInputs = [ makeWrapper ]; From 05a6c124e65d30b5e68468c8b87f73d6b1a8c587 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 29 Mar 2022 10:27:31 +0000 Subject: [PATCH 083/106] lvm2: don't use targetPlatform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit targetPlatform is the platform the current package's programs will produce binaries for — only relevant for compilers and similar. hostPlatform is the platform the current package's programs will run on. The incorrect use of targetPlatform meant that anything that tried to link to it (like cryptsetup) would fail to build when it was used as a native build input for a cross-compiled Musl derivation. Fixes: 2cc29125a72 ("lvm2: package 2.02.x for musl") --- pkgs/os-specific/linux/lvm2/common.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 0f2e6efe3a2..07e8c9cb02d 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -9,8 +9,8 @@ , libaio , enableCmdlib ? false , enableDmeventd ? false -, udevSupport ? !stdenv.targetPlatform.isStatic, udev ? null -, onlyLib ? stdenv.targetPlatform.isStatic +, udevSupport ? !stdenv.hostPlatform.isStatic, udev ? null +, onlyLib ? stdenv.hostPlatform.isStatic , nixosTests }: @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals udevSupport [ "--enable-udev_rules" "--enable-udev_sync" - ] ++ lib.optionals stdenv.targetPlatform.isStatic [ + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ "--enable-static_link" ]; @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0"; }) - ] ++ lib.optionals stdenv.targetPlatform.isStatic [ + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ ./no-shared.diff ]; @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { ]; installPhase = lib.optionalString onlyLib '' - install -D -t $out/lib libdm/ioctl/libdevmapper.${if stdenv.targetPlatform.isStatic then "a" else "so"} + install -D -t $out/lib libdm/ioctl/libdevmapper.${if stdenv.hostPlatform.isStatic then "a" else "so"} make -C libdm install_include make -C libdm install_pkgconfig ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db70bce5d55..97720b99172 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22984,7 +22984,7 @@ with pkgs; lvm2-2_02 = callPackage ../os-specific/linux/lvm2/2_02.nix { udev = systemdMinimal; }; - lvm2 = if stdenv.targetPlatform.isMusl then lvm2-2_02 else lvm2-2_03; + lvm2 = if stdenv.hostPlatform.isMusl then lvm2-2_02 else lvm2-2_03; lvm2_dmeventd = lvm2.override { enableDmeventd = true; From 1ab9577ed65a4ee76b5a0b6a3453fd3f7edb6de8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Mar 2022 12:18:27 +0000 Subject: [PATCH 084/106] drawio: 17.2.1 -> 17.2.4 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index d77d4ffda2a..e53030428e6 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "17.2.1"; + version = "17.2.4"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "28019774a18f6e74c0d126346ae3551b5eb9c73aae13fe87f6d49120c183697a"; + sha256 = "sha256-dKl7DxNneoQEL+QhZmpfQCd15RoeDRnkZt3sv8t2KM4="; }; nativeBuildInputs = [ From b2000742e7322cda33d20e0be5b41e6a123ce3d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Mar 2022 12:31:04 +0000 Subject: [PATCH 085/106] cudatext: 1.159.0 -> 1.159.2 --- pkgs/applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index f22e2407cf2..d142551a114 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.159.0"; + version = "1.159.2"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-DRVJLzAdhw+ke+B2KFlkgLXgU4+Mq3LQ0PRYg52Aq/o="; + sha256 = "sha256-dSZd+Dsln7xUfN/cqTZSdnpnINHsDCBrbNGcDLwqzzU="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 732870b8997..430061e0eb7 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -26,13 +26,13 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2022.03.23", - "sha256": "sha256-QXq75VoAnYqAhe3Fvsz1szZyBz4dHEpYJZqTSCR80v8=" + "rev": "2022.03.28", + "sha256": "sha256-jh3lqisiPNMxCapP6O5oJdUL3PLQ3JyomtgWix+bML0=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2022.03.23", - "sha256": "sha256-m1rkWvRC1i1nLPIhiG6g8LGU96vTuGGqLFrSzw9A9x0=" + "rev": "2022.03.28", + "sha256": "sha256-TpAaL7/bhnrQgAq1mUTdEWXecSmznWy/iAw+TMMrQGo=" }, "Python-for-Lazarus": { "owner": "Alexey-T", From fc5e712dcc2a01ef0ed9ae9024e59a0aa60b49cd Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Sat, 26 Mar 2022 15:25:59 +0100 Subject: [PATCH 086/106] session-desktop-appimage: refactor Added desktop entry and icon. --- .../session-desktop-appimage/default.nix | 42 ++++++++++++++++++- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix index 71748ee77b2..4518627fe2b 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -1,15 +1,53 @@ { lib +, makeDesktopItem +, copyDesktopItems +, stdenvNoCC , fetchurl , appimageTools }: -appimageTools.wrapType2 rec { - pname = "session-desktop-appimage"; +let version = "1.7.9"; + pname = "session-desktop-appimage"; + src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; sha256 = "ca7754e59146633b71e66b02a90cff87e4f2574e57ff831ca4a5f983b7e2fbef"; }; + appimage = appimageTools.wrapType2 { + inherit version pname src; + }; + appimage-contents = appimageTools.extractType2 { + inherit version pname src; + }; +in +stdenvNoCC.mkDerivation { + inherit version pname; + src = appimage; + + nativeBuildInputs = [ copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem { + name = "Session"; + desktopName = "Session"; + comment = "Onion routing based messenger"; + exec = "${appimage}/bin/session-desktop-appimage-${version}"; + icon = "${appimage-contents}/session-desktop.png"; + terminal = false; + type = "Application"; + categories = [ "Network" ]; + }) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/ + cp -r bin $out/bin + + runHook postInstall + ''; meta = with lib; { description = "Onion routing based messenger"; From 9dbdba06180218bcfb78dbd1ca9e05a9d19e9aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 15:13:19 +0200 Subject: [PATCH 087/106] python310Packages.backports_functools_lru_cache: switch to pytestCheckHook, remove linters --- .../backports_functools_lru_cache/default.nix | 12 ++---------- .../python-modules/portend/black-19.10b0.patch | 13 ------------- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 pkgs/development/python-modules/portend/black-19.10b0.patch diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 21920c32b4d..680d23782f5 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -3,10 +3,7 @@ , fetchPypi , setuptools-scm , isPy3k -, pytest -, pytest-black -, pytest-flake8 -, pytest-cov +, pytestCheckHook }: buildPythonPackage rec { @@ -20,12 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytest pytest-flake8 pytest-black pytest-cov ]; - # ironically, they fail a linting test, and pytest.ini forces that test suite - checkPhase = '' - rm backports/functools_lru_cache.py - pytest -k 'not format' - ''; + checkInputs = [ pytestCheckHook ]; # Test fail on Python 2 doCheck = isPy3k; diff --git a/pkgs/development/python-modules/portend/black-19.10b0.patch b/pkgs/development/python-modules/portend/black-19.10b0.patch deleted file mode 100644 index e781139e319..00000000000 --- a/pkgs/development/python-modules/portend/black-19.10b0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test_portend.py b/test_portend.py -index b2de8c2..3f90276 100644 ---- a/test_portend.py -+++ b/test_portend.py -@@ -21,7 +21,7 @@ def socket_infos(): - - - def id_for_info(info): -- af, = info[:1] -+ (af,) = info[:1] - return str(af) - - \ No newline at end of file From f4e164ee0262f35cf5ff3b949a5592e0cadedc7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 15:16:07 +0200 Subject: [PATCH 088/106] python39Packages.portend: switch to pytestCheckHook, remove linter --- pkgs/development/python-modules/portend/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index a3cb25624f7..bf84e41610c 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, setuptools-scm, tempora, pytest-black, pytest-cov }: +, pytestCheckHook, setuptools-scm, tempora }: buildPythonPackage rec { pname = "portend"; @@ -10,19 +10,11 @@ buildPythonPackage rec { sha256 = "239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4"; }; - postPatch = '' - substituteInPlace pytest.ini --replace "--flake8" "" - ''; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ tempora ]; - checkInputs = [ pytest pytest-black pytest-cov ]; - - checkPhase = '' - py.test --deselect=test_portend.py::TestChecker::test_check_port_listening - ''; + checkInputs = [ pytestCheckHook ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; From bd820dbaabc1890743743748966ad5745565645b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 15:16:21 +0200 Subject: [PATCH 089/106] python39Packages.tempora: switch to pytestCheckHook, remove linter --- pkgs/development/python-modules/tempora/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 6999655c5dc..79b04b7ebbb 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, fetchPypi -, setuptools-scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock +, setuptools-scm, pytestCheckHook, pytest-freezegun, freezegun, backports_unittest-mock , six, pytz, jaraco_functools, pythonOlder -, pytest-flake8, pytest-cov, pytest-black, pytest-mypy }: buildPythonPackage rec { @@ -20,14 +19,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ six pytz jaraco_functools ]; checkInputs = [ - pytest-freezegun pytest freezegun backports_unittest-mock - pytest-flake8 pytest-cov pytest-black pytest-mypy + pytest-freezegun pytestCheckHook freezegun backports_unittest-mock ]; - checkPhase = '' - pytest - ''; - meta = with lib; { description = "Objects and routines pertaining to date and time"; homepage = "https://github.com/jaraco/tempora"; From e92526274d79415b9f8b6623af23b3952f7119cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 15:25:18 +0200 Subject: [PATCH 090/106] python39Packages.libcst: switch to pytestCheckHook, remove linters --- pkgs/development/python-modules/libcst/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 774cb572e95..0c4a8985e40 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -1,11 +1,9 @@ { lib -, black , buildPythonPackage , dataclasses , fetchFromGitHub , hypothesis -, isort -, pytest +, pytestCheckHook , python , pythonOlder , pyyaml @@ -50,9 +48,7 @@ buildPythonPackage rec { ]; checkInputs = [ - black - isort - pytest + pytestCheckHook ]; preCheck = '' From 6cdf69546b32b657fd64e9d2aa48d4a25c809fef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 27 Mar 2022 16:40:22 +0200 Subject: [PATCH 091/106] firefox: allow RDD sandbox access to gpu drivers Firefox uses a sandboxing model that only allows access to paths that were previously explicitly granted. We can only add granular permissions to a specific sandbox by patching, because setting LD_LIBRARY_PATH would affect all of them. To use hardware decoding via VA-API with Firefox 98.0.2 one needs to head to `about:config` and enable `media.ffmpeg.vaapi.enabled`. Closes: #157061 --- pkgs/applications/networking/browsers/firefox/common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 64cba1b52a6..d4bdaaf7f1d 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -165,6 +165,14 @@ buildStdenv.mkDerivation ({ inherit src unpackPhase meta; patches = [ + (fetchpatch { + # RDD Sandbox paths for NixOS, remove with Firefox>=100 + # https://hg.mozilla.org/integration/autoland/rev/5ac6a69a01f47ca050d90704a9791b8224d30f14 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1761692 + name = "mozbz-1761692-rdd-sandbox-paths.patch"; + url = "https://hg.mozilla.org/integration/autoland/raw-rev/5ac6a69a01f47ca050d90704a9791b8224d30f14"; + hash = "sha256-+NGRUxXA7HGvPaAwvDveqRsdXof5nBIc+l4hdf7cC/Y="; + }) ] ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch From e9c2918e9bce73019f9581b26555bbd5bcb44e78 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 Mar 2022 14:51:30 +0200 Subject: [PATCH 092/106] gnome.gnome-control-center: fix Online Accounts configuration on X11 --- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 9dc09cfe81a..c7da1e43a15 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -2,6 +2,7 @@ , lib , stdenv , substituteAll +, fetchpatch , accountsservice , adwaita-icon-theme , colord @@ -78,6 +79,13 @@ stdenv.mkDerivation rec { inherit glibc libgnomekbd tzdata; inherit cups networkmanagerapplet; }) + + # Fix Online Accounts configuration on X11 + # https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1272 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/7fe322b9cedae313cd9af6f403eab9bfc6027674.patch"; + sha256 = "cv1abqv0Kbfkfu7mZzEaZKXPE85yVBcQbjNHW+8ODFE="; + }) ]; nativeBuildInputs = [ From b7e6749a32a2d9950a753138b614f7b543c96d9b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 29 Mar 2022 16:09:34 +0200 Subject: [PATCH 093/106] home-assistant: 2022.3.7 -> 2022.3.8 https://github.com/home-assistant/core/releases/tag/2022.3.8 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 2d8d54f28b6..822bfcbe593 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.3.7"; + version = "2022.3.8"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 14a687e7739..0d9664a700e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -164,7 +164,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.3.7"; + hassVersion = "2022.3.8"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -182,7 +182,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-AewJf4GS3jfEN8Xq82NDV8PNpXXZIs2DHix/+tJpB8c="; + hash = "sha256-FGsMFt/EEokaast81iiwKHqSsB1E4Si5ejTw+MV1MnQ="; }; # leave this in, so users don't have to constantly update their downstream patch handling From e0e1ad16be1a8c0e1038961e5df2973e6927cc57 Mon Sep 17 00:00:00 2001 From: Ivan Kovnatsky <75213+ivankovnatsky@users.noreply.github.com> Date: Tue, 29 Mar 2022 17:17:35 +0300 Subject: [PATCH 094/106] krelay: init at 0.0.2 --- .../networking/cluster/krelay/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/networking/cluster/krelay/default.nix diff --git a/pkgs/applications/networking/cluster/krelay/default.nix b/pkgs/applications/networking/cluster/krelay/default.nix new file mode 100644 index 00000000000..f0a9912ab91 --- /dev/null +++ b/pkgs/applications/networking/cluster/krelay/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "krelay"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "knight42"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7P+pGiML/1aZEpYAWtAPEhrBAo8e8ATcemrH8tD73w8="; + }; + + vendorSha256 = "sha256-PrL3GYP5K6ZaSAShwuDQA7WfOVJeQraxZ8jrtnajR9g="; + + subPackages = [ "cmd/client" ]; + + ldflags = [ "-s" "-w" "-X github.com/knight42/krelay/pkg/constants.ClientVersion=${version}" ]; + + postInstall = '' + mv $out/bin/client $out/bin/kubectl-relay + ''; + + meta = with lib; { + description = "A better alternative to `kubectl port-forward` that can forward TCP or UDP traffic to IP/Host which is accessible inside the cluster."; + homepage = "https://github.com/knight42/krelay"; + changelog = "https://github.com/knight42/krelay/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ivankovnatsky ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97720b99172..1d1c8415505 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3452,6 +3452,8 @@ with pkgs; krapslog = callPackage ../tools/misc/krapslog { }; + krelay = callPackage ../applications/networking/cluster/krelay { }; + krill = callPackage ../servers/krill { inherit (darwin.apple_sdk.frameworks) Security; }; From 448c1d0e86cc8f77b07d9a389340e3e1ffbdd3f0 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 29 Mar 2022 09:33:10 -0500 Subject: [PATCH 095/106] polkadot: fix darwin build --- pkgs/applications/blockchains/polkadot/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index ced8b1f857c..8199504839a 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -5,6 +5,7 @@ , protobuf , rustPlatform , writeShellScriptBin +, Security }: rustPlatform.buildRustPackage rec { pname = "polkadot"; @@ -32,6 +33,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-Gc5WbayQUlsl7Fk8NyLPh2Zg2yrLl3WJqKorNZMLi94="; + buildInputs = [ Security ]; + nativeBuildInputs = [ clang ]; preBuild = '' @@ -56,6 +59,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://polkadot.network"; license = licenses.gpl3Only; maintainers = with maintainers; [ akru andresilva asymmetric FlorianFranzen RaghavSood ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fa2d5eb471..e60531bd495 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30838,7 +30838,9 @@ with pkgs; openethereum = callPackage ../applications/blockchains/openethereum { }; - polkadot = callPackage ../applications/blockchains/polkadot { }; + polkadot = callPackage ../applications/blockchains/polkadot { + inherit (darwin.apple_sdk.frameworks) Security; + }; particl-core = callPackage ../applications/blockchains/particl-core { miniupnpc = miniupnpc_2; }; From ea35502fe4db6f9be94ae8461bf14c223ccef180 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 29 Mar 2022 09:36:30 -0500 Subject: [PATCH 096/106] xtris: fix darwin build --- pkgs/games/xtris/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/xtris/default.nix b/pkgs/games/xtris/default.nix index e6da0c6f17c..2263a46187e 100644 --- a/pkgs/games/xtris/default.nix +++ b/pkgs/games/xtris/default.nix @@ -18,10 +18,12 @@ stdenv.mkDerivation rec { ''; buildInputs = [ xorg.libX11 ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + meta = with lib; { description = "A multi-player version of the classical game of Tetris, for the X Window system"; homepage = "https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris.html"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 66cb200860e0e399460e9c18b8e79b05b0375fe7 Mon Sep 17 00:00:00 2001 From: arjan-s Date: Tue, 29 Mar 2022 16:47:35 +0200 Subject: [PATCH 097/106] python3Packages.notifymuch: Init at 0.1 (#166075) --- maintainers/maintainer-list.nix | 6 +++ .../python-modules/notifymuch/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/notifymuch/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1692282ff1d..25c5bd078e5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -929,6 +929,12 @@ githubId = 1296771; name = "Anders Riutta"; }; + arjan-s = { + email = "github@anymore.nl"; + github = "arjan-s"; + githubId = 10400299; + name = "Arjan Schrijver"; + }; arkivm = { email = "vikram186@gmail.com"; github = "arkivm"; diff --git a/pkgs/development/python-modules/notifymuch/default.nix b/pkgs/development/python-modules/notifymuch/default.nix new file mode 100644 index 00000000000..bc1610e2ca9 --- /dev/null +++ b/pkgs/development/python-modules/notifymuch/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonApplication +, isPy3k +, fetchFromGitHub +, notmuch +, pygobject3 +, gobject-introspection +, libnotify +, wrapGAppsHook +, gtk3 +}: + +buildPythonApplication rec { + pname = "notifymuch"; + version = "0.1"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "kspi"; + repo = "notifymuch"; + # https://github.com/kspi/notifymuch/issues/11 + rev = "9d4aaf54599282ce80643b38195ff501120807f0"; + sha256 = "1lssr7iv43mp5v6nzrfbqlfzx8jcc7m636wlfyhhnd8ydd39n6k4"; + }; + + propagatedBuildInputs = [ + notmuch + pygobject3 + libnotify + gtk3 + ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + strictDeps = false; + + meta = with lib; { + description = "Display desktop notifications for unread mail in a notmuch database"; + homepage = "https://github.com/kspi/notifymuch"; + maintainers = with maintainers; [ arjan-s ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5dae694ebd8..64c4629eaa0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5627,6 +5627,8 @@ in { notify2 = callPackage ../development/python-modules/notify2 { }; + notifymuch = callPackage ../development/python-modules/notifymuch {}; + notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; }; From 316e4a4ca184512a1620baf014452c97bc11b025 Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Tue, 29 Mar 2022 16:57:25 +0200 Subject: [PATCH 098/106] perlPackages.PLS: shorten shebang on Darwin As it's too long to be correctly executed. --- pkgs/top-level/perl-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ee7ee26b984..24cce7be3a5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18200,6 +18200,10 @@ let sha256 = "0278anidj7bgassj32g20cbki2kkqakkr3axyq4k90nj4snw7p6x"; }; propagatedBuildInputs = [ Future IOAsync PPI PPR PathTiny PerlCritic PerlTidy PodMarkdown URI ]; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/pls + ''; meta = { homepage = "https://github.com/FractalBoy/perl-language-server"; description = "Perl Language Server"; From 41e2604483babe9e70429887ff5293aaa8bdb1bb Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Tue, 29 Mar 2022 07:58:42 -0700 Subject: [PATCH 099/106] nixos/dhcpd6: Use fixed-address6 for dhcpd6 address reservations --- nixos/modules/services/networking/dhcpd.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index 3c4c0069dfd..49950efc0a1 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -7,7 +7,7 @@ let cfg4 = config.services.dhcpd4; cfg6 = config.services.dhcpd6; - writeConfig = cfg: pkgs.writeText "dhcpd.conf" + writeConfig = postfix: cfg: pkgs.writeText "dhcpd.conf" '' default-lease-time 600; max-lease-time 7200; @@ -21,7 +21,9 @@ let (machine: '' host ${machine.hostName} { hardware ethernet ${machine.ethernetAddress}; - fixed-address ${machine.ipAddress}; + fixed-address${ + optionalString (postfix == "6") postfix + } ${machine.ipAddress}; } '') cfg.machines @@ -33,7 +35,7 @@ let configFile = if cfg.configFile != null then cfg.configFile - else writeConfig cfg; + else writeConfig postfix cfg; leaseFile = "/var/lib/dhcpd${postfix}/dhcpd.leases"; args = [ "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}" From 64ead2ba7da2da3b269cff762c83c705e9dd6f11 Mon Sep 17 00:00:00 2001 From: pennae Date: Tue, 29 Mar 2022 00:52:38 +0200 Subject: [PATCH 100/106] unifi7: 7.0.23 -> 7.0.25 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index ea4ef814195..db4ec8b891d 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -65,7 +65,7 @@ in rec { }; unifi7 = generic { - version = "7.0.23"; - sha256 = "1y2z02blgbqa6xvwjrvzx6mfwbbbmmv50rq409rsg1hkkzispxmw"; + version = "7.0.25"; + sha256 = "sha256-DZi2xy6mS3hfqxX1ikiHKPlJ12eaoZVgyl9jKYt91hg="; }; } From 8e27053ff079c2a34d50b7ca7ab8759113670ed2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Mar 2022 14:30:18 +0000 Subject: [PATCH 101/106] python310Packages.azure-keyvault-administration: 4.0.0 -> 4.1.0 --- .../python-modules/azure-keyvault-administration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/pkgs/development/python-modules/azure-keyvault-administration/default.nix index 788eaf70457..838572d064e 100644 --- a/pkgs/development/python-modules/azure-keyvault-administration/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-administration/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "azure-keyvault-administration"; - version = "4.0.0"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b05a0372f35921cedb7a231426077745eee9a65881088de6d4d8b73d9709a6cb"; + sha256 = "sha256-V8tppRExyvSt41nN+j2QoxGSund6RKvE4g5p6AWZ3qI="; }; propagatedBuildInputs = [ From b228be7ef6c602b1d096a8e50bd563d1f38ed9ae Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 29 Mar 2022 15:48:12 +0300 Subject: [PATCH 102/106] =?UTF-8?q?python3Packages.osmnx:=201.1.1=20?= =?UTF-8?q?=E2=86=92=201.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/osmnx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index 4cc0ce80d4d..75a2ce44630 100755 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "osmnx"; - version = "1.1.1"; + version = "1.1.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "gboeing"; repo = pname; rev = "v${version}"; - sha256 = "0dkv3fnlq23d7d30lhdf4a313lxy3a5qfldidvszs1z9n16ycnwb"; + sha256 = "sha256-qrTAXZFm88elMrVjvGwfdNwTA/PRdCOHFqpcgoKVGNk="; }; propagatedBuildInputs = [ geopandas matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy gdal rasterio ]; From 1a718a1677940796b42486b659aa29344c956e49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Mar 2022 09:24:07 +0000 Subject: [PATCH 103/106] python310Packages.azure-keyvault-keys: 4.4.0 -> 4.5.0 --- .../python-modules/azure-keyvault-keys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 59fcef4d4bf..aa90ccba46f 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "azure-keyvault-keys"; - version = "4.4.0"; + version = "4.5.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7792ad0d5e63ad9eafa68bdce5de91b3ffcc7ca7a6afdc576785e6a2793caed0"; + sha256 = "sha256-x1AhiARXZXcky3A+DJXoCrvkqsonlkgdrdr6es/VY3s="; }; propagatedBuildInputs = [ From 388382de81a53a4331a29545b6c2db88e3b11993 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Mar 2022 12:10:39 +0200 Subject: [PATCH 104/106] python3Packages.azure-keyvault-keys: disable on older Python releases --- .../azure-keyvault-keys/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index aa90ccba46f..8ce81bc3d61 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, isPy27, fetchPypi +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi , aiohttp , azure-common , azure-core @@ -10,12 +13,14 @@ buildPythonPackage rec { pname = "azure-keyvault-keys"; version = "4.5.0"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-x1AhiARXZXcky3A+DJXoCrvkqsonlkgdrdr6es/VY3s="; + hash = "sha256-x1AhiARXZXcky3A+DJXoCrvkqsonlkgdrdr6es/VY3s="; }; propagatedBuildInputs = [ @@ -25,11 +30,17 @@ buildPythonPackage rec { cryptography ]; - pythonNamespaces = [ "azure.keyvault" ]; + checkInputs = [ + aiohttp + pytestCheckHook + ]; + + pythonNamespaces = [ + "azure.keyvault" + ]; # requires relative paths to utilities in the mono-repo doCheck = false; - checkInputs = [ aiohttp pytestCheckHook ]; pythonImportsCheck = [ "azure" From 08ab0fab0a7058f099b7d73dc9692419097b0336 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 29 Mar 2022 09:23:59 -0700 Subject: [PATCH 105/106] python3Packages.click: add downstream tests --- pkgs/development/python-modules/click/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index c78f8284111..6d865307f9b 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -5,6 +5,14 @@ , importlib-metadata , locale , pytestCheckHook + +# large-rebuild downstream dependencies +, flask +, black + +# applications +, magic-wormhole +, mitmproxy }: buildPythonPackage rec { @@ -29,6 +37,10 @@ buildPythonPackage rec { pytestCheckHook ]; + passthru.tests = { + inherit black flask magic-wormhole mitmproxy; + }; + meta = with lib; { homepage = "https://click.palletsprojects.com/"; description = "Create beautiful command line interfaces in Python"; From 0d2fc67c5011d4716770c99ab673159bd703e9ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Mar 2022 10:32:15 +0000 Subject: [PATCH 106/106] python310Packages.bids-validator: 1.9.2 -> 1.9.3 --- pkgs/development/python-modules/bids-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 4a0bd988c1e..05dd93ffa03 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.9.2"; + version = "1.9.3"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JxPOHeK8glWwAhYwlCVJtfWeMtU6KHgvNg5b2DgGxGc="; + sha256 = "sha256-ATJi4eCWV0i3Z8AsgV/DtiCn8Qzi2cMDtId5jXCoDL0="; }; # needs packages which are not available in nixpkgs