Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
5a036cc96a
|
|
@ -710,9 +710,9 @@ in
|
|||
'';
|
||||
}
|
||||
# Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5
|
||||
// (let cfgPath = "/X11/xorg.conf.d/10-evdev.conf"; in
|
||||
// (let cfgPath = "X11/xorg.conf.d/10-evdev.conf"; in
|
||||
{
|
||||
${cfgPath}.source = xorg.xf86inputevdev.out + "/share" + cfgPath;
|
||||
${cfgPath}.source = xorg.xf86inputevdev.out + "/share/" + cfgPath;
|
||||
});
|
||||
|
||||
environment.systemPackages = utils.removePackagesByName
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ class ComposefsPath:
|
|||
):
|
||||
if path is None:
|
||||
path = attrs["target"]
|
||||
self.path = "/" + path
|
||||
self.path = path
|
||||
self.size = size
|
||||
self.filetype = filetype
|
||||
self.mode = mode
|
||||
|
|
@ -83,8 +83,12 @@ class ComposefsPath:
|
|||
return " ".join(line_list)
|
||||
|
||||
|
||||
def eprint(*args, **kwargs) -> None:
|
||||
print(args, **kwargs, file=sys.stderr)
|
||||
def eprint(*args: Any, **kwargs: Any) -> None:
|
||||
print(*args, **kwargs, file=sys.stderr)
|
||||
|
||||
|
||||
def normalize_path(path: str) -> str:
|
||||
return str("/" + os.path.normpath(path).lstrip("/"))
|
||||
|
||||
|
||||
def leading_directories(path: str) -> list[str]:
|
||||
|
|
@ -145,6 +149,10 @@ def main() -> None:
|
|||
|
||||
paths: dict[str, ComposefsPath] = {}
|
||||
for attrs in config:
|
||||
# Normalize the target path to work around issues in how targets are
|
||||
# declared in `environment.etc`.
|
||||
attrs["target"] = normalize_path(attrs["target"])
|
||||
|
||||
target = attrs["target"]
|
||||
source = attrs["source"]
|
||||
mode = attrs["mode"]
|
||||
|
|
|
|||
|
|
@ -4162,6 +4162,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/kiyoon/haskell-scope-highlighting.nvim/";
|
||||
};
|
||||
|
||||
haskell-snippets-nvim = buildVimPlugin {
|
||||
pname = "haskell-snippets.nvim";
|
||||
version = "2024-01-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrcjkb";
|
||||
repo = "haskell-snippets.nvim";
|
||||
rev = "c26279d568452f5474f26470aff6549f94ff7cd3";
|
||||
sha256 = "1rl9g25afaqiw16i582hbnnag0v6xcn28f09cy8vfddj696ygzg6";
|
||||
};
|
||||
meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/";
|
||||
};
|
||||
|
||||
haskell-tools-nvim = buildNeovimPlugin {
|
||||
pname = "haskell-tools.nvim";
|
||||
version = "2024-01-21";
|
||||
|
|
|
|||
|
|
@ -670,6 +670,10 @@
|
|||
dependencies = with self; [ plenary-nvim ];
|
||||
};
|
||||
|
||||
haskell-snippets-nvim = super.haskell-snippets-nvim.overrideAttrs {
|
||||
dependencies = [ self.luasnip ];
|
||||
};
|
||||
|
||||
haskell-scope-highlighting-nvim = super.haskell-scope-highlighting-nvim.overrideAttrs {
|
||||
dependencies = with self; [ nvim-treesitter ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -348,6 +348,7 @@ https://git.sr.ht/~sircmpwn/hare.vim,HEAD,
|
|||
https://github.com/ThePrimeagen/harpoon/,master,
|
||||
https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2
|
||||
https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD,
|
||||
https://github.com/mrcjkb/haskell-snippets.nvim/,HEAD,
|
||||
https://github.com/MrcJkb/haskell-tools.nvim/,HEAD,
|
||||
https://github.com/neovimhaskell/haskell-vim/,,
|
||||
https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
|
||||
|
|
|
|||
|
|
@ -1,131 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, testers
|
||||
|
||||
, enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format
|
||||
|
||||
, cmake
|
||||
, curl
|
||||
, gdal
|
||||
, hdf5-cpp
|
||||
, LASzip
|
||||
, libe57format
|
||||
, libgeotiff
|
||||
, libtiff
|
||||
, libxml2
|
||||
, openscenegraph
|
||||
, pkg-config
|
||||
, postgresql
|
||||
, tiledb
|
||||
, xercesc
|
||||
, zlib
|
||||
, zstd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pdal";
|
||||
version = "2.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PDAL";
|
||||
repo = "PDAL";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-JKwa89c05EfZ/FxOkj8lYmw0o2EgSqafRDIV2mTpZ5E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
gdal
|
||||
hdf5-cpp
|
||||
LASzip
|
||||
libgeotiff
|
||||
libtiff
|
||||
libxml2
|
||||
openscenegraph
|
||||
postgresql
|
||||
tiledb
|
||||
xercesc
|
||||
zlib
|
||||
zstd
|
||||
] ++ lib.optionals enableE57 [
|
||||
libe57format
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_PLUGIN_E57=${if enableE57 then "ON" else "OFF"}"
|
||||
"-DBUILD_PLUGIN_HDF=ON"
|
||||
"-DBUILD_PLUGIN_PGPOINTCLOUD=ON"
|
||||
"-DBUILD_PLUGIN_TILEDB=ON"
|
||||
"-DWITH_TESTS=ON"
|
||||
"-DBUILD_PGPOINTCLOUD_TESTS=OFF"
|
||||
|
||||
# Plugins can probably not be made work easily:
|
||||
"-DBUILD_PLUGIN_CPD=OFF"
|
||||
"-DBUILD_PLUGIN_FBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs
|
||||
"-DBUILD_PLUGIN_GEOWAVE=OFF"
|
||||
"-DBUILD_PLUGIN_I3S=OFF"
|
||||
"-DBUILD_PLUGIN_ICEBRIDGE=OFF"
|
||||
"-DBUILD_PLUGIN_MATLAB=OFF"
|
||||
"-DBUILD_PLUGIN_MBIO=OFF"
|
||||
"-DBUILD_PLUGIN_MRSID=OFF"
|
||||
"-DBUILD_PLUGIN_NITF=OFF"
|
||||
"-DBUILD_PLUGIN_OCI=OFF"
|
||||
"-DBUILD_PLUGIN_RDBLIB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs
|
||||
"-DBUILD_PLUGIN_RIVLIB=OFF"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
disabledTests = [
|
||||
# Tests failing due to TileDB library implementation, disabled also
|
||||
# by upstream CI.
|
||||
# See: https://github.com/PDAL/PDAL/blob/bc46bc77f595add4a6d568a1ff923d7fe20f7e74/.github/workflows/linux.yml#L81
|
||||
"pdal_io_tiledb_writer_test"
|
||||
"pdal_io_tiledb_reader_test"
|
||||
"pdal_io_tiledb_time_writer_test"
|
||||
"pdal_io_tiledb_time_reader_test"
|
||||
"pdal_io_tiledb_bit_fields_test"
|
||||
"pdal_io_e57_read_test"
|
||||
"pdal_io_e57_write_test"
|
||||
"pdal_io_stac_reader_test"
|
||||
|
||||
# Segfault
|
||||
"pdal_io_hdf_reader_test"
|
||||
|
||||
# Failure
|
||||
"pdal_app_plugin_test"
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
# tests are flaky and they seem to fail less often when they don't run in
|
||||
# parallel
|
||||
ctest -j 1 --output-on-failure -E '^${lib.concatStringsSep "|" finalAttrs.disabledTests}$'
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "pdal --version";
|
||||
version = "pdal ${finalAttrs.finalPackage.version}";
|
||||
};
|
||||
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data";
|
||||
homepage = "https://pdal.io";
|
||||
license = licenses.bsd3;
|
||||
maintainers = teams.geospatial.members;
|
||||
platforms = platforms.all;
|
||||
pkgConfigModules = [ "pdal" ];
|
||||
};
|
||||
})
|
||||
|
|
@ -47,11 +47,6 @@
|
|||
}:
|
||||
|
||||
let
|
||||
|
||||
# replace with global pdal version once
|
||||
# https://github.com/qgis/QGIS/pull/54940 is backported
|
||||
pdal = callPackage ./pdal-2_5.nix { };
|
||||
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
pyqt5 = super.pyqt5.override {
|
||||
|
|
@ -132,7 +127,7 @@ in mkDerivation rec {
|
|||
qtserialport
|
||||
qtxmlpatterns
|
||||
qt3d
|
||||
pdal
|
||||
# pdal
|
||||
zstd
|
||||
] ++ lib.optional withGrass grass
|
||||
++ lib.optional withWebKit qtwebkit
|
||||
|
|
@ -151,9 +146,11 @@ in mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
# PDAL is disabled until https://github.com/qgis/QGIS/pull/54940
|
||||
# is backported.
|
||||
cmakeFlags = [
|
||||
"-DWITH_3D=True"
|
||||
"-DWITH_PDAL=TRUE"
|
||||
"-DWITH_PDAL=False" # TODO: re-enable PDAL
|
||||
"-DENABLE_TESTS=False"
|
||||
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
|
||||
++ lib.optional withGrass (let
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
let
|
||||
inherit (rustPlatform) buildRustPackage bindgenHook;
|
||||
|
||||
version = "0.2.8";
|
||||
version = "0.3.2";
|
||||
in
|
||||
buildRustPackage {
|
||||
pname = "figma-agent";
|
||||
|
|
@ -18,10 +18,10 @@ buildRustPackage {
|
|||
owner = "neetly";
|
||||
repo = "figma-agent-linux";
|
||||
rev = version;
|
||||
sha256 = "sha256-GtbONBAXoJ3AdpsWGk4zBCtGQr446siMtuj3or27wYw=";
|
||||
sha256 = "sha256-iXLQOc8gomOik+HIIoviw19II5MD6FM0W5DT3aqtIcM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EmBeRdnA59PdzSEX2x+sVYk/Cs7K3k0idDjbuEzI9j4=";
|
||||
cargoHash = "sha256-ulYDKMMtKfBYur34CVhac4uaU0kfdkeBCCP/heuUZek=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
((buildMozillaMach rec {
|
||||
pname = "floorp";
|
||||
packageVersion = "11.8.2";
|
||||
packageVersion = "11.9.0";
|
||||
applicationName = "Floorp";
|
||||
binaryName = "floorp";
|
||||
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
repo = "Floorp";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${packageVersion}";
|
||||
hash = "sha256-bEHl+0MzvQNMCxOjBuFx92gwNr0spVA+on0znBUIhz0=";
|
||||
hash = "sha256-Mk/5bkaSLQYFFGhCSjVho8CUilZSYDGarnIt4Wg9/6g=";
|
||||
};
|
||||
|
||||
extraConfigureFlags = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "popeye";
|
||||
version = "0.11.2";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "derailed";
|
||||
repo = "popeye";
|
||||
sha256 = "sha256-2mLbBvdUWGspTNeU3QJzR5NDI24njvRO2nss/Bo93W8=";
|
||||
sha256 = "sha256-yxYG74k/HpzIrAFLLSnaqKeODIL+ioNXeyx0aTlsCi0=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.54.22";
|
||||
version = "0.55.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Kxj/Op+XWKJ5C0sShnXp8zovpn0BZh7CYm8FwLHTXpI=";
|
||||
hash = "sha256-OWhngNfcCxubGirDV+PdQHLmO/OjXHiUjqY3lt+wWW8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Y5+XruUqya+sY3DuX/bVVT4ZVYmTBIDoFRAiRKFyX3M=";
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@
|
|||
, qtsvg
|
||||
, qtwebengine
|
||||
, qtwebchannel
|
||||
, wrapGAppsHook
|
||||
, withWebengine ? true
|
||||
|
||||
# for pjsip
|
||||
|
|
@ -200,7 +201,10 @@ stdenv.mkDerivation rec {
|
|||
ln -s ${daemon} $out/daemon
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
wrapQtAppsHook
|
||||
pkg-config
|
||||
cmake
|
||||
|
|
@ -234,6 +238,10 @@ stdenv.mkDerivation rec {
|
|||
"--set-default QT_QPA_PLATFORM xcb"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "stable/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "protonmail-bridge";
|
||||
version = "3.8.1";
|
||||
version = "3.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonMail";
|
||||
repo = "proton-bridge";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-deddWAguDyUVhW31MIBNC850qeVOQYeBux8W66Diee4=";
|
||||
hash = "sha256-I42f7cV5QsUIPkcc6YDTboS4/LrObHAE3w9S48jsaKM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6xofWf5WFE1wuCwx8iOMcC3gxDzZB3uw3WErLWluBM8=";
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, mkDerivation
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, fetchpatch2
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qtbase
|
||||
|
|
@ -41,6 +42,11 @@ mkDerivation rec {
|
|||
url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/bd5f78c3a4d977d9b0c74302ce2521c737189b43.diff";
|
||||
hash = "sha256-h2g5toFqgEEnObd2TYQms1a1WFTgN7VsIHyy0Uyq4/I=";
|
||||
})
|
||||
# https://gitlab.com/scarpetta/pdfmixtool/-/merge_requests/14
|
||||
(fetchpatch2 {
|
||||
url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/268291317ccd1805dc1c801ff88641ba06c6a7f0.patch";
|
||||
hash = "sha256-56bDoFtE+IOQHcV9xPfyrgYYFvTfB0QiLIfRl91irb0=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cloudlog";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magicbug";
|
||||
repo = "Cloudlog";
|
||||
rev = version;
|
||||
hash = "sha256-1V3btXYozgT22KiihZgUiZIktV2Y7IXJgoq7bn16ikk=";
|
||||
hash = "sha256-axulZxMSgpBtF2cUCUWiVdiEOAalvo6RNtG4xpEmC7o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
136
pkgs/applications/science/misc/openrefine/default.nix
Normal file
136
pkgs/applications/science/misc/openrefine/default.nix
Normal file
|
|
@ -0,0 +1,136 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, buildNpmPackage
|
||||
, curl
|
||||
, jdk
|
||||
, jq
|
||||
, makeWrapper
|
||||
, maven
|
||||
, writeText
|
||||
}:
|
||||
|
||||
let
|
||||
maven' = maven.override {
|
||||
inherit jdk;
|
||||
};
|
||||
|
||||
version = "3.7.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "openrefine";
|
||||
repo = "openrefine";
|
||||
rev = version;
|
||||
hash = "sha256-/Txx+r+eFizxaTV5u/nOJwum8nJW6jsR6kYA0YbRsJs=";
|
||||
};
|
||||
|
||||
npmPkg = buildNpmPackage {
|
||||
inherit src version;
|
||||
|
||||
pname = "openrefine-npm";
|
||||
sourceRoot = "source/main/webapp";
|
||||
|
||||
npmDepsHash = "sha256-8GhcL4tohQ5u2HeYN6JyTMMobUOqAL8ETCLiP1SoDSk=";
|
||||
|
||||
# package.json doesn't supply a version, which npm doesn't like - fix this.
|
||||
# directly referencing jq because buildNpmPackage doesn't pass
|
||||
# nativeBuildInputs through to fetchNpmDeps
|
||||
postPatch = ''
|
||||
NEW_PACKAGE_JSON=$(mktemp)
|
||||
${jq}/bin/jq '. + {version: $ENV.version}' package.json > $NEW_PACKAGE_JSON
|
||||
cp $NEW_PACKAGE_JSON package.json
|
||||
'';
|
||||
|
||||
dontNpmBuild = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r modules/core/3rdparty/* $out/
|
||||
'';
|
||||
};
|
||||
|
||||
in maven'.buildMavenPackage {
|
||||
inherit src version;
|
||||
|
||||
pname = "openrefine";
|
||||
|
||||
postPatch = ''
|
||||
cp -r ${npmPkg} main/webapp/modules/core/3rdparty
|
||||
'';
|
||||
mvnParameters = "-DskipTests=true -pl !packaging";
|
||||
mvnHash = "sha256-MqE+iloqzBav6E3/rf1LP5BlKhW/FBIt6+6U+S8UJWA=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = let
|
||||
gitProperties = writeText "git.properties" (builtins.toJSON {
|
||||
"git.build.version" = version;
|
||||
"git.branch" = "none";
|
||||
"git.build.time" = "1970-01-01T00:00:00+0000";
|
||||
"git.commit.id.abbrev" = "none";
|
||||
"git.commit.id.describe" = "none";
|
||||
});
|
||||
in ''
|
||||
mkdir -p $out/lib/server/target/lib
|
||||
cp -r server/target/lib/* $out/lib/server/target/lib/
|
||||
cp server/target/openrefine-*-server.jar $out/lib/server/target/lib/
|
||||
|
||||
mkdir -p $out/lib/webapp
|
||||
cp -r main/webapp/{WEB-INF,modules} $out/lib/webapp/
|
||||
(
|
||||
cd extensions
|
||||
for ext in * ; do
|
||||
if [ -d "$ext/module" ] ; then
|
||||
mkdir -p "$out/lib/webapp/extensions/$ext"
|
||||
cp -r "$ext/module" "$out/lib/webapp/extensions/$ext/"
|
||||
fi
|
||||
done
|
||||
)
|
||||
|
||||
cp ${gitProperties} $out/lib/webapp/WEB-INF/classes/git.properties
|
||||
|
||||
mkdir -p $out/etc
|
||||
cp refine.ini $out/etc/
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp refine $out/bin/
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
find $out -name '*.java' -delete
|
||||
sed -i -E 's|^(butterfly\.modules\.path =).*extensions.*$|\1 '"$out/lib/webapp/extensions|" \
|
||||
$out/lib/webapp/WEB-INF/butterfly.properties
|
||||
|
||||
sed -i 's|^cd `dirname \$0`$|cd '"$out/lib|" $out/bin/refine
|
||||
|
||||
cat >> $out/etc/refine.ini <<EOF
|
||||
REFINE_WEBAPP='$out/lib/webapp'
|
||||
REFINE_LIB_DIR='$out/lib/server/target/lib'
|
||||
|
||||
JAVA_HOME='${jdk.home}'
|
||||
|
||||
# non-headless mode tries to launch a browser, causing a
|
||||
# number of purity problems
|
||||
JAVA_OPTIONS='-Drefine.headless=true'
|
||||
EOF
|
||||
|
||||
wrapProgram $out/bin/refine \
|
||||
--prefix PATH : '${lib.makeBinPath [ jdk curl ]}' \
|
||||
--set-default REFINE_INI_PATH "$out/etc/refine.ini"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit npmPkg;
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Power tool for working with messy data and improving it";
|
||||
homepage = "https://openrefine.org";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ris ];
|
||||
sourceProvenance = with sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # maven dependencies
|
||||
];
|
||||
broken = stdenv.isDarwin; # builds, doesn't run
|
||||
};
|
||||
}
|
||||
20
pkgs/applications/science/misc/openrefine/update.sh
Executable file
20
pkgs/applications/science/misc/openrefine/update.sh
Executable file
|
|
@ -0,0 +1,20 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix nix-update
|
||||
|
||||
set -euxo pipefail
|
||||
|
||||
nix-update "${UPDATE_NIX_ATTR_PATH}"
|
||||
nix-update "${UPDATE_NIX_ATTR_PATH}.npmPkg" --version=skip
|
||||
|
||||
FILE="$(nix-instantiate --eval -E 'with import ./. {}; (builtins.unsafeGetAttrPos "version" '"${UPDATE_NIX_ATTR_PATH}"').file' | tr -d '"')"
|
||||
|
||||
MVNHASH_OLD=$(nix-instantiate --eval . -A "${UPDATE_NIX_ATTR_PATH}.mvnHash" | tr -d '"')
|
||||
MVNHASH_OLD_ESCAPED=$(echo "${MVNHASH_OLD}" | sed -re 's|[+]|\\&|g')
|
||||
FAKEHASH=$(nix-instantiate --eval . -A "lib.fakeHash" | tr -d '"')
|
||||
FAKEHASH_ESCAPED=$(echo "${FAKEHASH}" | sed -re 's|[+]|\\&|g')
|
||||
|
||||
sed -E -i "s|${MVNHASH_OLD_ESCAPED}|${FAKEHASH}|g" "${FILE}"
|
||||
|
||||
MVNHASH_NEW="$(nix-build . -A "${UPDATE_NIX_ATTR_PATH}" 2>&1 | tail -n10 | grep 'got:' | cut -d: -f2- | xargs echo || true)"
|
||||
|
||||
sed -E -i "s|${FAKEHASH_ESCAPED}|${MVNHASH_NEW}|g" "${FILE}"
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
buildKodiBinaryAddon rec {
|
||||
pname = "inputstream-ffmpegdirect";
|
||||
namespace = "inputstream.ffmpegdirect";
|
||||
version = "20.5.0";
|
||||
version = "unstable-20.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "inputstream.ffmpegdirect";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-2Xa5q+o/AYDwG+JYeXTUfMTJk/kln16J8KRcXILNE6c=";
|
||||
rev = rel;
|
||||
sha256 = "sha256-+u28Wzp2TonL5jaa5WJUr9igR6KiaxizZAX9jqqBUns=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
|
||||
, fetchpatch
|
||||
, pkg-config, cmake, yasm, python3Packages
|
||||
, libxcrypt, libgcrypt, libgpg-error, libunistring
|
||||
, boost, avahi, lame
|
||||
|
|
@ -39,15 +38,15 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is
|
|||
assert gbmSupport || waylandSupport || x11Support;
|
||||
|
||||
let
|
||||
kodiReleaseDate = "20230629";
|
||||
kodiVersion = "20.2";
|
||||
kodiReleaseDate = "20240109";
|
||||
kodiVersion = "20.3";
|
||||
rel = "Nexus";
|
||||
|
||||
kodi_src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "xbmc";
|
||||
rev = "${kodiVersion}-${rel}";
|
||||
hash = "sha256-nNdBjqY9gkpv3g/hcyjWPENHFwOlxrKs2cT4IvRPuXs=";
|
||||
hash = "sha256-OMm8WhTQiEZvu8jHOUp2zT4Xd4NU3svMobW2k8AAtNI=";
|
||||
};
|
||||
|
||||
# see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ to get suggested versions for all dependencies
|
||||
|
|
@ -111,15 +110,6 @@ in stdenv.mkDerivation {
|
|||
version = kodiVersion;
|
||||
|
||||
src = kodi_src;
|
||||
patches = [
|
||||
# Fix compatiblity with fmt 10.0 (from spdlog).
|
||||
# Remove with the next release: https://github.com/xbmc/xbmc/pull/23453
|
||||
(fetchpatch {
|
||||
name = "Fix fmt10 compat";
|
||||
url = "https://github.com/xbmc/xbmc/compare/acca69baa2eae65123e78ee2f77249181725ef5d...26c164a28cfd18ceef7a1f2bbba5bf8a4a5a750c.patch";
|
||||
hash = "sha256-zMUparbQ8gfgeXj8W3MDmPi5OgLNz/zGCJINU7H6Rx0=";
|
||||
})
|
||||
];
|
||||
buildInputs = [
|
||||
gnutls libidn2 libtasn1 nasm p11-kit
|
||||
libxml2 python3Packages.python
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "colima";
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abiosoft";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7s/e/fV6azT26oeEJhh6PPcnI/cjpmEHf9TsZHspcwE=";
|
||||
hash = "sha256-9mBjK+VArfsLfwRRIFn8kY2scAtvIjIMWX84Bi7MBvU=";
|
||||
# We need the git revision
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
|
|
@ -35,7 +35,7 @@ buildGoModule rec {
|
|||
nativeBuildInputs = [ installShellFiles makeWrapper ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ];
|
||||
|
||||
vendorHash = "sha256-ET9n15+YK8ByodePztee6tKdFvvgk7jEKSUjRYSEpq8=";
|
||||
vendorHash = "sha256-QS0TwXI2Md+PXmT2UrzCMQoHRj+wjTSjWPv9CeVzyFU=";
|
||||
|
||||
# disable flaky Test_extractZones
|
||||
# https://hydra.nixos.org/build/212378003/log
|
||||
|
|
|
|||
|
|
@ -38,20 +38,20 @@ let
|
|||
singularity = callPackage
|
||||
(import ./generic.nix rec {
|
||||
pname = "singularity-ce";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
projectName = "singularity";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sylabs";
|
||||
repo = "singularity";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3l65rbMv+E/bqi2+zFbL2/94f/K6Ampo6p3gFL+0ZJk=";
|
||||
hash = "sha256-BKuo+W75wsK8HFB+5CtKPqR4nDw167pAAiuISOjML7k=";
|
||||
};
|
||||
|
||||
# Update by running
|
||||
# nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules"
|
||||
# at the root directory of the Nixpkgs repository
|
||||
vendorHash = "sha256-S4glteidPrC92z8zh0Uuciy0HhG9fx0kEAiNwB4F2vM=";
|
||||
vendorHash = "sha256-Hg32YtXUFQI7OslW3E3QpxCiypwaK8BDAl3YAM6kMnw=";
|
||||
|
||||
# Do not build conmon and squashfuse from the Git submodule sources,
|
||||
# Use Nixpkgs provided version
|
||||
|
|
|
|||
51
pkgs/by-name/cr/cro-mag-rally/package.nix
Normal file
51
pkgs/by-name/cr/cro-mag-rally/package.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, SDL2
|
||||
, cmake
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "CroMagRally";
|
||||
version = "3.0.0-unstable-2023-05-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorio";
|
||||
repo = "CroMagRally";
|
||||
rev = "5983de40c180b50bbbec8b04f5f5f1ceccd1901b";
|
||||
hash = "sha256-QbUkrNY7DZQts8xaimE83yXpCweKvnn0uDb1CawLfEE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
];
|
||||
buildInputs = [
|
||||
SDL2
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p "$out/share/CroMagRally"
|
||||
mv Data ReadMe.txt "$out/share/CroMagRally/"
|
||||
install -Dm755 {.,$out/bin}/CroMagRally
|
||||
wrapProgram $out/bin/CroMagRally --chdir "$out/share/CroMagRally"
|
||||
install -Dm644 $src/packaging/cromagrally.desktop $out/share/applications/cromagrally.desktop
|
||||
install -Dm644 $src/packaging/cromagrally-desktopicon.png $out/share/pixmaps/cromagrally-desktopicon.png
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A port of Cro-Mag Rally, a 2000 Macintosh game by Pangea Software, for modern operating systems";
|
||||
homepage = "https://github.com/jorio/CroMagRally";
|
||||
changelog = "https://github.com/jorio/CroMagRally/releases";
|
||||
license = licenses.cc-by-sa-40;
|
||||
maintainers = with maintainers; [ lux ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "CroMagRally";
|
||||
};
|
||||
}
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fast-float";
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfloat";
|
||||
repo = "fast_float";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-yKHmturouLJkBAdIWoi8vhmipP6jxAwyA+YoSOl6xPU=";
|
||||
hash = "sha256-17GFUHm9FQAf3egqcQwQWqEgs2vH8K17GH2V1/DP8S0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -58,6 +58,6 @@ stdenv.mkDerivation {
|
|||
description = "Code completion LSP for Helix with support for Copilot + OpenAI";
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
license = with licenses; [ mit ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"version": "0.15",
|
||||
"srcHash": "sha256-95NnV//DesXQB1ttvOylu1DAnmRcvTUpZzK1NTZtuVE=",
|
||||
"version": "0.25",
|
||||
"srcHash": "sha256-EZ8waJiLHfButE/rI0EEwZ3VF5dwdgFQ4FBLebhyP2o=",
|
||||
"x86_64-linux": "sha256-h6wGkOfSbB8Rwm7eFvcowDdH1RdS6eFaxgf+SdYvYt8=",
|
||||
"x86_64-darwin": "sha256-45RFY4Kqt5ooMOY75oJcSUZdkERzpyIMQkni4NJ/s1Y="
|
||||
"x86_64-darwin": "sha256-y8ETFWSg+czhyslKc7muTFRu2q+7eeVyZ7Tea/VCUWY=",
|
||||
"aarch64-darwin": "sha256-y8ETFWSg+czhyslKc7muTFRu2q+7eeVyZ7Tea/VCUWY="
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "oelint-adv";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "oelint_adv";
|
||||
hash = "sha256-odejUprYMdKWrm87oRVuJKwLWEL/XuLfQtfjVKK4VTE=";
|
||||
hash = "sha256-uHFvVRFI7JZQ8vSOtXTuz7Jivxd8kPQW6AtiQIG3Ujo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "spicetify-cli";
|
||||
version = "2.30.0";
|
||||
version = "2.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spicetify";
|
||||
repo = "spicetify-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kQcAn5/NzzH+i24Ss6GaQEycazraE03R4tqMhxKROcY=";
|
||||
hash = "sha256-uaGZWLrWWzf6KlQ/rW3XQNdE0a0QVuismhzIrgfAtNA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-T7aUjzb69ZAnpLCpHv5C6ZyUktfC8Zt94rIju8QplWI=";
|
||||
|
|
|
|||
62
pkgs/by-name/sw/switcheroo/package.nix
Normal file
62
pkgs/by-name/sw/switcheroo/package.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{ lib
|
||||
, blueprint-compiler
|
||||
, cargo
|
||||
, desktop-file-utils
|
||||
, fetchFromGitLab
|
||||
, glib
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, rustc
|
||||
, stdenv
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "switcheroo";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "adhami3310";
|
||||
repo = "Switcheroo";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-3JlI0Co3yuD6fKaKlmz1Vg0epXABO+7cRvm6/PgbGUE=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
src = finalAttrs.src;
|
||||
name = "switcheroo-${finalAttrs.version}";
|
||||
hash = "sha256-wC57VTJGiN2hDL2Z9fFw5H9c3Txqh30AHfR9o2DbcSk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
blueprint-compiler
|
||||
cargo
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
rustc
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://gitlab.com/adhami3310/Switcheroo/-/releases/v${finalAttrs.version}";
|
||||
description = "An app for converting images between different formats";
|
||||
homepage = "https://gitlab.com/adhami3310/Switcheroo";
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "switcheroo";
|
||||
maintainers = with maintainers; [ michaelgrahamevans ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "kora-icon-theme";
|
||||
version = "1.5.9";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bikass";
|
||||
repo = "kora";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZXAS22Oe6C34DR1BfGmCGr1qh9mu1PCY5IQWxrm1EfY=";
|
||||
sha256 = "sha256-YKdqV41HlQMvkyWoWbOCMUASshnEDnXtxzdmJdTEQGw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenvNoCC, fetchurl }:
|
||||
{ lib, stdenvNoCC, fetchurl, directoryListingUpdater }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "wireless-regdb";
|
||||
version = "2023.09.01";
|
||||
version = "2024.01.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-JtTCpyfMWSObhHNarYVrfH0LBOMKpcI1xPf0f18FNJE=";
|
||||
hash = "sha256-yKYcms92+n60I56J9kDe4+hwmNn2m001GMnGD8bSDFU=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
@ -16,6 +16,8 @@ stdenvNoCC.mkDerivation rec {
|
|||
"PREFIX="
|
||||
];
|
||||
|
||||
passthru.updateScript = directoryListingUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wireless regulatory database for CRDA";
|
||||
homepage = "http://wireless.kernel.org/en/developers/Regulatory/";
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@ let
|
|||
inherit (llvmPackages) stdenv;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "odin";
|
||||
version = "dev-2024-01";
|
||||
version = "dev-2024-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "odin-lang";
|
||||
repo = "Odin";
|
||||
rev = version;
|
||||
hash = "sha256-ufIpnibY7rd76l0Mh+qXYXkc8W3cuTJ1cbmj4SgSUis=";
|
||||
hash = "sha256-v9A0+kgREXALhnvFYWtE0+H4L7CYnyje+d2W5+/ZvHA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neatvnc";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "any1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bRlz5RW+NUSTgzjRM9alZjSrzmF8/7p4IIXqK/HEcJo=";
|
||||
sha256 = "sha256-S2LMD15MYd/t/Z8B1OQ0hVrZQLR6Gf4LB45mhmDwblg=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "3.1.3";
|
||||
version = "3.1.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "Jc2k";
|
||||
repo = "aiohomekit";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LQplvI6P42dI2vIaWyL50cj9k543qeUoHUogDkBaPvI=";
|
||||
hash = "sha256-hZhbmEEqmhvoxGD4hvy4SDQWG5Xk1cmzFDSNa742iMs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,12 +18,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "correctionlib";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-bQKcS8vktvD62zvSeaBtoJw36TSpo0gEpKm0HI3AuXg=";
|
||||
hash = "sha256-H8QCdU6piBdqJEJOGVbsz+6eyMhFVuwTpIHKUoKaf4A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -62,6 +62,5 @@ buildPythonPackage rec {
|
|||
homepage = "https://cms-nanoaod.github.io/correctionlib/";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
broken = versionAtLeast pydantic.version "2";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "galois";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "mhostetter";
|
||||
repo = "galois";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dWYnD+Byh0orRg20/nhu8ILooFBeHysxQ403boDVqYk=";
|
||||
hash = "sha256-Nfr9gD2FLZ+KvHh1mcpReUWnzFr/NxpvperzZPoFeT4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-datatransfer";
|
||||
version = "3.13.0";
|
||||
version = "3.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-J6hFyyJgWlEsBc4owokNLvl61O38mBevVVpz2AJOw7o=";
|
||||
hash = "sha256-DZDp/aRhIe2bBcn8BVA8jwmDaUrbHAMMRG0LixuvGl0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,33 +4,22 @@
|
|||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "insteon-frontend-home-assistant";
|
||||
version = "0.3.5-1";
|
||||
format = "pyproject";
|
||||
version = "0.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-R+P4pgKbLvf0mwpSDoujCvlJe/yS+nvSJ7ewLVOOg/0=";
|
||||
hash = "sha256-NZwnx8tlXnsVCk4nvNjOg3cjSr2CnjqWcZG7xFTC2wA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/pyinsteon/insteon-panel/pull/33
|
||||
(fetchpatch {
|
||||
name = "unpin-setuptools.patch";
|
||||
url = "https://github.com/pyinsteon/insteon-panel/commit/2297eb05668907edd03633f244e5876990e340c7.patch";
|
||||
hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
# upstream has no tests
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, pythonOlder
|
||||
, substituteAll
|
||||
|
|
@ -35,13 +34,13 @@
|
|||
|
||||
let
|
||||
pname = "psycopg";
|
||||
version = "3.1.15";
|
||||
version = "3.1.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psycopg";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-8M2Rm9AtOvZwZhKGuR96XiOOmllqcWAZJuEmUXxzsRw=";
|
||||
hash = "sha256-Paq4Wkvv6d6+fNcvRO/yfj7OWCMygqccKIdfsohHUMM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "publicsuffixlist";
|
||||
version = "0.10.0.20240201";
|
||||
version = "0.10.0.20240203";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8IAfr55UWsstyyoFr5KJWAtU1LnAguEAwUSWts/iK1o=";
|
||||
hash = "sha256-+AbNJqI31yZsvBtFyIuCjVsUWH/gtvOg+L05NroYCW0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyngrok";
|
||||
version = "7.0.5";
|
||||
version = "7.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YTe9n5cZLYQ9ghTOF8MHg/1d8iRElPHNnAQj0pnEjR4=";
|
||||
hash = "sha256-M+yMx788hUfTmGX7gFyvUvd1fH/fK7tNWdFpiH3m2jA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-homewizard-energy";
|
||||
version = "4.1.1";
|
||||
format = "pyproject";
|
||||
version = "4.2.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
|
|
@ -22,12 +22,12 @@ buildPythonPackage rec {
|
|||
owner = "DCSBL";
|
||||
repo = "python-homewizard-energy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-p7uwodjC+wTGrlKf4i4ZRTPg9Qh9krsmwPpWNdF6J4U=";
|
||||
hash = "sha256-CNSZBH+D74Y71k7Ws0OlgN1/i/lWXlkz6MC3IXL5ycQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'version = "0.0.0"' 'version = "${version}"'
|
||||
--replace-fail 'version = "0.0.0"' 'version = "${version}"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-kasa";
|
||||
version = "0.6.2";
|
||||
version = "0.6.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "python-kasa";
|
||||
repo = "python-kasa";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ka7fVveqX61XGmX43S/eB939dfqoEDh8eX1cw7hGE7U=";
|
||||
hash = "sha256-iCqJY3qkA3ZVXTCfxvQoaZsaqGui8PwKGAmLXKZgLJs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "snakemake-interface-common";
|
||||
version = "1.15.2";
|
||||
version = "1.15.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-f4C/g2h6W72q1XQMDm/RvnRcOSPWyEMuZXqkVEY7S70=";
|
||||
hash = "sha256-MiwdNr8+xX5oD1ilhDDhJcf4wWnfkayDMcnDyjYSWlo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "teslajsonpy";
|
||||
version = "3.9.9";
|
||||
version = "3.9.10";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "zabuldon";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9ySUgRz1Zp0tkHCEkDcygm97mji4mjA5ltrriP9zAiQ=";
|
||||
hash = "sha256-DNac9rrHJkFWlYRLvDB49kjmJV2EMvs5Y2ndSGY7uvk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
From 4c2b65c47d328c2f20cc74adcec2286fee6cb5de Mon Sep 17 00:00:00 2001
|
||||
From: Yaroslav Bolyukin <iam@lach.pw>
|
||||
Date: Tue, 30 Jan 2024 18:18:35 +0100
|
||||
Subject: [PATCH] fix: allow building without git
|
||||
|
||||
---
|
||||
setup.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index e01c008..92eca62 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -71,7 +71,7 @@ def get_flash_version() -> str:
|
||||
["git", "describe", "--tags", "--always"],
|
||||
cwd=flash_dir,
|
||||
).decode("ascii")[:-1]
|
||||
- except subprocess.CalledProcessError:
|
||||
+ except Exception:
|
||||
version = flash_dir / "version.txt"
|
||||
if version.is_file():
|
||||
return version.read_text().strip()
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
@ -25,7 +25,8 @@
|
|||
#, flash-attn
|
||||
}:
|
||||
let
|
||||
version = "0.03";
|
||||
inherit (torch) cudaCapabilities cudaPackages cudaSupport;
|
||||
version = "0.0.23.post1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "xformers";
|
||||
|
|
@ -38,17 +39,34 @@ buildPythonPackage {
|
|||
owner = "facebookresearch";
|
||||
repo = "xformers";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-G8f7tny5B8SAQ6+2uOjhY7nD0uOT4sskIwtTdwivQXo=";
|
||||
hash = "sha256-AJXow8MmX4GxtEE2jJJ/ZIBr+3i+uS4cA6vofb390rY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-fix-allow-building-without-git.patch
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
cat << EOF > ./xformers/version.py
|
||||
# noqa: C801
|
||||
__version__ = "${version}"
|
||||
EOF
|
||||
'' + lib.optionalString cudaSupport ''
|
||||
export CUDA_HOME=${cudaPackages.cuda_nvcc}
|
||||
export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}"
|
||||
'';
|
||||
|
||||
buildInputs = lib.optionals cudaSupport (with cudaPackages; [
|
||||
# flash-attn build
|
||||
cuda_cudart # cuda_runtime_api.h
|
||||
libcusparse.dev # cusparse.h
|
||||
cuda_cccl.dev # nv/target
|
||||
libcublas.dev # cublas_v2.h
|
||||
libcusolver.dev # cusolverDn.h
|
||||
libcurand.dev # curand_kernel.h
|
||||
]);
|
||||
|
||||
nativeBuildInputs = [
|
||||
which
|
||||
];
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "clickhouse-backup";
|
||||
version = "2.4.23";
|
||||
version = "2.4.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlexAkulov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6S1XJEaZE6h69KfBddkJ+sE3OfUnY1KECPKyJ2pExRU=";
|
||||
sha256 = "sha256-w5RImVi1Jyudu7G9uKRHKSgoEruvhkznm0MjYsgBBxo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DTykJR/dMIDKL5fTzDivsRf2DIfzJcm+AN3rQHflpJo=";
|
||||
|
|
|
|||
|
|
@ -11,25 +11,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dive";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wagoodman";
|
||||
repo = "dive";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9REthyb+bzsb7NBXkU9XyUZJFQHHrV1cG4//lTLgTgw=";
|
||||
hash = "sha256-CuVRFybsn7PVPgz3fz5ghpjOEOsTYTv6uUAgRgFewFw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fixes: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod)
|
||||
# https://github.com/wagoodman/dive/pull/461
|
||||
(fetchpatch {
|
||||
url = "https://github.com/wagoodman/dive/commit/555555d777f961ad0a2d1bb843e87f434d731dba.patch";
|
||||
hash = "sha256-tPSgvENiVgrlQSkT7LbQPRYhkkaYQeWRJ0P4bA3XOiI=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-6KIbTrkvdugsUKdFBqtPUFzs/6h2xslLFpr6S2nSBiY=";
|
||||
vendorHash = "sha256-uzzawa/Doo6j/Fh9dJMzGKbpp24UTLAo9VGmuQ80IZE=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
@ -40,6 +31,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "A tool for exploring each layer in a docker image";
|
||||
homepage = "https://github.com/wagoodman/dive";
|
||||
changelog = "https://github.com/wagoodman/dive/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ marsam SuperSandro2000 ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mix2nix";
|
||||
version = "0.1.8";
|
||||
version = "0.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ydlr";
|
||||
repo = "mix2nix";
|
||||
rev = version;
|
||||
hash = "sha256-iWy5q6ERzg8hRZs+bFtR6drZ9yI8Qh1v+47q3q2fFTM=";
|
||||
hash = "sha256-Wh3KFp1gNDOKOG/DZdftmgy/M+67ZGfdj6W3ETQpX/8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ elixir ];
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pscale";
|
||||
version = "0.181.0";
|
||||
version = "0.182.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "planetscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-f/SrH/xdH0HYxGAbbIvr7yAgHJZlIfT/P1mC+yzQ7Vs=";
|
||||
sha256 = "sha256-zqwdTtNbPm9D0zfVI8zd3hFM6zLQVxXyxNOyEW1gSHY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Fj2yOENvomRcaIgP91NRl8rcggjPFZbKTwdUBBizios=";
|
||||
vendorHash = "sha256-93Eu38tDxV4pT4HtmssFckYwdnkOaW2IY6PsqT9W73c=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "probe-run";
|
||||
version = "0.3.10";
|
||||
version = "0.3.11";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-PIUL7aUIHyHuetkMbJsZ3x1coyzKGwI/AJE/R6uFBM4=";
|
||||
hash = "sha256-RlmN2PV5Z/+NTYia7LhrAW437bsg6oUxlQ1qcbZuq0o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7q5M3huI7Qje5E3Rl2i/9I4g90R8vhJD9Hk78biewBE=";
|
||||
cargoHash = "sha256-MG3xHArNEqXs0vC5sSyaBM3421yJ25nazvBNQVcs4v0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
1205
pkgs/development/tools/rye/Cargo.lock
generated
1205
pkgs/development/tools/rye/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, pkg-config
|
||||
, openssl
|
||||
|
|
@ -12,20 +13,28 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rye";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitsuhiko";
|
||||
repo = "rye";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-c5PIJMqe5ljNy582LuYJK18ixrphVhYRtiF5X5CB20Y=";
|
||||
hash = "sha256-btgX1nDBJeZjwv2pBi4OEwzFf7xpRDaq63JTrSkF+BM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch { # Fixes the build: https://github.com/mitsuhiko/rye/issues/575
|
||||
name = "bump-monotrail";
|
||||
url = "https://github.com/mitsuhiko/rye/commit/675255c2c12176fff8988b6c3896dcd10766b681.patch";
|
||||
hash = "sha256-kBqjTHW7oT6DY17bdReoRfV9E75QtYqBlOv4FHbbexw=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"dialoguer-0.10.4" = "sha256-WDqUKOu7Y0HElpPxf2T8EpzAY3mY8sSn9lf0V0jyAFc=";
|
||||
"monotrail-utils-0.0.1" = "sha256-4x5jnXczXnToU0QXpFalpG5A+7jeyaEBt8vBwxbFCKQ=";
|
||||
"monotrail-utils-0.0.1" = "sha256-h2uxWsDrU9j2C5OWbYsfGz0S1VsPzYrfksQVEkwd2ys=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
let appName = "heroic";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "heroic-unwrapped";
|
||||
version = "2.12.0";
|
||||
version = "2.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Heroic-Games-Launcher";
|
||||
repo = "HeroicGamesLauncher";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1+TqIExvZHE3X38Fh43CasmTyjIr2WcEw07ZJEFrcBw=";
|
||||
hash = "sha256-dfyyxE2U5rSSoTY2L5bKsnjQ8u53GgAXa+V+idDr51Q=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "minesweep-rs";
|
||||
version = "6.0.50";
|
||||
version = "6.0.52";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cpcloud";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+Rtg4IUDhFqOIVBr+9qXY/vpoRt4mevAF+HwNQLyLmY=";
|
||||
hash = "sha256-XSB0SrZCXnIeZGYAc/MEWe+rM5D36jkM2MJjx64r/bU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1mDGKonR+cX619W4xVmCilWzVhsJGPc9PtN/RhkyowI=";
|
||||
cargoHash = "sha256-zSEJsUKLfjZVZxQBtbUflYv4FXUpFCrAGI+6YUJrNnI=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sweep some mines for fun, and probably not for profit";
|
||||
|
|
|
|||
|
|
@ -16,6 +16,12 @@ let
|
|||
selectHighestVersion = a: b: if lib.versionOlder a.version b.version
|
||||
then b
|
||||
else a;
|
||||
|
||||
# https://forums.developer.nvidia.com/t/linux-6-7-3-545-29-06-550-40-07-error-modpost-gpl-incompatible-module-nvidia-ko-uses-gpl-only-symbol-rcu-read-lock/280908/19
|
||||
rcu_patch = fetchpatch {
|
||||
url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch";
|
||||
hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg=";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
mkDriver = generic;
|
||||
|
|
@ -33,6 +39,8 @@ rec {
|
|||
openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo=";
|
||||
settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10=";
|
||||
persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE=";
|
||||
|
||||
patches = [ rcu_patch ];
|
||||
};
|
||||
|
||||
latest = selectHighestVersion production (generic {
|
||||
|
|
@ -43,8 +51,7 @@ rec {
|
|||
settingsSha256 = "sha256-YBaKpRQWSdXG8Usev8s3GYHCPqL8PpJeF6gpa2droWY=";
|
||||
persistencedSha256 = "sha256-AiYrrOgMagIixu3Ss2rePdoL24CKORFvzgZY3jlNbwM=";
|
||||
|
||||
patchFlags = [ "-p1" "-d" "kernel" ];
|
||||
patches = [];
|
||||
patches = [ rcu_patch ];
|
||||
|
||||
brokenOpen = kernel.kernelAtLeast "6.7";
|
||||
});
|
||||
|
|
@ -56,6 +63,8 @@ rec {
|
|||
openSha256 = "sha256-mRUTEWVsbjq+psVe+kAT6MjyZuLkG2yRDxCMvDJRL1I=";
|
||||
settingsSha256 = "sha256-c30AQa4g4a1EHmaEu1yc05oqY01y+IusbBuq+P6rMCs=";
|
||||
persistencedSha256 = "sha256-11tLSY8uUIl4X/roNnxf5yS2PQvHvoNjnd2CB67e870=";
|
||||
|
||||
patches = [ rcu_patch ];
|
||||
});
|
||||
|
||||
# Vulkan developer beta driver
|
||||
|
|
@ -69,6 +78,8 @@ rec {
|
|||
settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s=";
|
||||
persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM=";
|
||||
url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";
|
||||
|
||||
patches = [ rcu_patch ];
|
||||
};
|
||||
|
||||
# data center driver compatible with current default cudaPackages
|
||||
|
|
@ -81,6 +92,10 @@ rec {
|
|||
useSettings = false;
|
||||
usePersistenced = false;
|
||||
useFabricmanager = true;
|
||||
|
||||
patches = [ rcu_patch ];
|
||||
|
||||
broken = kernel.kernelAtLeast "6.5";
|
||||
};
|
||||
|
||||
dc_535 = generic rec {
|
||||
|
|
@ -92,6 +107,8 @@ rec {
|
|||
useSettings = false;
|
||||
usePersistenced = true;
|
||||
useFabricmanager = true;
|
||||
|
||||
patches = [ rcu_patch ];
|
||||
};
|
||||
|
||||
# Update note:
|
||||
|
|
@ -106,8 +123,7 @@ rec {
|
|||
settingsSha256 = "sha256-r6DuIH/rnsCm/y51iRgPNi5/kz+EFMVABREdTjBneZ0=";
|
||||
persistencedSha256 = "sha256-e71fpPBBv8S/aoeXxBXkzKy5bsMMbv8y024cSLc8DYc=";
|
||||
|
||||
patchFlags = [ "-p1" "-d" "kernel" ];
|
||||
patches = [];
|
||||
patches = [ rcu_patch ];
|
||||
};
|
||||
|
||||
# Last one supporting x86
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "power-calibrate";
|
||||
version = "0.01.35";
|
||||
version = "0.01.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColinIanKing";
|
||||
repo = pname;
|
||||
rev = "V${version}";
|
||||
hash = "sha256-6ggxerWWBfjVgkgwLmIv/kPb04JIsJxPcVBrRQAG/ZM=";
|
||||
hash = "sha256-7NKR82waxooB62D59kRmJPqxoVHX9OIWKwLrmzsg9OQ=";
|
||||
};
|
||||
|
||||
installFlags = [
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "matrix-dendrite";
|
||||
version = "0.13.5";
|
||||
version = "0.13.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "dendrite";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tKywmFSSWc538i7raCrZnFpMDnFMT23hYVoYndnIKJ4=";
|
||||
hash = "sha256-R/67y7ZiqH2Yg7JFsNYOuGocvR161srlWjRgjyZsqaE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eFoXUroJgrstNYjSYsP6o0vTEW2k/+6JjyVn6bb4um8=";
|
||||
vendorHash = "sha256-/+JSL54y7u7mGeDwAJV17Ibjb/LffitUOgonUd9EzDA=";
|
||||
|
||||
subPackages = [
|
||||
# The server
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2024.1.5";
|
||||
version = "2024.1.6";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
|
@ -1676,6 +1676,7 @@
|
|||
aiohttp-zlib-ng
|
||||
fnv-hash-fast
|
||||
gcal-sync
|
||||
ical
|
||||
oauth2client
|
||||
psutil-home-assistant
|
||||
sqlalchemy
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "mushroom";
|
||||
version = "3.2.4";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "piitaya";
|
||||
repo = "lovelace-mushroom";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UV/kqeVslB1lc1a9uvj8ocQKeAVINwo3aH8oHC9GLBQ=";
|
||||
hash = "sha256-XVi+VPOVHfYBlIY9xN7x9Qe1bVw/qS9p8bcRZb0ksE0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-p43ks6HM23LK3LOBOZA0uV+DTOj89/boBpjcXpbcw24=";
|
||||
npmDepsHash = "sha256-XtSeO5+RaBCBLmq6paRX9KipkhcEdJhzrQeEDdysZE0=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
|||
|
|
@ -46,6 +46,24 @@ let
|
|||
];
|
||||
});
|
||||
|
||||
aiohttp = super.aiohttp.overridePythonAttrs (old: rec {
|
||||
version = "3.9.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aio-libs";
|
||||
repo = "aiohttp";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dEeMHruFJ1o0J6VUJcpUk7LhEC8sV8hUKXoKcd618lE=";
|
||||
};
|
||||
nativeCheckInputs = with self; [
|
||||
freezegun
|
||||
gunicorn
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
python-on-whales
|
||||
re-assert
|
||||
];
|
||||
});
|
||||
|
||||
aionotion = super.aionotion.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2023.05.5";
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -448,7 +466,7 @@ let
|
|||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2024.1.5";
|
||||
hassVersion = "2024.1.6";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
|
@ -466,13 +484,13 @@ in python.pkgs.buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6HPHoUpS2WXbYx7Tbqp9LLo25DyNzNd/THpSo7Y43Jw=";
|
||||
hash = "sha256-zCpdOl16ZkO9mr0nYZg1mlnGNaPaX0RALFEDRHGfKvM=";
|
||||
};
|
||||
|
||||
# Secondary source is pypi sdist for translations
|
||||
sdist = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-cptN6NgB/1qnvz+/EqDBQiH2vSQsOeSljSVFZBFXR5Y=";
|
||||
hash = "sha256-ipAw+vqePa5KA/Gqhl3WsQbzmzMXjmVx0NvbrM84SKg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2024.1.5";
|
||||
version = "2024.1.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mS9GsJwscLQu+vApoxIWE1tZUcu3B3CTMFrcu96POEY=";
|
||||
hash = "sha256-htFz3Cw5AvI1h2YvECOJdMA4N3JAQRRRhx1tfR4h5co=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nats-server";
|
||||
version = "2.10.9";
|
||||
version = "2.10.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ncNiU5n7LvVXEgDiZAu+OzbtAkGHyrbOsGLTSMMIVps=";
|
||||
hash = "sha256-9iV3zw0PtncI6eJNJlQ9cCAIFWA2w+sKk0kH7fpQyOo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-akkDKIRp2uG+6z/YVB2M6BxLQGNt1qPhvW/BwnjsBHA=";
|
||||
vendorHash = "sha256-uhEjZcp3y+nFEChb2/Ac/eolOuJxF4WpAjKtXsfpRaw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pocketbase";
|
||||
version = "0.20.7";
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pocketbase";
|
||||
repo = "pocketbase";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ySdgq9U4pgXMSsP8fTbVop7Dwm3vUhTWwysndhNaBUU=";
|
||||
hash = "sha256-f8lqDYu2tlwp+/00QaHfXvUO3CZuDWMpdVBrUW3bbio=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-72Q9/lLs57y+OPMV/ITcLLxW79YzHjSFThK4txZ1qZo=";
|
||||
vendorHash = "sha256-u7VgZkv9Ajtra9ikeIxJRLZleH+rzs1g2SZO9zj/bes=";
|
||||
|
||||
# This is the released subpackage from upstream repo
|
||||
subPackages = [ "examples/base" ];
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ser2net";
|
||||
version = "4.6.0";
|
||||
version = "4.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cminyard";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6G5kpMe58PaOII/8WzHTK2EkwD1cTUn7VP2EMlcuF14=";
|
||||
hash = "sha256-1bEjmChoVB9WUAASz06U94YJ71BGvZfU6dObszXqwoA=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "spicedb";
|
||||
version = "1.29.0";
|
||||
version = "1.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "authzed";
|
||||
repo = "spicedb";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AQmYoTrCwS2IdA9N2RWmbnPNIfKW3ofreZv+VEbe1Wg=";
|
||||
hash = "sha256-fUTJpdFFNf/r+NQYBU4y8sGdtEShF9Yi89aB0rU7Xd8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LYVxKrFMtxG13cxpQ2btXO9EmKY0UBI+ZP3aYI88i3A=";
|
||||
vendorHash = "sha256-wPQ6RjDldO2m4myKcLtGoe5LurX6FI7yLoWLZUkex4o=";
|
||||
|
||||
subPackages = [ "cmd/spicedb" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grml-zsh-config";
|
||||
version = "0.19.6";
|
||||
version = "0.19.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grml";
|
||||
repo = "grml-etc-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-31BD5jUA54oLSsL4NzGaGAiOXMcZwy7uX65pD+jtE4M=";
|
||||
sha256 = "sha256-XHuoafb1Wc8dUPrk/7jwYhlRQm76qcbQy2vHECm0Iuo=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -41,14 +41,14 @@ let
|
|||
in
|
||||
with py.pkgs; buildPythonApplication rec {
|
||||
pname = "awscli2";
|
||||
version = "2.15.12"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
version = "2.15.15"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-cli";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1qvtImffj35+J9mPVLCgJE3porpF4DnlsRBW0ihzg10=";
|
||||
hash = "sha256-hJuJkCiKgSxfPVgS5II7BwpyQhjaRE2Ct3ZJQq6xWgg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "syft";
|
||||
version = "0.102.0";
|
||||
version = "0.103.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XA2jr9jkecG8r9HD2KYctMJQXfL84odQXgyw9Q8H6P0=";
|
||||
hash = "sha256-b50+O9Tx9CgXDW7JuCyo//ye7T0puwq6jryH6bQ4Ytw=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
@ -22,7 +22,7 @@ buildGoModule rec {
|
|||
};
|
||||
# hash mismatch with darwin
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-iq4RCp/HnaHDyVuUeVYQKIRJ0F2SjLYn3mXeYXAcnmg=";
|
||||
vendorHash = "sha256-CCkAxMg3J+F6xhKiB7iMCn5CNQ0IU0EW4cNn3b4eRWY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kaldi";
|
||||
version = "unstable-2023-11-13";
|
||||
version = "unstable-2024-01-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kaldi-asr";
|
||||
repo = "kaldi";
|
||||
rev = "21ae411fd46282726d893e53c05fef5baea64fef";
|
||||
sha256 = "sha256-oPP5znyWI9mYHpwLqHu5aiz5DOIZLcTbgaLiBjFiwrg=";
|
||||
rev = "8c451e28582f5d91f84ea3d64bb76c794c3b1683";
|
||||
sha256 = "sha256-iW/2gDZ/ib0M+bfWtZ9XuMWXMwTGoKCRLVl2lHLNh6c=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ibus-libpinyin";
|
||||
version = "1.15.6";
|
||||
version = "1.15.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libpinyin";
|
||||
repo = "ibus-libpinyin";
|
||||
rev = version;
|
||||
hash = "sha256-cfV/VBCVtwI4qDwuU2563jMjxQqDs7VXGxkFn4w8IqM=";
|
||||
hash = "sha256-Sr0zB6VeEYGDu1gx2kTVoaTm131F4K+/QH/+ibcbMT8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "phrase-cli";
|
||||
version = "2.19.3";
|
||||
version = "2.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phrase";
|
||||
repo = "phrase-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-Picdgy4CnMnKjENPfRvu0zLhykbH/uM0JfHh7cwDdoQ=";
|
||||
sha256 = "sha256-l6leu3U5VFTx1IJjiQo5F+96YddLWBaq5npcbXCUSLA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-an43wSx5zhMirKAUnYv+5kDcUlv1fe1+mLGbBS7p4Qs=";
|
||||
vendorHash = "sha256-U/54Kv7F2ww6gzB9AIAa4Mf6UgWIJyFBbqj6LKdPF3A=";
|
||||
|
||||
ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "goimapnotify";
|
||||
version = "2.3.10";
|
||||
version = "2.3.11";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "shackra";
|
||||
repo = "goimapnotify";
|
||||
rev = version;
|
||||
sha256 = "sha256-RGEHKOmJqy9Cz5GWfck3VBZD6Q3DySoTYg0+Do4sy/4=";
|
||||
sha256 = "sha256-b3w+SqmxRY/24qgFUSM4RQswObAH5jy3yEfGXY298Ko=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DphGe9jbKo1aIfpF5kRYNSn/uIYHaRMrygda5t46svw=";
|
||||
|
|
@ -24,7 +24,7 @@ buildGoModule rec {
|
|||
"Execute scripts on IMAP mailbox changes (new/deleted/updated messages) using IDLE";
|
||||
homepage = "https://gitlab.com/shackra/goimapnotify";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ wohanley ];
|
||||
maintainers = with maintainers; [ wohanley rafaelrc ];
|
||||
mainProgram = "goimapnotify";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "juicity";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juicity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UKEmPb5Kn2GlTriXFOavQ5o8bU9VqMzQZx4iyG5W7a0=";
|
||||
hash = "sha256-SUZ5E2GRLyUI/Z5ekJPNypVJXfJFzIz3qr9kCeXN7Gk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KLyGgkZqkM8jn+Sqa4IjauvfL9QXp9W/eUcViDTGDtw=";
|
||||
vendorHash = "sha256-Gj4uM9EL6QjlrCFGq3u1+TkIxzIU2mthFRK00pOAaJg=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oha";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hatoo";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-s98FPzX6RfLCyttNpE/zC4gb30tLPW+MYCuuxn1ep3c=";
|
||||
hash = "sha256-XTdzUAdsdg/ZNZEPoeCpjSeqig8wT7uKx5dYHHeZOlY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zyfCa5hMS8aWABg3gb2Pa/TvNsVXBJKIOiAQ96CLiBo=";
|
||||
cargoHash = "sha256-6lDTd9cd7bM+CI28vJt4m4WcUfRQPp8Yo7mGqF00xfk=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitleaks";
|
||||
version = "8.18.1";
|
||||
version = "8.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zricethezav";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-v0d/ulxYJRkyyhVctnQjKW2ODWtu+gSwp/qSkVLQ1Jo=";
|
||||
hash = "sha256-+UPlknAwmIeXlosHBXl3qPREV186lfDZGZG/Zx1rxYs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lPfvoeHPYWSnFPuAR9CxG6+pQ++cZEw/jYuGgDrm57E=";
|
||||
vendorHash = "sha256-30IJNP4XuV2YNy1TumPUju+GrHFBYi76coy0bJBqDI4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ let
|
|||
generic = { pname, packageToBuild, description }:
|
||||
buildGoModule rec {
|
||||
inherit pname;
|
||||
version = "1.3.4";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = "rekor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vU/qxCMCC2XWH79Z7cGhMlqMeQOMghTPDfROWdusKX4=";
|
||||
hash = "sha256-g/APpfvG1MMTYZfPSXKNa9DdWrOrjOk8uQV3QyzCQjY=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
@ -23,7 +23,7 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qhBbzYYayRktBQi9HtzuxBIlSdNIOD/agCFFNEvlcBc=";
|
||||
vendorHash = "sha256-6ZJ3IgnzoZSDL1+CMYUDumXf1uO+odZ8Y5IZq3GN4bY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vals";
|
||||
version = "0.33.0";
|
||||
version = "0.33.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "variantdev";
|
||||
repo = pname;
|
||||
sha256 = "sha256-ZF73oLe/2s+zsMNElgjnVT7GCsH4VSP1IWTy647JZyw=";
|
||||
sha256 = "sha256-5+yaDcHqOt+bOdQIv4rDJuiR7acbkQvHJEfvc058+b8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1wlwG0YaLcoLEh5t1hAfgQ+8EMfMDQn430nWGsuFTqs=";
|
||||
vendorHash = "sha256-Lt6OPA6k+zXIahZR8F36YWruCtUsoQKb/LgzJ5NIcx8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vault";
|
||||
version = "1.15.4";
|
||||
version = "1.15.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "vault";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Q+j5AS8ccAfqjtPQ/y6Bfga3IxMhE5SZWxZK5OUCJ34=";
|
||||
sha256 = "sha256-KDQgiG+HSkLjiJfej9VqTcPZxOMMTh9n9yTDGfiGF3g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YEEvFAZ+VqmFR3TLJ0ztgWbT2C5r5pfYM4dmCf8G7sw=";
|
||||
vendorHash = "sha256-fNUoeyBVci/S4LCpAPYjVbf8r+ROB5uL1TaUKJZsNes=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "riffdiff";
|
||||
version = "2.27.1";
|
||||
version = "2.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "walles";
|
||||
repo = "riff";
|
||||
rev = version;
|
||||
hash = "sha256-cW43nt8Go4VjEwXpCieGYIXwG1XMexslgriMsZ0BB1g=";
|
||||
hash = "sha256-sKZ/VkE2eWmGYjnAxzElZkSQyXyZOzBO3B1lSDU1dO4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-phTo0XvCiTnBFF5r5myvwmiWnpcYLnkaMLcaXw4oL/Y=";
|
||||
cargoHash = "sha256-8CQDlfJ698BOLQPuYjF0TpLjC93KvN9PvM3kexWnwVs=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A diff filter highlighting which line parts have changed";
|
||||
|
|
|
|||
|
|
@ -744,9 +744,7 @@ with pkgs;
|
|||
inherit (darwin) DarwinTools;
|
||||
};
|
||||
|
||||
mix2nix = callPackage ../development/tools/mix2nix {
|
||||
elixir = elixir_1_14;
|
||||
};
|
||||
mix2nix = callPackage ../development/tools/mix2nix { };
|
||||
|
||||
n98-magerun = callPackage ../development/tools/misc/n98-magerun { };
|
||||
|
||||
|
|
@ -11605,6 +11603,8 @@ with pkgs;
|
|||
|
||||
openresolv = callPackage ../tools/networking/openresolv { };
|
||||
|
||||
openrefine = callPackage ../applications/science/misc/openrefine { jdk = jdk17; };
|
||||
|
||||
openrgb = libsForQt5.callPackage ../applications/misc/openrgb { };
|
||||
|
||||
openrgb-with-all-plugins = openrgb.withPlugins [
|
||||
|
|
|
|||
|
|
@ -16312,9 +16312,7 @@ self: super: with self; {
|
|||
inherit (pkgs) graphviz;
|
||||
};
|
||||
|
||||
xformers = callPackage ../development/python-modules/xformers {
|
||||
openai-triton = self.openai-triton-cuda;
|
||||
};
|
||||
xformers = callPackage ../development/python-modules/xformers { };
|
||||
|
||||
xgboost = callPackage ../development/python-modules/xgboost {
|
||||
inherit (pkgs) xgboost;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user