diff options
20 files changed, 245 insertions, 56 deletions
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 53d84118bd30..270be3a43cd3 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -78,7 +78,7 @@ rec { isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ]; isEfi = map (family: { cpu.family = family; }) - [ "x86" "arm" "aarch64" ]; + [ "x86" "arm" "aarch64" "riscv" ]; }; matchAnyAttrs = patterns: diff --git a/nixos/modules/programs/neovim.nix b/nixos/modules/programs/neovim.nix index 8de527fceb26..4562e5a2c29b 100644 --- a/nixos/modules/programs/neovim.nix +++ b/nixos/modules/programs/neovim.nix @@ -7,7 +7,7 @@ let runtime' = filter (f: f.enable) (attrValues cfg.runtime); - runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = x.target; path = x.source; }) runtime'); + runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = "etc/${x.target}"; path = x.source; }) runtime'); in { options.programs.neovim = { diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index c9d5afce614c..cc727a9a8509 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -27,6 +27,7 @@ , libpng , librsvg , libtiff +, libjxl , openexr_3 , osm-gps-map , pkg-config @@ -57,12 +58,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.0"; + version = "4.2.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "0bfcag6bj5vcmg4z4xjirs43iafcx89al6jl41i5mrhpjzszh5hl"; + sha256 = "18b0917fdfe9b09f66c279a681cc3bd52894a566852bbf04b2e179ecfdb11af9"; }; nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { libpng librsvg libtiff + libjxl openexr_3 sqlite libxslt diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index afd41814dc30..57f507ba608b 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-dCMseU7rHxfyLCr+RlmsSJM7TSg3x/lQoCZpUtuPboQ="; + hash = "sha256-sCtRNdQRSPpIBSwtQMoetKmFLYUe3w1esogdkLqTHbk="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorSha256 = "sha256-Lpc/fzOJLIyI2O5DP8K/LBYg6ZA1ixristercAM5VUQ="; + vendorHash = "sha256-Lpc/fzOJLIyI2O5DP8K/LBYg6ZA1ixristercAM5VUQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a7be53563107..525eb833d4f1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -121,20 +121,20 @@ "vendorHash": "sha256-L4EoUqkA5/nAs65G+mvXfFt/FzrCN/BmJoFSCP4PC7Q=" }, "azuread": { - "hash": "sha256-itaFeOEnoTIJfACvJZCIe9RWNVgewdVFZzXUK7yGglQ=", + "hash": "sha256-N+ty5O7sJbCp/rdQrwytOHzPFkaIvT5+1pOcoBQF1aw=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.31.0", + "rev": "v2.32.0", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-ZLQV8hHh5U+qvBQovPxisPZ1BDUBH5YoKEt240bzQ0Y=", + "hash": "sha256-yCjfZruli5cIengL9f6ORsDWTY1BXwMr9g2Ohw+Q1Pc=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.38.0", + "rev": "v3.39.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -825,13 +825,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-2AR416LkqgfHdY18m4k/jqSet7G77HwHuGKilvS3Yig=", + "hash": "sha256-+aHlFu49BxdFqrVCEIEqpg+o2i4d5F1uZipc//Qipaw=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.39.0", + "rev": "v3.40.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-6dwFsEtlR3PtbshY6brauPN13seBmZda0Vkr65MAMhQ=" + "vendorHash": "sha256-XwQTtOsg1rktv/Oc+eTJ+Jr+BJvLEQPCaRSeXdXxWB0=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -969,13 +969,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-dxXEGAkmemTHmGvKOwe3+xVE+nP4CAr82JmL3Nh+BQA=", + "hash": "sha256-k02p6eoo152SWalGCX4iXhkE5xN55HpQ9A31j7wuIPE=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.9.0", + "rev": "v2.9.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-bzx/Hl2JobtIa+ndvu1ssKg+faxt+JmJe4BL/go/0WY=" + "vendorHash": "sha256-FbWLXt7MFn/86NlSwCYpSV/6Ft3xRcESoNcVxM1A4ng=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1032,11 +1032,11 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-Ku6r5yUi30R7bXmChF+F+8YuMe/KKdrXrOIUtGMM1Fk=", + "hash": "sha256-QikYp81omjlSckr/2oXCmAqiJlcMWuR120z86fP/zkE=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.55.0", + "rev": "v0.55.1", "spdx": "MIT", "vendorHash": "sha256-ulgTRY8qQ5oXONkwYtffRl1QMNnbvyn0zYiYqqvwrUU=" }, @@ -1050,13 +1050,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-OxpXh9wCsIjDSA6kDH9Gapkx0cWH8vFJoCxZu5FRPC8=", + "hash": "sha256-IhThsNLMHR29rOq1bDFsmySKFgvVxJ8twtjby6JxEc4=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.90.0", + "rev": "v1.91.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-L5nNi2DdchkjuWFOF7mOIiW3GzhDk6P66RQwyw0PhSM=" + "vendorHash": "sha256-imMuIXBCg2k9Cp78V4MMkb/bMWRbpxnCuLCFaQrBg3Q=" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", @@ -1187,13 +1187,13 @@ "vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE=" }, "vcd": { - "hash": "sha256-Gpib9vgd8t//WJj7tuVEUYGf4HitqE/Kz8RyhMglKsw=", + "hash": "sha256-EG4WSnUZr/QfUT1qqOBOGze5Ztxp0HSB9Q1YYgLXQqk=", "homepage": "https://registry.terraform.io/providers/vmware/vcd", "owner": "vmware", "repo": "terraform-provider-vcd", - "rev": "v3.8.1", + "rev": "v3.8.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-UT34mv0QN0Nq2+bRmAqFhslSzNe9iESUKEYLmjq9DRM=" + "vendorHash": "sha256-fDMS1ne6EKAqQjfE4QT1A0ChloXKCrgZPcftxzN/JwU=" }, "venafi": { "hash": "sha256-/5X/+BilaYwi1Vce7mIvVeHjTpVX/OuYquZ+2BGfxrs=", diff --git a/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch b/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch new file mode 100644 index 000000000000..053edac85b21 --- /dev/null +++ b/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch @@ -0,0 +1,12 @@ +diff --git a/CMake/dcmtk.pc.in b/CMake/dcmtk.pc.in +index 13c79c0d5..b1edf725c 100644 +--- a/CMake/dcmtk.pc.in ++++ b/CMake/dcmtk.pc.in +@@ -1,6 +1,6 @@ + prefix="@CMAKE_INSTALL_PREFIX@" + exec_prefix="${prefix}" +- libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@" ++ libdir=@CMAKE_INSTALL_FULL_LIBDIR@" + includedir="${prefix}/include/" + + Name: DCMTK diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/pkgs/applications/science/medicine/dcmtk/default.nix index a1f4b455ce79..3b4361228635 100644 --- a/pkgs/applications/science/medicine/dcmtk/default.nix +++ b/pkgs/applications/science/medicine/dcmtk/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv, libpng, cmake }: +{ lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv +, libpng, cmake, fetchpatch }: with lib; stdenv.mkDerivation rec { @@ -14,8 +15,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libpng zlib libtiff libxml2 openssl libiconv ]; + # This is only needed until https://github.com/DCMTK/dcmtk/pull/75/files is merged + patches = [ ./0001-Fix-cmake.patch ]; + meta = { - description = "Collection of libraries and applications implementing large parts of the DICOM standard"; + description = + "Collection of libraries and applications implementing large parts of the DICOM standard"; longDescription = '' DCMTK is a collection of libraries and applications implementing large parts of the DICOM standard. It includes software for examining, constructing and converting DICOM image files, handling offline media, diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index e4f0760b68eb..7a10bf4cfaef 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "riverwm"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-BrOZch6wkiBB4rk0M7Aoy8sZh8uOTQFOPxd3xLyy/K0="; + rev = "refs/tags/v${version}"; + hash = "sha256-eIW8NNhacAM/7gZCUHCmiySANLenfcaCRTUkoJUZRPQ="; fetchSubmodules = true; }; diff --git a/pkgs/data/icons/capitaine-cursors-themed/default.nix b/pkgs/data/icons/capitaine-cursors-themed/default.nix new file mode 100644 index 000000000000..d86ce3f8161a --- /dev/null +++ b/pkgs/data/icons/capitaine-cursors-themed/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchzip }: +fetchzip rec { + pname = "capitaine-cursors-themed"; + version = "5"; + stripRoot = false; + url = "https://github.com/sainnhe/capitaine-cursors/releases/download/r${version}/Linux.zip"; + sha256 = "jQNAXuR/OtvohWziGYgb5Ni2/tEIGaY9HIyUUW793EY="; + + postFetch = '' + mkdir -p $out/share/icons + cp -r ./ $out/share/icons + ''; + + meta = with lib; { + description = "A fork of the capitaine cursor theme, with some additional variants (Gruvbox, Nord, Palenight) and support for HiDPI"; + homepage = "https://github.com/sainnhe/capitaine-cursors"; + license = licenses.lgpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.math-42 ]; + }; +} diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index f00e67dfdcab..7ce9973c3b72 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202301050046"; + version = "202301120046"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "6bb07558ac223b3decdff985d5737f4384b34238"; - sha256 = "sha256-KXLIIs1W+8TC2GtW3m/YA5WQ13Pq5kxC5Zc9jDzW/tU="; + rev = "c308361f47373772d1a3b9d486cd7dded7165d8e"; + sha256 = "sha256-GhCEsMDeMapWpJckMWS+3azuNjMdiN4cjDyq8aSJINA="; }; installPhase = '' diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix new file mode 100644 index 000000000000..71bf442c82cd --- /dev/null +++ b/pkgs/development/compilers/julia/1.9.nix @@ -0,0 +1,94 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, which +, python3 +, gfortran +, cmake +, perl +, gnum4 +, openssl +, libxml2 +}: + +stdenv.mkDerivation rec { + pname = "julia"; + version = "1.9.0-beta2"; + + src = fetchurl { + url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; + hash = "sha256-LTQp5vBMOSlwThYpSIv/UNJ9eIU+WId/XWGFxsrQEzs="; + }; + + patches = [ + ./patches/1.8/0002-skip-failing-and-flaky-tests.patch + # https://github.com/JuliaLang/julia/issues/46530 + (fetchpatch { + url = "https://github.com/JuliaLang/julia/commit/b9b60fcde61ff18d77cb548421b3f71a369b4e02.patch"; + revert = true; + hash = "sha256-XXn4U8aWkWwZYwpvIx+Gk5E16prjeXooF9AafK0aEfg="; + }) + ]; + + strictDeps = true; + + nativeBuildInputs = [ + which + python3 + gfortran + cmake + perl + gnum4 + openssl + ]; + + buildInputs = [ + libxml2 + ]; + + dontUseCmakeConfigure = true; + + postPatch = '' + patchShebangs . + ''; + + makeFlags = [ + "prefix=$(out)" + "USE_BINARYBUILDER=0" + # workaround for https://github.com/JuliaLang/julia/issues/47989 + "USE_INTEL_JITEVENTS=0" + ] ++ lib.optionals stdenv.isx86_64 [ + # https://github.com/JuliaCI/julia-buildbot/blob/master/master/inventory.py + "JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" + ] ++ lib.optionals stdenv.isAarch64 [ + "JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;armv8.2-a,crypto,fullfp16,lse,rdm" + ]; + + # remove forbidden reference to $TMPDIR + preFixup = '' + for file in libcurl.so libgmpxx.so libmpfr.so; do + patchelf --shrink-rpath --allowed-rpath-prefixes ${builtins.storeDir} "$out/lib/julia/$file" + done + ''; + + doInstallCheck = true; + installCheckTarget = "testall"; + + preInstallCheck = '' + export HOME="$TMPDIR" + export JULIA_TEST_USE_MULTIPLE_WORKERS="true" + ''; + + dontStrip = true; + + enableParallelBuilding = true; + + meta = with lib; { + description = "High-level performance-oriented dynamical language for technical computing"; + homepage = "https://julialang.org/"; + license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index a889e5358a50..2f0e2148dfeb 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }: let - version = "0.3.95"; + version = "0.3.3"; pname = "lensfun"; # Fetch a more recent version of the repo containing a more recent lens @@ -9,8 +9,8 @@ let lensfunDatabase = fetchFromGitHub { owner = "lensfun"; repo = "lensfun"; - rev = "4672d765a17bfef7bc994ca7008cb717c61045d5"; - sha256 = "00x35xhpn55j7f8qzakb6wl1ccbljg1gqjb93jl9w3mha2bzsr41"; + rev = "ec9412d27d5fa8f377848a59c768b12c243cb80d"; + sha256 = "sha256-/u/3oQzac/dQrgFaiYvzT5uQ108XarkXnA2DByA5sic="; }; in @@ -21,16 +21,26 @@ stdenv.mkDerivation { owner = "lensfun"; repo = "lensfun"; rev = "v${version}"; - sha256 = "0isli0arns8bmxqpbr1jnbnqh5wvspixdi51adm671f9ngng7x5r"; + sha256 = "0ixf0f7qv0mc7zrw9w1sb60w833g4rqrfj8cjxwzv2vimqcksccz"; }; # replace database with a more recent snapshot + # the mastr branch uses version 2 profiles, while 0.3.3 requires version 1 profiles, + # so we run the conversion tool the project provides, + # then untar the verson 1 profiles into the source dir before we build prePatch = '' - rm -R ./data/db - cp -R ${lensfunDatabase}/data/db ./data + rm -R data/db + python3 ${lensfunDatabase}/tools/lensfun_convert_db_v2_to_v1.py $TMPDIR ${lensfunDatabase}/data/db + mkdir -p data/db + tar xvf $TMPDIR/db/version_1.tar -C data/db + date +%s > data/db/timestamp.txt ''; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake pkg-config + python3 python3.pkgs.lxml # For the db converison + ]; + buildInputs = [ glib zlib libpng ]; cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ]; diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index fdb0bfde7d40..01d62cac0e9e 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.13.8"; + version = "2.13.9"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-selZV5smB5CTCyDzx6p877ikDg3oDUp3fCv3jGs1PcE="; + sha256 = "sha256-jZTclbYIz3AhawEgOj+CQrl6Iy2y4jQhovQ3CNoI8zc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 5f238e7e14d7..f1f15c6eecca 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -51,13 +51,13 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "515.49.25"; - persistencedVersion = "515.48.07"; - settingsVersion = "515.48.07"; - sha256_64bit = "sha256-5j+YtKaPhDxd9bcPX10ViugLMCTXEYJfod+ecn3SHWc="; - openSha256 = "sha256-EnZXEvic9GdcNbcvpmbDkq6YPYqypBKyEXxFJJJJpKk="; - settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU="; - persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY="; + version = "525.47.04"; + persistencedVersion = "525.78.01"; + settingsVersion = "525.78.01"; + sha256_64bit = "sha256-PcDRM39s4vh5++4TocIJKI3wsxWxJdy3p3KAenpdIc0="; + openSha256 = "sha256-jH7mwSpasOdWMvN1xuPkO33g0XJjObzA45aqHwKoD4w="; + settingsSha256 = "sha256-1d3Cn+7Gm1ORQxmTKr18GFmYHVb8t050XVLler1dCtw="; + persistencedSha256 = "sha256-t6dViuvA2fw28w4kh4koIoxh9pQ8f7KI1PIUFJcGlYA="; url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; }; diff --git a/pkgs/tools/admin/auth0-cli/default.nix b/pkgs/tools/admin/auth0-cli/default.nix index b94955f611d7..0509173650de 100644 --- a/pkgs/tools/admin/auth0-cli/default.nix +++ b/pkgs/tools/admin/auth0-cli/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; - rev = "tags/release/v${version}"; + rev = "v${version}"; hash = "sha256-FotjdMbQXDwkURSeye86sIFN60V//UlF7kZrwfkvTGY="; }; diff --git a/pkgs/tools/misc/aoc-cli/default.nix b/pkgs/tools/misc/aoc-cli/default.nix new file mode 100644 index 000000000000..34100865381e --- /dev/null +++ b/pkgs/tools/misc/aoc-cli/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "aoc-cli"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "scarvalhojr"; + repo = pname; + rev = version; + hash = "sha256-oUvEZEnhYeAAZyLn2/isDZKT0+mhS5fnCvYGsR94uk0="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optional stdenv.isDarwin Security; + + cargoHash = "sha256-/76yzWPKGp4MEmFuvFJOMCxGKEdpohfzBAhRwvdEx8w="; + + meta = with lib; { + description = "Advent of code command line tool"; + homepage = "https://github.com/scarvalhojr/aoc-cli/"; + license = licenses.mit; + maintainers = with maintainers; [ jordanisaacs ]; + }; +} diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 58ed620ffd08..15c9652d6a29 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -25,6 +25,8 @@ let x86_64-linux.target = "x86_64"; armv7l-linux.target = "arm"; aarch64-linux.target = "aarch64"; + riscv32-linux.target = "riscv32"; + riscv64-linux.target = "riscv64"; }; # For aarch64, we need to use '--target=aarch64-efi' when building, @@ -34,6 +36,8 @@ let x86_64-linux.target = "x86_64"; armv7l-linux.target = "arm"; aarch64-linux.target = "arm64"; + riscv32-linux.target = "riscv32"; + riscv64-linux.target = "riscv64"; }; canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index 099bb35b58a7..646cac461fd7 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; - rev = "tags/release/v${version}"; + rev = "v${version}"; hash = "sha256-zbQOmlFWpoQwf4rlDLn1V0vj1c66pVWrMROGANRDl9s="; }; diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix index c4a9dfd5b0fd..76f63e58222b 100644 --- a/pkgs/tools/security/yubikey-agent/default.nix +++ b/pkgs/tools/security/yubikey-agent/default.nix @@ -3,12 +3,12 @@ buildGoModule rec { pname = "yubikey-agent"; - version = "unstable-2022-03-17"; + version = "0.1.6"; src = fetchFromGitHub { owner = "FiloSottile"; repo = "yubikey-agent"; - rev = "205a7ef2554625c7494038600d963123d6311873"; - sha256 = "sha256-wJpN63KY5scmez6yYFsIr3JLEUB+YSl/XvoatIIeRI0="; + rev = "v${version}"; + sha256 = "sha256-Knk1ipBOzjmjrS2OFUMuxi1TkyDcSYlVKezDWT//ERY="; }; buildInputs = @@ -21,7 +21,7 @@ buildGoModule rec { substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send ''; - vendorSha256 = "sha256-SnjbkDPVjAnCbM2nLqBsuaPZwOmvDTKiUbi/93BlWVQ="; + vendorSha256 = "sha256-+IRPs3wm3EvIgfQRpzcVpo2JBaFQlyY/RI1G7XfVS84="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6b5746c4b6d..ff64d0a9979b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3424,6 +3424,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + aoc-cli = callPackage ../tools/misc/aoc-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; + apprise = with python3Packages; toPythonApplication apprise; aptdec = callPackage ../development/libraries/aptdec {}; @@ -14874,6 +14878,7 @@ with pkgs; julia_18-bin = callPackage ../development/compilers/julia/1.8-bin.nix { }; julia_18 = callPackage ../development/compilers/julia/1.8.nix { }; + julia_19 = callPackage ../development/compilers/julia/1.9.nix { }; julia-lts-bin = julia_16-bin; julia-stable-bin = julia_18-bin; @@ -26560,6 +26565,8 @@ with pkgs; capitaine-cursors = callPackage ../data/icons/capitaine-cursors { }; + capitaine-cursors-themed = callPackage ../data/icons/capitaine-cursors-themed { }; + carlito = callPackage ../data/fonts/carlito {}; cascadia-code = callPackage ../data/fonts/cascadia-code { }; |