diff --git a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix index 86b8bd729f71..85359d2a95ca 100644 --- a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix +++ b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "r"; publisher = "reditorsupport"; - version = "2.8.5"; - hash = "sha256-cZeZdrViEae9sRb9GyB/LeSQ5NRb/fAp3qQW9mPMbsM="; + version = "2.8.6"; + hash = "sha256-T/Qh0WfTfXMzPonbg9NMII5qFptfNoApFFiZCT5rR3Y="; }; nativeBuildInputs = [ jq diff --git a/pkgs/by-name/cl/clapper-enhancers/package.nix b/pkgs/by-name/cl/clapper-enhancers/package.nix index 4de5dca52635..39802f3b87fc 100644 --- a/pkgs/by-name/cl/clapper-enhancers/package.nix +++ b/pkgs/by-name/cl/clapper-enhancers/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clapper-enhancers"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "Rafostar"; repo = "clapper-enhancers"; tag = finalAttrs.version; - hash = "sha256-CUfTz+YvliJXiv/nsdrpDVFSblqoSW7js8vAtJ9u5vM="; + hash = "sha256-uj0ZZrS2Y896EDWeBsU3Q3S2kFdEg5FQkBOcI97FFWc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix index f51612b4fbcc..944936fbe444 100644 --- a/pkgs/by-name/he/heroic-unwrapped/package.nix +++ b/pkgs/by-name/he/heroic-unwrapped/package.nix @@ -3,12 +3,13 @@ stdenv, fetchFromGitHub, nix-update-script, - pnpm_9, + # Pinned, because our FODs are not guaranteed to be stable between major versions. + pnpm_10, nodejs, python3, makeWrapper, - # Upstream uses EOL Electron 31. Use next oldest version. - electron_34, + # Electron updates frequently break Heroic, so pin same version as upstream, or newest non-EOL. + electron_36, vulkan-helper, gogdl, legendary-heroic, @@ -17,27 +18,27 @@ }: let - electron = electron_34; + electron = electron_36; in stdenv.mkDerivation (finalAttrs: { pname = "heroic-unwrapped"; - version = "2.16.1"; + version = "2.17.1"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; - rev = "v${finalAttrs.version}"; - hash = "sha256-BnBzbbyi9cdO6W59cnY13hnhH+tjrTryTp9XIcERwh4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-8vmFgLtFvS9JtbQbUNdSHr9zZaTZnQ2ntSueLcCICaE="; }; - pnpmDeps = pnpm_9.fetchDeps { + pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-2IQyXULgFoz0rFQ8SwERgMDzzo7pZ3DbqhwrWNYSwRo="; + hash = "sha256-9WCIdQ91IU8pfq6kpbmmn6APBTNwpCi9ovgRuWYUad8="; }; nativeBuildInputs = [ nodejs - pnpm_9.configHook + pnpm_10.configHook python3 makeWrapper ]; diff --git a/pkgs/development/ocaml-modules/bencode/default.nix b/pkgs/development/ocaml-modules/bencode/default.nix new file mode 100644 index 000000000000..310d7f24d006 --- /dev/null +++ b/pkgs/development/ocaml-modules/bencode/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildDunePackage, + fetchFromGitHub, + ounit, + qcheck, +}: + +buildDunePackage rec { + pname = "bencode"; + version = "2.0"; + minimalOCamlVersion = "4.02.0"; + + src = fetchFromGitHub { + owner = "rgrinberg"; + repo = "bencode"; + tag = version; + hash = "sha256-sEMS9oBOPeFX1x7cHjbQhCD2QI5yqC+550pPqqMsVws="; + }; + + doCheck = true; + checkInputs = [ + ounit + qcheck + ]; + + meta = { + description = "Bencode (.torrent file format) reader/writer in OCaml "; + homepage = "https://github.com/rgrinberg/bencode"; + changelog = "https://github.com/rgrinberg/bencode/blob/${version}/Changelog.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/development/ocaml-modules/cbor/default.nix b/pkgs/development/ocaml-modules/cbor/default.nix new file mode 100644 index 000000000000..09287676de68 --- /dev/null +++ b/pkgs/development/ocaml-modules/cbor/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildDunePackage, + fetchurl, + ocplib-endian, + yojson, +}: + +buildDunePackage rec { + pname = "cbor"; + version = "0.5"; + + minimalOCamlVersion = "4.07.0"; + + src = fetchurl { + url = "https://github.com/ygrek/ocaml-cbor/releases/download/${version}/ocaml-cbor-${version}.tar.gz"; + hash = "sha256-4mpm/fv9X5uFRQO8XqBhOpxYwZreEtJ3exIwN6YulKM="; + }; + + propagatedBuildInputs = [ + ocplib-endian + ]; + + doCheck = true; + checkInputs = [ + yojson + ]; + + meta = { + description = "CBOR encoder/decoder (RFC 7049) - native OCaml implementation"; + homepage = "https://github.com/ygrek/ocaml-cbor"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/development/ocaml-modules/decoders-bencode/default.nix b/pkgs/development/ocaml-modules/decoders-bencode/default.nix new file mode 100644 index 000000000000..6e2198ff2b6d --- /dev/null +++ b/pkgs/development/ocaml-modules/decoders-bencode/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildDunePackage, + decoders, + bencode, + containers, + ounit2, +}: + +buildDunePackage rec { + pname = "decoders-bencode"; + + # sub-package built separately from the same source + inherit (decoders) src version; + + minimalOCamlVersion = "4.03.0"; + + propagatedBuildInputs = [ + decoders + bencode + ]; + + doCheck = true; + checkInputs = [ + containers + ounit2 + ]; + + meta = { + description = "Bencode backend for decoders"; + homepage = "https://github.com/mattjbray/ocaml-decoders"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/development/ocaml-modules/decoders-cbor/default.nix b/pkgs/development/ocaml-modules/decoders-cbor/default.nix new file mode 100644 index 000000000000..067beb013cb2 --- /dev/null +++ b/pkgs/development/ocaml-modules/decoders-cbor/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildDunePackage, + decoders, + cbor, + containers, + ounit2, +}: + +buildDunePackage rec { + pname = "decoders-cbor"; + + # sub-package built separately from the same source + inherit (decoders) src version; + + minimalOCamlVersion = "4.03.0"; + + propagatedBuildInputs = [ + decoders + cbor + ]; + + doCheck = true; + checkInputs = [ + containers + ounit2 + ]; + + meta = { + description = "CBOR backend for decoders"; + homepage = "https://github.com/mattjbray/ocaml-decoders"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix b/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix new file mode 100644 index 000000000000..acb5c16cffa7 --- /dev/null +++ b/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildDunePackage, + decoders, + ezjsonm, + containers, + ounit2, +}: + +buildDunePackage rec { + pname = "decoders-ezjsonm"; + + # sub-package built separately from the same source + inherit (decoders) src version; + + minimalOCamlVersion = "4.03.0"; + + propagatedBuildInputs = [ + decoders + ezjsonm + ]; + + doCheck = true; + checkInputs = [ + containers + ounit2 + ]; + + meta = { + description = "Ezjsonm backend for decoders"; + homepage = "https://github.com/mattjbray/ocaml-decoders"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix b/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix new file mode 100644 index 000000000000..685265dddff1 --- /dev/null +++ b/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildDunePackage, + decoders, + ezxmlm, + containers, +}: + +buildDunePackage rec { + pname = "decoders-ezxmlm"; + + # sub-package built separately from the same source + inherit (decoders) src version; + + minimalOCamlVersion = "4.03.0"; + + propagatedBuildInputs = [ + decoders + ezxmlm + ]; + + doCheck = true; + checkInputs = [ + containers + ]; + + meta = { + description = "Ezxmlm backend for decoders"; + homepage = "https://github.com/mattjbray/ocaml-decoders"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix b/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix new file mode 100644 index 000000000000..d6e01a3273c5 --- /dev/null +++ b/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildDunePackage, + decoders, + jsonaf ? null, + containers, + ounit2, +}: + +buildDunePackage rec { + pname = "decoders-jsonaf"; + + # sub-package built separately from the same source + inherit (decoders) src version; + + minimalOCamlVersion = "4.11.0"; + + propagatedBuildInputs = [ + decoders + jsonaf + ]; + + doCheck = true; + checkInputs = [ + containers + ounit2 + ]; + + meta = { + description = "Jsonaf backend for decoders"; + homepage = "https://github.com/mattjbray/ocaml-decoders"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/development/ocaml-modules/decoders-jsonm/default.nix b/pkgs/development/ocaml-modules/decoders-jsonm/default.nix new file mode 100644 index 000000000000..c354ae20d076 --- /dev/null +++ b/pkgs/development/ocaml-modules/decoders-jsonm/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildDunePackage, + decoders, + jsonm, + containers, + ounit2, +}: + +buildDunePackage rec { + pname = "decoders-jsonm"; + + # sub-package built separately from the same source + inherit (decoders) src version; + + minimalOCamlVersion = "4.03.0"; + + propagatedBuildInputs = [ + decoders + jsonm + ]; + + doCheck = true; + checkInputs = [ + containers + ounit2 + ]; + + meta = { + description = "Jsonm backend for decoders"; + homepage = "https://github.com/mattjbray/ocaml-decoders"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/development/ocaml-modules/decoders-msgpck/default.nix b/pkgs/development/ocaml-modules/decoders-msgpck/default.nix new file mode 100644 index 000000000000..6004a2503aac --- /dev/null +++ b/pkgs/development/ocaml-modules/decoders-msgpck/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildDunePackage, + decoders, + msgpck, + containers, + ounit2, +}: + +buildDunePackage rec { + pname = "decoders-msgpck"; + + # sub-package built separately from the same source + inherit (decoders) src version; + + minimalOCamlVersion = "4.03.0"; + + propagatedBuildInputs = [ + decoders + msgpck + ]; + + doCheck = true; + checkInputs = [ + containers + ounit2 + ]; + + meta = { + description = "Msgpck backend for decoders"; + homepage = "https://github.com/mattjbray/ocaml-decoders"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/development/ocaml-modules/decoders-sexplib/default.nix b/pkgs/development/ocaml-modules/decoders-sexplib/default.nix new file mode 100644 index 000000000000..5b12b422fded --- /dev/null +++ b/pkgs/development/ocaml-modules/decoders-sexplib/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildDunePackage, + decoders, + sexplib, + sexplib0, + containers, + ounit2, +}: + +buildDunePackage rec { + pname = "decoders-sexplib"; + + # sub-package built separately from the same source + inherit (decoders) src version; + + minimalOCamlVersion = "4.03.0"; + + propagatedBuildInputs = [ + decoders + sexplib + sexplib0 + ]; + + doCheck = true; + checkInputs = [ + containers + ounit2 + ]; + + meta = { + description = "sexplib backend for decoders"; + homepage = "https://github.com/mattjbray/ocaml-decoders"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/development/ocaml-modules/decoders-yojson/default.nix b/pkgs/development/ocaml-modules/decoders-yojson/default.nix new file mode 100644 index 000000000000..8da0e05a69ff --- /dev/null +++ b/pkgs/development/ocaml-modules/decoders-yojson/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildDunePackage, + decoders, + yojson, + containers, + ounit2, +}: + +buildDunePackage rec { + pname = "decoders-yojson"; + + # sub-package built separately from the same source + inherit (decoders) src version; + + minimalOCamlVersion = "4.03.0"; + + propagatedBuildInputs = [ + decoders + yojson + ]; + + doCheck = true; + checkInputs = [ + containers + ounit2 + ]; + + meta = { + description = "Yojson backend for decoders"; + homepage = "https://github.com/mattjbray/ocaml-decoders"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/development/ocaml-modules/decoders/default.nix b/pkgs/development/ocaml-modules/decoders/default.nix new file mode 100644 index 000000000000..42e68503ac8d --- /dev/null +++ b/pkgs/development/ocaml-modules/decoders/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildDunePackage, + fetchurl, + containers, +}: + +buildDunePackage rec { + pname = "decoders"; + version = "1.0.0"; + + minimalOCamlVersion = "4.03.0"; + + src = fetchurl { + url = "https://github.com/mattjbray/ocaml-decoders/releases/download/v${version}/${pname}-${version}.tbz"; + hash = "sha256-R/55xBAtD3EO/zzq7zExANnfPHlFg00884o5dCpXNZc="; + }; + + doCheck = true; + checkInputs = [ + containers + ]; + + meta = { + description = "Elm-inspired decoders for Ocaml"; + homepage = "https://github.com/mattjbray/ocaml-decoders"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index ba433461bd19..13320be7065b 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -27,6 +27,7 @@ armTrustedFirmwareRK3568, armTrustedFirmwareRK3588, armTrustedFirmwareS905, + opensbi, buildPackages, }@pkgs: @@ -808,6 +809,26 @@ in # sf probe; sf update $loadaddr 0 80000 }; + ubootVisionFive2 = + let + opensbi_vf2 = opensbi.overrideAttrs (attrs: { + makeFlags = attrs.makeFlags ++ [ + # Matches u-boot documentation: https://docs.u-boot.org/en/latest/board/starfive/visionfive2.html + "FW_TEXT_START=0x40000000" + "FW_OPTIONS=0" + ]; + }); + in + buildUBoot { + defconfig = "starfive_visionfive2_defconfig"; + extraMeta.platforms = [ "riscv64-linux" ]; + OPENSBI = "${opensbi_vf2}/share/opensbi/lp64/generic/firmware/fw_dynamic.bin"; + filesToInstall = [ + "spl/u-boot-spl.bin.normal.out" + "u-boot.itb" + ]; + }; + ubootWandboard = buildUBoot { defconfig = "wandboard_defconfig"; extraMeta.platforms = [ "armv7l-linux" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d50cbd1d4361..3a450f761cef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11575,6 +11575,7 @@ with pkgs; ubootSopine ubootTuringRK1 ubootUtilite + ubootVisionFive2 ubootWandboard ; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 087745078bc6..00bc16314969 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -88,6 +88,8 @@ let benchmark = callPackage ../development/ocaml-modules/benchmark { }; + bencode = callPackage ../development/ocaml-modules/bencode { }; + bheap = callPackage ../development/ocaml-modules/bheap { }; bigarray-compat = callPackage ../development/ocaml-modules/bigarray-compat { }; @@ -202,6 +204,8 @@ let git-binary = pkgs.git; }; + cbor = callPackage ../development/ocaml-modules/cbor { }; + cfstream = callPackage ../development/ocaml-modules/cfstream { }; chacha = callPackage ../development/ocaml-modules/chacha { }; @@ -326,6 +330,26 @@ let dbf = callPackage ../development/ocaml-modules/dbf { }; + decoders = callPackage ../development/ocaml-modules/decoders { }; + + decoders-bencode = callPackage ../development/ocaml-modules/decoders-bencode { }; + + decoders-cbor = callPackage ../development/ocaml-modules/decoders-cbor { }; + + decoders-ezjsonm = callPackage ../development/ocaml-modules/decoders-ezjsonm { }; + + decoders-ezxmlm = callPackage ../development/ocaml-modules/decoders-ezxmlm { }; + + decoders-jsonaf = callPackage ../development/ocaml-modules/decoders-jsonaf { }; + + decoders-jsonm = callPackage ../development/ocaml-modules/decoders-jsonm { }; + + decoders-msgpck = callPackage ../development/ocaml-modules/decoders-msgpck { }; + + decoders-sexplib = callPackage ../development/ocaml-modules/decoders-sexplib { }; + + decoders-yojson = callPackage ../development/ocaml-modules/decoders-yojson { }; + decompress = callPackage ../development/ocaml-modules/decompress { }; dedukti = callPackage ../development/ocaml-modules/dedukti { };