diff options
16 files changed, 67 insertions, 44 deletions
diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index d9085ff734d8..73d338ec1493 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-FIa6eAE6yyJR5UdlCXB2Gx3DqN528POxb0eYOCpVjJk="; + sha256 = "sha256-g80XL7dzq2Ed08zAcgBjrHfL1Qqxhr5sL9koaE4fl/I="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 5b473ef8c49c..c602ff209aef 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -10628,6 +10628,18 @@ final: prev: meta.homepage = "https://github.com/kana/vim-niceblock/"; }; + vim-nickel = buildVimPluginFrom2Nix { + pname = "vim-nickel"; + version = "2022-03-16"; + src = fetchFromGitHub { + owner = "nickel-lang"; + repo = "vim-nickel"; + rev = "2f0f5f8ce2a8e719a5e39d7210ca914ae403374c"; + sha256 = "1li3wc5164mcqrvj42dc8zh3j8wml10gpgffapnjilwa5c85kv3q"; + }; + meta.homepage = "https://github.com/nickel-lang/vim-nickel/"; + }; + vim-ninja-feet = buildVimPluginFrom2Nix { pname = "vim-ninja-feet"; version = "2021-05-27"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 92910fdff010..8639d8a4af36 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -892,6 +892,7 @@ https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/,, https://github.com/jistr/vim-nerdtree-tabs/,, https://github.com/nfnty/vim-nftables/,, https://github.com/kana/vim-niceblock/,, +https://github.com/nickel-lang/vim-nickel/,main, https://github.com/tommcdo/vim-ninja-feet/,, https://github.com/LnL7/vim-nix/,, https://github.com/symphorien/vim-nixhash/,, diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix index 3b7e4c4a4b04..f4392408c9e6 100644 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ b/pkgs/applications/window-managers/gamescope/default.nix @@ -26,7 +26,7 @@ }: let pname = "gamescope"; - version = "3.11.43"; + version = "3.11.45-2"; in stdenv.mkDerivation { inherit pname version; @@ -35,7 +35,7 @@ stdenv.mkDerivation { owner = "Plagman"; repo = "gamescope"; rev = "refs/tags/${version}"; - hash = "sha256-XxOVM7xWeE2pF4U34jLvil5+vj+jePHPWHIfw0e/mnM="; + hash = "sha256-OLPwUELahqzmOBPvJg8pm556RH+H6TzRD9PHLnM2Ruc="; }; patches = [ ./use-pkgconfig.patch ]; diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix index 1e0b6ac789bf..d895574d527d 100644 --- a/pkgs/development/libraries/libwpe/default.nix +++ b/pkgs/development/libraries/libwpe/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-SsT9CotWK3Ib/9D0aunwbCtaMRRAdYGXi+h1qdZRZCo="; + sha256 = "sha256-uE/b+8hJzk/fCEuyi1jlRjsbS2zI8gDcd7QfhUXVMp0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index c942972597ad..5b67c9ac4340 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,23 +1,21 @@ -{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config +{ lib, fetchurl, buildDunePackage, ounit2, cstruct, dune-configurator, eqaf, pkg-config , withFreestanding ? false , ocaml-freestanding }: buildDunePackage rec { - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.10.5"; + version = "0.10.7"; src = fetchurl { - url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "sha256-eeKMSRZrBiTzWLv80P5LeouPib24uTigk2HLtORKpJU="; + url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz"; + sha256 = "sha256-PoGKdgwjXFtoTHtrQ7HN0qfdBOAQW2gNUk+DbrmIppw="; }; - useDune2 = true; - doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ ounit2 ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix index 5506243ec3a4..098b587f3d59 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix @@ -21,10 +21,8 @@ buildDunePackage rec { pname = "mirage-crypto-ec"; inherit (mirage-crypto) - minimumOCamlVersion src - version - useDune2; + version; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index 9a2b9c98e458..0793bf5c4f39 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -1,10 +1,10 @@ -{ buildDunePackage, ounit, randomconv, mirage-crypto, mirage-crypto-rng +{ buildDunePackage, ounit2, randomconv, mirage-crypto, mirage-crypto-rng , cstruct, sexplib0, zarith, eqaf, gmp }: buildDunePackage rec { pname = "mirage-crypto-pk"; - inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; + inherit (mirage-crypto) version src; buildInputs = [ gmp ]; propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng @@ -13,7 +13,7 @@ buildDunePackage rec { strictDeps = !doCheck; doCheck = true; - checkInputs = [ ounit randomconv ]; + checkInputs = [ ounit2 randomconv ]; meta = mirage-crypto.meta // { description = "Simple public-key cryptography for the modern age"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix index 91da7aa56816..5752507f9ef9 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix @@ -6,7 +6,7 @@ buildDunePackage { pname = "mirage-crypto-rng-async"; - inherit (mirage-crypto) useDune2 version minimumOCamlVersion src; + inherit (mirage-crypto) version src; buildInputs = [ dune-configurator diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index 8d67ade9b465..bf940c3eb70c 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "mirage-crypto-rng-mirage"; - inherit (mirage-crypto-rng) version src useDune2 minimumOCamlVersion; + inherit (mirage-crypto-rng) version src; doCheck = true; checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix index 2281f10580cd..8900dd611d89 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -1,13 +1,13 @@ -{ buildDunePackage, mirage-crypto, ounit, randomconv, dune-configurator +{ buildDunePackage, mirage-crypto, ounit2, randomconv, dune-configurator , cstruct, duration, logs, mtime, ocaml_lwt }: buildDunePackage rec { pname = "mirage-crypto-rng"; - inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; + inherit (mirage-crypto) version src; doCheck = true; - checkInputs = [ ounit randomconv ]; + checkInputs = [ ounit2 randomconv ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ]; diff --git a/pkgs/development/ocaml-modules/mirage-unix/default.nix b/pkgs/development/ocaml-modules/mirage-unix/default.nix index 68ee12f12c9d..3663e4b9cb71 100644 --- a/pkgs/development/ocaml-modules/mirage-unix/default.nix +++ b/pkgs/development/ocaml-modules/mirage-unix/default.nix @@ -1,15 +1,15 @@ -{ lib, buildDunePackage, fetchurl, lwt, duration, mirage-runtime, io-page }: +{ lib, buildDunePackage, fetchurl, lwt, duration, mirage-runtime }: buildDunePackage rec { pname = "mirage-unix"; - version = "4.0.1"; + version = "5.0.1"; src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "sha256-9ymVBb3dkhb+MN97/sXe/oQ36CVx0kruj3sd19LiFZ4="; + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "sha256-U1oLznUDBcJLcVygfSiyl5qRLDM27cm/WrjT0vSGhPg="; }; - propagatedBuildInputs = [ lwt duration mirage-runtime io-page ]; + propagatedBuildInputs = [ lwt duration mirage-runtime ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/pkgs/development/perl-modules/Po4a/default.nix index 92a184f4ea03..119414907856 100644 --- a/pkgs/development/perl-modules/Po4a/default.nix +++ b/pkgs/development/perl-modules/Po4a/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, texlive, opensp +{ stdenv, lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, texlive, opensp , perl, buildPerlPackage, ModuleBuild, TextWrapI18N, LocaleGettext, TermReadKey, SGMLSpm, UnicodeLineBreak, PodParser, YAMLTiny }: buildPerlPackage rec { @@ -9,7 +9,7 @@ buildPerlPackage rec { sha256 = "0eb510a66f59de68cf7a205342036cc9fc08b39334b91f1456421a5f3359e68b"; }; nativeBuildInputs = [ docbook_xsl docbook_xsl_ns ModuleBuild ]; - propagatedBuildInputs = [ TextWrapI18N LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ]; + propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isMusl) TextWrapI18N ++ [ LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ]; # TODO: TermReadKey was temporarily removed from propagatedBuildInputs to unfreeze the build buildInputs = [ gettext libxslt glibcLocales docbook_xml_dtd_412 docbook_sgml_dtd_41 texlive.combined.scheme-basic opensp ]; LC_ALL = "en_US.UTF-8"; @@ -19,6 +19,14 @@ buildPerlPackage rec { export PERL_MB_OPT="--install_base=$out --prefix=$out" ''; buildPhase = "perl Build.PL --install_base=$out --install_path=\"lib=$out/${perl.libPrefix}\"; ./Build build"; + + # Disabling tests on musl + # Void linux package have investigated the failure and tracked it down to differences in gettext behavior. They decided to disable tests. + # https://github.com/void-linux/void-packages/pull/34029#issuecomment-973267880 + # Alpine packagers have not worried about running the tests until now: + # https://git.alpinelinux.org/aports/tree/main/po4a/APKBUILD#n11 + doCheck = !stdenv.hostPlatform.isMusl; + checkPhase = '' export SGML_CATALOG_FILES=${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat ./Build test diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index b73c0ae04cdb..bef1fa6e33a6 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -67,6 +67,12 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch"; sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; }) + + # fix parsing lines with optional fields in fstab etc. NOTE: Remove for the next release since it has been merged upstream + (fetchurl { + url = "https://git.musl-libc.org/cgit/musl/patch/?id=751bee0ee727e8d8b003c87cff77ac76f1dbecd6"; + sha256 = "sha256-qCw132TCSaZrkISmtDb8Q8ufyt8sAJdwACkvfwuoi/0="; + }) ]; CFLAGS = [ "-fstack-protector-strong" ] ++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64"; diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index 22a0d10b3c9f..a276aa3bd57a 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.0"; sha256 = "1lpv5sggdxza0bmcqmzf5r4i340f0m7nr5073lac18naj5697q5g"; }) (fetchNuGet { pname = "CliFx"; version = "2.3.0"; sha256 = "0dxxd5hm7gnc1lhq7k266nkcl84w0844r3cdxdcksvcc786f43vp"; }) diff --git a/pkgs/tools/misc/fsearch/default.nix b/pkgs/tools/misc/fsearch/default.nix index a7b95f3efa63..6af61b122337 100644 --- a/pkgs/tools/misc/fsearch/default.nix +++ b/pkgs/tools/misc/fsearch/default.nix @@ -2,26 +2,26 @@ , stdenv , fetchFromGitHub , gtk3 -, pcre +, pcre2 , glib , desktop-file-utils , meson , ninja , pkg-config , wrapGAppsHook -, unstableGitUpdater , gettext +, icu }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "fsearch"; - version = "unstable-2021-06-23"; + version = "0.2.2"; src = fetchFromGitHub { owner = "cboxdoerfer"; - repo = "fsearch"; - rev = "9300cc03ab2f0cea3a70abb5477bda8b52c4afd1"; - sha256 = "16qh2si48j113yhay5wawr7dvldks6jb32za41j2sng7n4ryw221"; + repo = pname; + rev = version; + hash = "sha256-1nu6J5eHVpPHGXcFKHSnUhAJccxABBht5H2bpBx42og="; }; nativeBuildInputs = [ @@ -36,7 +36,8 @@ stdenv.mkDerivation { buildInputs = [ glib gtk3 - pcre + pcre2 + icu ]; preFixup = '' @@ -44,10 +45,6 @@ stdenv.mkDerivation { --replace "Exec=fsearch" "Exec=$out/bin/fsearch" ''; - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/cboxdoerfer/fsearch.git"; - }; - meta = with lib; { description = "A fast file search utility for Unix-like systems based on GTK+3"; homepage = "https://github.com/cboxdoerfer/fsearch.git"; |