diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index a3b47461a6bd..563fdf45a861 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/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 31d23c6c3458..effb90c99804 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13227,6 +13227,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/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 0863358d43c7..7f4279a97e08 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 @@ -849,6 +849,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 f92feb9560fb..06143e0c0ba9 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -331,6 +331,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/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 81fca33f5fec..b959379d331a 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."; + }; }; }; }; diff --git a/nixos/modules/services/security/sslmate-agent.nix b/nixos/modules/services/security/sslmate-agent.nix new file mode 100644 index 000000000000..c850eb22a031 --- /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"; + }; + }; + }; + }; +} diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 60b5a48b2e62..8ca4ad7b7d86 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1451,7 +1451,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 { diff --git a/pkgs/applications/audio/tonelib-metal/default.nix b/pkgs/applications/audio/tonelib-metal/default.nix new file mode 100644 index 000000000000..9acb6982c6a7 --- /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/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index aca88252ebe1..52c3c08ea847 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; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 01561f4c2722..bc317b91597e 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 @@ -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 -, ... }: @@ -134,7 +133,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 = [ @@ -174,40 +175,12 @@ 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 - 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; diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 4183b6214351..b291928f25aa 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; diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 20b8c3c04d1c..ea785bab49bf 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 = '' diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 0dd3da4b37c6..e295a51637a7 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; diff --git a/pkgs/data/fonts/dancing-script/default.nix b/pkgs/data/fonts/dancing-script/default.nix new file mode 100644 index 000000000000..5129f4bc5a5e --- /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/desktops/gnome/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix index 65a9daa57454..dae367f1d5ba 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 = [ diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 719c0eabce13..85918f0e31c0 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 = [ diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index 3fdf7f3e546e..4ae54200d09c 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 = [ diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 9e9442082901..16a800110942 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 = [ diff --git a/pkgs/development/ocaml-modules/mimic/default.nix b/pkgs/development/ocaml-modules/mimic/default.nix index 69d6d97da5e9..348a1b39cdd4 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 ]; diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index f17ff4f71c6f..cda625d49533 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 = [ diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index 9857c810ddb8..9ed54dee25e8 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 = [ diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index f1a6c5359d6b..4dba9f408b8d 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.3.0"; + version = "4.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "4e0a9bae9fd4c222617fbce6b31f97e2e0622774479de3c387239cbfbb828d87"; + 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"; diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 39aa54a4832d..6ee0cb065401 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.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BsTOs6sqk7hbiXa76Gy7gq4dHALS3tPP0IR6i2lVJjs="; + sha256 = "sha256-MFlrgk/GgI/ayi8EjkmYzED7SzWZ6upm0o3HCFs2xbg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index a0818e1e571f..746619a61445 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.0"; + version = "1.14.1"; + format = "setuptools"; - propagatedBuildInputs = [ six editorconfig ]; - checkInputs = [ pytest ]; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "84fdb008d8af89619269a6aca702288b48f837a99427a0f529aa57ecfb36ee3c"; + 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 ]; }; } diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index c0e0fd56aa10..a9e4a3eed5cd 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 = [ diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index d7be0348d54a..aef257fcb4ff 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -9,16 +9,17 @@ , pynacl , pytest-relaxed , pytestCheckHook +, fetchpatch }: 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 = [ @@ -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; { diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 0bafd17a8eb6..971b8015a417 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 = [ diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 358c2ed600e2..fefec51c2bcd 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" ]; diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index d5e9b4da0ebf..b3f2d6955709 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 = [ diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index be9cae0e1787..d6ee1e76f548 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -10,6 +10,13 @@ buildPythonPackage rec { sha256 = "sha256-IE8CQNuJmadJ1jiph7NRhhhD5pI5uBHsPRiBQSw3BqY="; }; + 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 000000000000..4b8e99ae8e47 --- /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): diff --git a/pkgs/development/tools/sslmate-agent/default.nix b/pkgs/development/tools/sslmate-agent/default.nix new file mode 100644 index 000000000000..ecbaeb816f00 --- /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/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix index dc9dcb1e5bec..16e67b848d65 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 ]; }; } diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix index 60853d2cf7ef..291063f43cb1 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 ]; }; } diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 1cb9c8d40177..88e3a9720d04 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 75ee03da9700..000000000000 --- 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) - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 192c9d88ce7c..6b8e0b3b49ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2850,6 +2850,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 {}; @@ -10253,6 +10255,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 { }; @@ -24798,7 +24802,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 { }; @@ -29626,6 +29630,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 { }; @@ -29793,9 +29799,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 { }; @@ -29808,8 +29814,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 {