0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-08-07 18:01:07 +00:00 committed by GitHub
commit 0bc8d4924e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
78 changed files with 2602 additions and 1712 deletions

View file

@ -346,11 +346,11 @@ NOTE: It is highly recommended to use a pinned version of pnpm (i.e. `pnpm_8` or
In case you are patching `package.json` or `pnpm-lock.yaml`, make sure to pass `finalAttrs.patches` to the function as well (i.e. `inherit (finalAttrs) patches`.
`pnpm.configHook` supports adding additional `pnpm install` flags via `pnpmInstallFlags` which can be set to a Nix string array.
#### Dealing with `sourceRoot` {#javascript-pnpm-sourceRoot}
NOTE: Nixpkgs pnpm tooling doesn't support building projects with a `pnpm-workspace.yaml`, or building monorepos. It maybe possible to use `pnpm.fetchDeps` for these projects, but it may be hard or impossible to produce a binary from such projects ([an example attempt](https://github.com/NixOS/nixpkgs/pull/290715#issuecomment-2144543728)).
If the pnpm project is in a subdirectory, you can just define `sourceRoot` or `setSourceRoot` for `fetchDeps`. Note, that projects using `pnpm-workspace.yaml` are currently not supported, and will probably not work using this approach.
If the pnpm project is in a subdirectory, you can just define `sourceRoot` or `setSourceRoot` for `fetchDeps`.
If `sourceRoot` is different between the parent derivation and `fetchDeps`, you will have to set `pnpmRoot` to effectively be the same location as it is in `fetchDeps`.
Assuming the following directory structure, we can define `sourceRoot` and `pnpmRoot` as follows:
@ -375,6 +375,55 @@ Assuming the following directory structure, we can define `sourceRoot` and `pnpm
pnpmRoot = "frontend";
```
#### PNPM Workspaces {#javascript-pnpm-workspaces}
If you need to use a PNPM workspace for your project, then set `pnpmWorkspace = "<workspace project name>"` in your `pnpm.fetchDeps` call,
which will make PNPM only install dependencies for that workspace package.
For example:
```nix
...
pnpmWorkspace = "@astrojs/language-server";
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pnpmWorkspace;
...
}
```
The above would make `pnpm.fetchDeps` call only install dependencies for the `@astrojs/language-server` workspace package.
Note that you do not need to set `sourceRoot` to make this work.
Usually in such cases, you'd want to use `pnpm --filter=$pnpmWorkspace build` to build your project, as `npmHooks.npmBuildHook` probably won't work. A `buildPhase` based on the following example will probably fit most workspace projects:
```nix
buildPhase = ''
runHook preBuild
pnpm --filter=@astrojs/language-server build
runHook postBuild
'';
```
#### Additional PNPM Commands and settings {#javascript-pnpm-extraCommands}
If you require setting an additional PNPM configuration setting (such as `dedupe-peer-dependents` or similar),
set `prePnpmInstall` to the right commands to run. For example:
```nix
prePnpmInstall = ''
pnpm config set dedupe-peer-dependants false
'';
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) prePnpmInstall;
...
};
```
In this example, `prePnpmInstall` will be run by both `pnpm.configHook` and by the `pnpm.fetchDeps` builder.
### Yarn {#javascript-yarn}
Yarn based projects use a `yarn.lock` file instead of a `package-lock.json` to pin dependencies. Nixpkgs provides the Nix function `fetchYarnDeps` which fetches an offline cache suitable for running `yarn install` before building the project. In addition, Nixpkgs provides the hooks:

View file

@ -50,6 +50,9 @@ in
API_USER_NAME=api
API_TOKEN=${api_token} # random md5 hash
# seeding database to get the admin roles
${pkgs.librenms}/artisan db:seed --force --no-interaction
# we don't need to know the password, it just has to exist
API_USER_PASS=$(${pkgs.pwgen}/bin/pwgen -s 64 1)
${pkgs.librenms}/artisan user:add $API_USER_NAME -r admin -p $API_USER_PASS

View file

@ -71,10 +71,10 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "doc" ];
patches = [
# Hardcode system installed banks & presets
# Lazily expand ZYN_DATADIR to fix builtin banks across updates
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/zynaddsubfx/zynaddsubfx/pull/295.patch";
hash = "sha256-UN62i9/JBs7uWTmHDKk3lkAxUXsVmIs6+6avOcL1NBg=";
url = "https://github.com/zynaddsubfx/zynaddsubfx/commit/853aa03f4f92a180b870fa62a04685d12fca55a7.patch";
hash = "sha256-4BsRZ9keeqKopr6lCQJznaZ3qWuMgD1/mCrdMiskusg=";
})
];

View file

@ -21,13 +21,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "albert";
version = "0.24.3";
version = "0.25.0";
src = fetchFromGitHub {
owner = "albertlauncher";
repo = "albert";
rev = "v${finalAttrs.version}";
hash = "sha256-9vR6G/9FSy1mqZCo19Mf0RuvW63DbnhEzp/h0p6eXqs=";
hash = "sha256-eowsQhaS9RGfsw157HahENuWUWtwkwyPNSFw135MW0c=";
fetchSubmodules = true;
};
@ -58,10 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' \;
# WARN: This is necessary for albert to detect the package libraries.
# Please check if the file below has changed upstream before updating.
sed -i src/app/qtpluginprovider.cpp \
-e "/QStringList install_paths;/a install_paths << QFileInfo(\"$out/lib\").canonicalFilePath();"
substituteInPlace src/app/qtpluginprovider.cpp \
--replace-fail "QStringList install_paths;" "QStringList install_paths;${"\n"}install_paths << QFileInfo(\"$out/lib\").canonicalFilePath();"
'';
postFixup = ''
@ -74,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
updateScript = nix-update-script { };
};
meta = with lib; {
meta = {
description = "Fast and flexible keyboard launcher";
longDescription = ''
Albert is a desktop agnostic launcher. Its goals are usability and beauty,
@ -84,13 +82,13 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://albertlauncher.github.io";
changelog = "https://github.com/albertlauncher/albert/blob/${finalAttrs.src.rev}/CHANGELOG.md";
# See: https://github.com/NixOS/nixpkgs/issues/279226
license = licenses.unfree;
maintainers = with maintainers; [
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [
ericsagnes
synthetica
eljamm
];
mainProgram = "albert";
platforms = platforms.linux;
platforms = lib.platforms.linux;
};
})

View file

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "gnome-epub-thumbnailer";
version = "1.7";
version = "1.8";
src = fetchurl {
url = "mirror://gnome/sources/gnome-epub-thumbnailer/${lib.versions.majorMinor version}/gnome-epub-thumbnailer-${version}.tar.xz";
sha256 = "sha256-S7Ah++RCgNuY3xTBH6XkMgsWe4GpG9e6WGvqDE+il1I=";
sha256 = "sha256-+QYZ1YxpkC8u/1e58AQrRzeGEIP0dZIaMQ/sxhL8oBc=";
};
nativeBuildInputs = [

View file

@ -18,13 +18,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gpxsee";
version = "13.22";
version = "13.23";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = finalAttrs.version;
hash = "sha256-5YoFO1NHduV8qKZ8GPaFnKfRQRlhlG5swZo74SfOpZY=";
hash = "sha256-GC1Csxhr2uh9oLgC+mFxJZiwCO7TMI2ljv6GMdEiuZQ=";
};
buildInputs = [

View file

@ -128,6 +128,9 @@ stdenv.mkDerivation (finalAttrs: {
# prusa-slicer uses dlopen on `libudev.so` at runtime
NIX_LDFLAGS = lib.optionalString withSystemd "-ludev";
# FIXME: remove in 2.8.0
NIX_CFLAGS_COMPILE = "-Wno-enum-constexpr-conversion";
prePatch = ''
# Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
# now seems to be integrated into the main lib.

View file

@ -1,20 +1,20 @@
{
beta = import ./browser.nix {
channel = "beta";
version = "127.0.2651.61";
version = "128.0.2739.5";
revision = "1";
hash = "sha256-M67QOKZF4+dGCdyKfe5EF5K4A6bip2/a4J1k7+v3QMQ=";
hash = "sha256-y+587iVWgPk2a1P/F2iwSW1NEnAJaigL6rlVmqaIDJk=";
};
dev = import ./browser.nix {
channel = "dev";
version = "128.0.2708.0";
version = "128.0.2739.5";
revision = "1";
hash = "sha256-QFtVQTcbiF165/Xqmo8kAoo4kQegqqzMVcr8mQiraH8=";
hash = "sha256-zY3iGbeYlOoArNNdF1qNwdtp25P0uWJmVMEK7kJIiqQ=";
};
stable = import ./browser.nix {
channel = "stable";
version = "126.0.2592.113";
version = "127.0.2651.86";
revision = "1";
hash = "sha256-wSNXCUTG9eCnqe5Ir8pE8Z7zuY2KsDgTLKKTAQeXS2s=";
hash = "sha256-1Dh+OoTrghn9ArvEnBZCkLnUf0m0qnkEtCoWjA8QId4=";
};
}

View file

@ -2,16 +2,16 @@
builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec {
inherit pname;
version = "3.28.0";
version = "3.28.1";
src = fetchFromGitHub {
owner = "projectcalico";
repo = "calico";
rev = "v${version}";
hash = "sha256-CiLapG5/J+oKDgoRyZmWkfA1NWJ9Cchp4yiE6bV4Wt4=";
hash = "sha256-IQGDuxk3ZDtrY/RLp2DfdCWtBNMTYPOitcVCcxH7HoY=";
};
vendorHash = "sha256-3BH7FZFfH63Z8d4U7y4S5wpiVG2Vcr9wqdzkoUnwsrM=";
vendorHash = "sha256-F44n+n9jfGYBQC1I33ylp8ZJtMi+uzjOLeG+5MbVePs=";
inherit doCheck subPackages;

View file

@ -165,8 +165,8 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.9.3";
hash = "sha256-5xtTjT+AP7Db3bhzhHkzmRIJpJB3UFZs+4cTgDB7Ihc=";
version = "1.9.4";
hash = "sha256-RCjeKdxrnCmOtUQfBC5/gM+FB6YHbc/V1cmVxNCVf20=";
vendorHash = "sha256-FnjCJilPuhYs/JTuEyb4Grn4t40Ox2uqwQf2h9B227Q=";
patches = [ ./provider-path-0_15.patch ];
passthru = {

View file

@ -2,11 +2,11 @@
let
pname = "jbrowse";
version = "2.12.3";
version = "2.13.1";
src = fetchurl {
url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage";
sha256 = "sha256-REJYJzjPPsRebRKdNKGIbRICe4tw7V8PxO/q53DXo3Y=";
sha256 = "sha256-JxV7ZxA3/YMG6ziYOA8QiBVth9UunVGJLTy1E110y6w=";
};
appimageContents = appimageTools.extractType2 {

View file

@ -1,26 +1,25 @@
{ lib
, python3
, fetchFromGitHub
{
lib,
python3,
fetchFromGitHub,
}:
python3.pkgs.buildPythonApplication rec {
pname = "ad-miner";
version = "1.5.0";
version = "1.5.2";
pyproject = true;
src = fetchFromGitHub {
owner = "Mazars-Tech";
repo = "AD_Miner";
rev = "refs/tags/v${version}";
hash = "sha256-BSUMNVHhclHzQf3Z0p2ZZjfQIZQyc2ZeQ67PXRz1RBk=";
hash = "sha256-Xb0RFllg3oqW6PhUjRxDkgXd7lv7XD37FfBsnpxrN+s=";
};
# All requirements are pinned
pythonRelaxDeps = true;
build-system = with python3.pkgs; [
poetry-core
];
build-system = with python3.pkgs; [ poetry-core ];
dependencies = with python3.pkgs; [
neo4j
@ -32,9 +31,7 @@ python3.pkgs.buildPythonApplication rec {
# Project has no tests
doCheck = false;
pythonImportsCheck = [
"ad_miner"
];
pythonImportsCheck = [ "ad_miner" ];
meta = with lib; {
description = "Active Directory audit tool that leverages cypher queries to crunch data from Bloodhound";

View file

@ -0,0 +1,69 @@
{
lib,
stdenv,
fetchFromGitHub,
pnpm_8,
nodejs_22,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "astro-language-server";
version = "2.10.0";
src = fetchFromGitHub {
owner = "withastro";
repo = "language-tools";
rev = "@astrojs/language-server@${finalAttrs.version}";
hash = "sha256-WdeQQaC9AVHT+/pXLzaC6MZ6ddHsFSpxoDPHqWvqmiQ=";
};
pnpmDeps = pnpm_8.fetchDeps {
inherit (finalAttrs)
pname
version
src
pnpmWorkspace
prePnpmInstall
;
hash = "sha256-n7HTd/rKxJdQKnty5TeOcyvBU9j/EClQ9IHqbBaEwQE=";
};
nativeBuildInputs = [
nodejs_22
pnpm_8.configHook
];
buildInputs = [ nodejs_22 ];
pnpmWorkspace = "@astrojs/language-server";
prePnpmInstall = ''
pnpm config set dedupe-peer-dependents false
'';
buildPhase = ''
runHook preBuild
pnpm --filter=@astrojs/language-server build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,lib/astro-language-server}
cp -r {packages,node_modules} $out/lib/astro-language-server
ln -s $out/lib/astro-language-server/packages/language-server/bin/nodeServer.js $out/bin/astro-ls
runHook postInstall
'';
meta = {
description = "The Astro language server";
homepage = "https://github.com/withastro/language-tools";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pyrox0 ];
mainProgram = "astro-ls";
platforms = lib.platforms.unix;
};
})

View file

@ -3,7 +3,6 @@
, fetchFromGitHub
, pnpm_8
, nodejs
, npmHooks
, makeBinaryWrapper
, shellcheck
}:
@ -19,26 +18,23 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-yJ81oGd9aNsWQMLvDSgMVVH1//Mw/SVFYFIPsJTQYzE=";
};
pnpmWorkspace = "bash-language-server";
pnpmDeps = pnpm_8.fetchDeps {
inherit (finalAttrs) pname version src;
inherit (finalAttrs) pname version src pnpmWorkspace;
hash = "sha256-W25xehcxncBs9QgQBt17F5YHK0b+GDEmt27XzTkyYWg=";
};
nativeBuildInputs = [
nodejs
pnpm_8.configHook
npmHooks.npmBuildHook
makeBinaryWrapper
];
npmBuildScript = "compile";
# We are only interested in the bash-language-server executable, which is
# part of the `./server` directory. From some reason, the `./vscode-client`
# directory is not included in upstream's `pnpm-workspace.yaml`, so perhaps
# that's why our ${pnpmDeps} don't include the dependencies required for it.
preBuild = ''
rm -r vscode-client
substituteInPlace tsconfig.json \
--replace-fail '{ "path": "./vscode-client" },' ""
buildPhase = ''
runHook preBuild
pnpm --filter=bash-language-server build
runHook postBuild
'';
installPhase = ''

View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "Bend";
version = "0.2.34";
version = "0.2.36";
src = fetchFromGitHub {
owner = "HigherOrderCO";
repo = "Bend";
rev = "refs/tags/${version}";
hash = "sha256-3leAt1M3Six5+KcCcz7sorpVHGkKj7xGWZ0KJnh+bNs=";
hash = "sha256-j4YMdeSxIbhp7xT42L42/y0ZncFPKBkxTh0LgO/RjkY=";
};
cargoHash = "sha256-VynLnpZLUCqclIlbt7y6kd8ZJQGLa892J2UjDATgAhE=";
cargoHash = "sha256-jPxPx/e6rv5REP+K1ZLg9ffJKKVNLqR/vd33xKs+Ut4=";
nativeBuildInputs = [
hvm

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bngblaster";
version = "0.9.2";
version = "0.9.5";
src = fetchFromGitHub {
owner = "rtbrick";
repo = "bngblaster";
rev = finalAttrs.version;
hash = "sha256-ugfimJmyAHxgLypgEwzOK0VLmIYod5YzW7oO/omcl1I=";
hash = "sha256-fJDoKGYal/wDpe2FALWDm0cVngP2ybWlrDIJLSEBIGY=";
};
nativeBuildInputs = [ cmake ];

View file

@ -36,11 +36,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "epiphany";
version = "46.2";
version = "46.3";
src = fetchurl {
url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz";
hash = "sha256-+5Mtp6JOh/HtuQC1uUJRtCs3CAdThkZRwFncbJPLUEk=";
hash = "sha256-qeGtIGRJEX/F6+TQF3wdei/1A9a1UBkHKgaP8qsnhlY=";
};
nativeBuildInputs = [

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fanbox-dl";
version = "0.22.1";
version = "0.23.0";
src = fetchFromGitHub {
owner = "hareku";
repo = "fanbox-dl";
rev = "v${version}";
hash = "sha256-wMFxAi4ENFFdMwHpgfOp/FRF6h2p91NS94FAjH/C2ww=";
hash = "sha256-hR6aO9Mdm3lxRqt1l3Qryp4ggO5B+poYBcq9k1XNrvs=";
};
vendorHash = "sha256-GD5uxa5XWhlHHBztTpDKCTSym2pdkr/or6aGl9qF29U=";

File diff suppressed because it is too large Load diff

View file

@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "fim-rs";
version = "0.4.10";
version = "0.5.0";
src = fetchFromGitHub {
owner = "Achiefs";
repo = "fim";
rev = "refs/tags/v${version}";
hash = "sha256-NrxjiJY+qgPfsNY2Xlm0KRArIDH3+u9uA5gSPem+9uc=";
hash = "sha256-V9BzgVcDTnYSy7N5fCo38vQmXRDXLjY6wvnSkIpuDGg=";
};
cargoLock = {

View file

@ -28,13 +28,13 @@ let
pieBuild = stdenv.hostPlatform.isMusl;
in buildGoModule rec {
pname = "frankenphp";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
owner = "dunglas";
repo = "frankenphp";
rev = "v${version}";
hash = "sha256-N8cnbyoacftQNQWQBh+KxLp9L+uFVR6qYcid8a4Blso=";
hash = "sha256-P4yBguD3DXYUe70/mKmvzFnsBXQOH4APaAZZle8lFeg=";
};
sourceRoot = "${src.name}/caddy";
@ -42,7 +42,7 @@ in buildGoModule rec {
# frankenphp requires C code that would be removed with `go mod tidy`
# https://github.com/golang/go/issues/26366
proxyVendor = true;
vendorHash = "sha256-Ir1lwTu3JqIFp9jhJyhTAFm/+XlStkPuCoNAZneeKGc=";
vendorHash = "sha256-3Y5STb521iRois/KLQqdTxxTYdp39PTaiJEBjWrZsyw=";
buildInputs = [ phpUnwrapped brotli ] ++ phpUnwrapped.buildInputs;
nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config cctools darwin.autoSignDarwinBinariesHook ];

View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "lightningcss";
version = "1.25.1";
version = "1.26.0";
src = fetchFromGitHub {
owner = "parcel-bundler";
repo = "lightningcss";
rev = "refs/tags/v${version}";
hash = "sha256-jmNN2zCAlu3qLKJs8V7/zkpGmQ5wooH9Kbnsi80ffRc=";
hash = "sha256-ZPqRxHbca8iflWwsDT2/sVbTstWnKVFcExcgrBXgzGc=";
};
cargoHash = "sha256-d5PqkqkHDLXA/5wW7QxSUDEKvejRc3+yn73TnM07lzE=";
cargoHash = "sha256-QYrjDJJTJo4BDQOqY1pZn7ph+uuQvbsMbzaAUr4siaE=";
patches = [
# Backport fix for build error for lightningcss-napi

View file

@ -7,19 +7,19 @@
}:
let
pname = "open-webui";
version = "0.3.11";
version = "0.3.12";
src = fetchFromGitHub {
owner = "open-webui";
repo = "open-webui";
rev = "v${version}";
hash = "sha256-z/BtMe+CRS9l8WTG6CUjuDNCerYO41KKPUSESNz69SY=";
hash = "sha256-Ot8QsRgRbe0l37C9KGlREDCjq5nTTvcJ1TJaeBe2oxw=";
};
frontend = buildNpmPackage {
inherit pname version src;
npmDepsHash = "sha256-ODt5OIcSQNW6LGG6uE3d1Itn2oyXhzg45jjXxILE0vM=";
npmDepsHash = "sha256-fr+IA6I1pE+vJ+uGE1sf2++s65rPzK//ZL+xT3QoLOA=";
# Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
# Until this is solved, running python packages from the browser will not work.
@ -59,6 +59,9 @@ python3.pkgs.buildPythonApplication rec {
"opencv-python-headless"
# using `psycopg2` instead
"psycopg2-binary"
"docker"
"pytest"
"pytest-docker"
];
dependencies = with python3.pkgs; [
@ -115,7 +118,6 @@ python3.pkgs.buildPythonApplication rec {
redis
requests
sentence-transformers
sqlalchemy
tiktoken
unstructured
uvicorn
@ -126,7 +128,6 @@ python3.pkgs.buildPythonApplication rec {
build-system = with python3.pkgs; [ hatchling ];
pythonImportsCheck = [ "open_webui" ];
makeWrapperArgs = [ "--set FRONTEND_BUILD_DIR ${frontend}/share/open-webui" ];

View file

@ -7,11 +7,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "passt";
version = "2024_06_24.1ee2eca";
version = "2024_07_26.57a21d2";
src = fetchurl {
url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz";
hash = "sha256-Q4AbpzJ4Gbu1ArdjzZCf0GmTz0nWZN+kEuhLPT8uPqg=";
hash = "sha256-UK3Klpo3cp4EH42W16qh5WbZlCxb+ETQtWbpgatL/Dc=";
};
makeFlags = [

View file

@ -6,16 +6,16 @@
php.buildComposerProject (finalAttrs: {
pname = "phpunit";
version = "11.2.8";
version = "11.3.0";
src = fetchFromGitHub {
owner = "sebastianbergmann";
repo = "phpunit";
rev = finalAttrs.version;
hash = "sha256-f3xLLOLpbSbgYoGpJHvUpea+wOu2U3M6jxZy/Rxro20=";
hash = "sha256-c8jooavjabT2RUXHYdRXwQzSD0slHG6ws/83FFL8W5k=";
};
vendorHash = "sha256-Gjii3m8wWmZbozKnJW/n9+wQUupemIU8XjmlCuTtfxU=";
vendorHash = "sha256-MjWfMfu3ptJhJubUrP7pC5/o2mVHepRCguPgPzJnGOY=";
passthru.updateScript = nix-update-script { };

View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "smartcat";
version = "1.3.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "efugier";
repo = "smartcat";
rev = "refs/tags/${version}";
hash = "sha256-iCtNNKXo0peGGUaQXKaaYaEo7MAL70PX0BAWPERNmlo=";
hash = "sha256-/BJdLHK8rb9QVlkLbRCXIPlHiI2eThAZvhIhJWW43Q4=";
};
cargoHash = "sha256-qNl2bI5VqpMfoFc+gZC4XHrNT9pnWseduYSOi5Dzr9M=";
cargoHash = "sha256-mMoLFlY4mExG7MCu2uXPzmG3krKIWOLwcnth8gt40eg=";
nativeBuildInputs = [
pkg-config

View file

@ -18,8 +18,8 @@ buildBazelPackage rec {
# These environment variables are read in bazel/build-version.py to create
# a build string shown in the tools --version output.
# If env variables not set, it would attempt to extract it from .git/.
GIT_DATE = "2024-07-07";
GIT_VERSION = "v0.0-3722-g3b927214";
GIT_DATE = "2024-08-05";
GIT_VERSION = "v0.0-3747-g79f6290d";
# Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345"
version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION)));
@ -28,7 +28,7 @@ buildBazelPackage rec {
owner = "chipsalliance";
repo = "verible";
rev = "${GIT_VERSION}";
hash = "sha256-/YQRC8Y8ucufqfgvCzvYYEQMksUMIw3ly37P090nm4s=";
hash = "sha256-cixhB7QZStfG4DKjqEVipIeM9uUt6vibtbtZypzIcMo=";
};
bazel = bazel_6;
@ -61,10 +61,12 @@ buildBazelPackage rec {
removeRulesCC = false;
bazelTargets = [ ":install-binaries" ];
bazelBuildFlags = [ "-c opt" ];
doCheck = true;
bazelTestTargets = [ "//..." ];
bazelBuildFlags = [
"-c opt"
];
bazelTestFlags = [ "-c opt" ];
buildAttrs = {
installPhase = ''
mkdir -p "$out/bin"

View file

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "gnome-user-docs";
version = "46.1";
version = "46.4";
src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-qXKTy+63l+tPTRadcTu2WDvRLDeR4UAoPkNW0v4YCto=";
hash = "sha256-J3YHLxX5K9BQKDRfOsigk9RCYN5SpiDWJpPA5e6iBTQ=";
};
nativeBuildInputs = [

View file

@ -73,11 +73,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-control-center";
version = "46.3";
version = "46.4";
src = fetchurl {
url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
hash = "sha256-l9xsfR3uGVkU88vIRbaBZLdhFIDYk760EQBsFerkbLk=";
hash = "sha256-Wb0wWDl3v6KOVCJ+7iEeqG9If81tORXtIfWTJCZxAeA=";
};
patches = [

View file

@ -30,11 +30,11 @@
stdenv.mkDerivation rec {
pname = "gnome-remote-desktop";
version = "46.3";
version = "46.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-CMZlbxHUY560lyqJKej1AkJ9weLqAz4CyZK7Gkx315Q=";
hash = "sha256-KLwH6W2qFJy45NCldN8KLObsbOZHutyGFUzmEoIsxR4=";
};
nativeBuildInputs = [

View file

@ -68,13 +68,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell";
version = "46.3.1";
version = "46.4";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
hash = "sha256-575fxu4sxSitJh3HpVyN5aMkEtPWhAoKB14PwSoH/4s=";
hash = "sha256-GIRo/nLpCsSyNOnU0HB9YH/q85oT0lvTqj63XlWj4FI=";
};
patches = [

View file

@ -46,11 +46,11 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-software";
version = "46.3";
version = "46.4";
src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
hash = "sha256-nWvB9jfYGytZhYN5BPBe1wdgAUfZrxYLqJEqvy1C8TY=";
hash = "sha256-ZVTR3gfnxjUtqLBjhP6hPaZJnXHAW1rQANjiHLFT9a8=";
};
patches = [

View file

@ -66,13 +66,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mutter";
version = "46.3.1";
version = "46.4";
outputs = [ "out" "dev" "man" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
hash = "sha256-dHpj2jdF8wSwG1U5PZar2qggmDsYi2C0DburPmg8gF8=";
hash = "sha256-YRvZz5gq21ZZfOKzQiQnL9phm7O7kSpoTXXG8sN1AuQ=";
};
mesonFlags = [

View file

@ -21,11 +21,11 @@
stdenv.mkDerivation rec {
pname = "gnome-sudoku";
version = "46.3";
version = "46.4";
src = fetchurl {
url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-OKJqwUvlO2w0/9UuxmhSVpFEQHSF4xsvgXkn0hdmUSQ=";
hash = "sha256-SmsMRQbolRIlOxyZO3P2QOjv2awfHrUqAkgZCHYjpKI=";
};
nativeBuildInputs = [

View file

@ -1,63 +1,55 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, meson
, ninja
, pkg-config
, python3
, vala
, wrapGAppsHook3
, glib
, granite
, gst_all_1
, gtk3
, libcanberra
, libgee
, libhandy
{
stdenv,
lib,
fetchFromGitHub,
meson,
ninja,
pkg-config,
vala,
wrapGAppsHook4,
glib,
granite7,
gst_all_1,
gtk4,
libadwaita,
libcanberra,
libgee,
nix-update-script,
}:
stdenv.mkDerivation rec {
pname = "elementary-camera";
version = "6.2.2";
version = "8.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "camera";
rev = version;
sha256 = "sha256-Sj89TBat2RY2Ms02M0P7gmE9tXYk1yrnPLzDwGyAFZA=";
sha256 = "sha256-c8wpo2oMkovZikzcWHfiUIUA/+L7iWEcUv6Cg/BMa+s=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
python3
vala
wrapGAppsHook3
wrapGAppsHook4
];
buildInputs = [
glib
granite
gtk3
granite7
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })
gst_all_1.gst-plugins-rs # GTK 4 sink
gst_all_1.gst-plugins-ugly
gst_all_1.gstreamer
gtk4
libadwaita
libcanberra
libgee
libhandy
] ++ (with gst_all_1; [
gst-plugins-bad
gst-plugins-base
# gtkSupport needed for gtksink
# https://github.com/elementary/camera/issues/181
(gst-plugins-good.override { gtkSupport = true; })
gst-plugins-ugly
gstreamer
]);
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
];
passthru = {
updateScript = nix-update-script { };

View file

@ -12,6 +12,7 @@
, glib
, libgee
, libhandy
, libportal-gtk3
, granite
, pango
, bamf
@ -25,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "elementary-files";
version = "6.5.3";
version = "7.0.0";
outputs = [ "out" "dev" ];
@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = "files";
rev = version;
sha256 = "sha256-geJLHRo1Bd2oFT+UtirHj9FVSFTFMK/v/5h+NF9woFo=";
hash = "sha256-6pEHyrQjqgbpOUEM/zbpuF8GM7JotDYfCnumU3aXIaI=";
};
nativeBuildInputs = [
@ -55,6 +56,7 @@ stdenv.mkDerivation rec {
libgee
libgit2-glib
libhandy
libportal-gtk3
pango
sqlite
systemd

View file

@ -5,7 +5,6 @@
, meson
, ninja
, pkg-config
, python3
, vala
, wrapGAppsHook3
, clutter-gtk
@ -23,20 +22,19 @@
stdenv.mkDerivation rec {
pname = "elementary-tasks";
version = "6.3.2";
version = "6.3.3";
src = fetchFromGitHub {
owner = "elementary";
repo = "tasks";
rev = version;
sha256 = "sha256-6Vwx+NRVGDqZzN5IVk4cQxGjSkYwrrNhUVoB8TRo28U=";
hash = "sha256-xOMS4Zwfl7TLHvm8Zn6wQ4ZoMg+Yuci+cTpUVG+liss=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
python3
vala
wrapGAppsHook3
];
@ -55,11 +53,6 @@ stdenv.mkDerivation rec {
libportal-gtk3
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script { };
};

View file

@ -0,0 +1,22 @@
{ lib, mkCoqDerivation, coq, version ? null }:
mkCoqDerivation {
pname = "coinduction";
owner = "damien-pous";
inherit version;
defaultVersion = let inherit (lib.versions) range; in
lib.switch coq.coq-version [
{ case = range "8.19" "8.19"; out = "1.9"; }
] null;
release = {
"1.9".sha256 = "sha256-bBU+xDklnzJBeN41GarW5KXzD8eKsOYtb//ULYumwWE=";
};
releaseRev = v: "v${v}";
mlPlugin = true;
meta = {
description = "A library for doing proofs by (enhanced) coinduction";
license = lib.licenses.lgpl3Plus;
};
}

View file

@ -31,13 +31,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-online-accounts";
version = "3.50.3";
version = "3.50.4";
outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
hash = "sha256-5xSmfRccVxRDYet07oKhexXQqCIo/xiM+ScE9WJsopQ=";
hash = "sha256-MMoTA4zXpp1bay1TZD+6ZUjRcSuSXwwhbzEzw2y/d3M=";
};
mesonFlags = [

View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "jsonrpc-glib";
version = "3.44.0";
version = "3.44.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "aUBqAlDQzFF1QIyufsqAwMa/rvxK4YMLNUwEM7zVzgY=";
sha256 = "E2HRfpyAVkav5RAuWbr4ykUCOGAPyr0BWGxlS3i7MN8=";
};
nativeBuildInputs = [

View file

@ -37,6 +37,7 @@ in
mapAliases {
"@antora/cli" = pkgs.antora; # Added 2023-05-06
"@astrojs/language-server" = pkgs.astro-language-server; # Added 2024-02-12
"@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25
"@emacs-eask/cli" = pkgs.eask; # added 2023-08-17
"@forge/cli" = throw "@forge/cli was removed because it was broken"; # added 2023-09-20

View file

@ -8,7 +8,6 @@
# Packages that provide a single executable.
"@angular/cli" = "ng";
"@astrojs/language-server" = "astro-ls";
"@babel/cli" = "babel";
"@commitlint/cli" = "commitlint";
"@gitbeaker/cli" = "gitbeaker";

View file

@ -1,7 +1,6 @@
[
"@angular/cli"
, "@antfu/ni"
, "@astrojs/language-server"
, "@babel/cli"
, "@commitlint/cli"
, "@commitlint/config-conventional"

View file

@ -366,7 +366,7 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.34.154";
version = "1.34.155";
pyproject = true;
disabled = pythonOlder "3.7";
@ -374,7 +374,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boto3_stubs";
inherit version;
hash = "sha256-caDk9fqLr/a65FwPu1pj33Xei6rpg8X3XWG97J6xwHI=";
hash = "sha256-XIcATvHqOu6rO57TWlkWmih2h3JEVjbKiO9zAE5P7ts=";
};
build-system = [ setuptools ];

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "botocore-stubs";
version = "1.34.154";
version = "1.34.155";
pyproject = true;
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "botocore_stubs";
inherit version;
hash = "sha256-nu9OVrcr/Hw3KFBKO1CtgPCLEv4u6Syj1uHjTQXJzls=";
hash = "sha256-VRS5NyUnwv6paQYafwQSXVOlFlns4M5Z2b+6+zCGRKM=";
};
nativeBuildInputs = [ poetry-core ];

View file

@ -5,12 +5,13 @@
numpy,
python,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "cma";
version = "3.3.0";
format = "setuptools";
version = "3.4.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -18,10 +19,12 @@ buildPythonPackage rec {
owner = "CMA-ES";
repo = "pycma";
rev = "refs/tags/r${version}";
hash = "sha256-+UJI3hDVbDMfRF4bkwHED3eJCHzxS2hO4YPUzJqcoQI=";
hash = "sha256-wbAH0A5vpnnXqt7TTvLDPnCp6M3QjeCwD6l6LoTVu1w=";
};
propagatedBuildInputs = [ numpy ];
build-system = [ setuptools ];
dependencies = [ numpy ];
checkPhase = ''
# At least one doctest fails, thus only limited amount of files is tested
@ -33,6 +36,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization";
homepage = "https://github.com/CMA-ES/pycma";
changelog = "https://github.com/CMA-ES/pycma/releases/tag/r${version}";
license = licenses.bsd3;
maintainers = [ ];
};

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "fastcore";
version = "1.6.2";
version = "1.6.3";
pyproject = true;
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "fastai";
repo = "fastcore";
rev = "refs/tags/${version}";
hash = "sha256-Ir9cvOTijWv6giFmfiy3juIPZbXekiIehQNulMEqevA=";
hash = "sha256-WCPO/JLc39EoUyaRNUgaJZvPlyt8WogRct73aOzhyH8=";
};
build-system = [ setuptools ];

View file

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "glyphslib";
version = "6.7.1";
version = "6.7.2";
format = "pyproject";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "googlefonts";
repo = "glyphsLib";
rev = "refs/tags/v${version}";
hash = "sha256-mUwbUGLhxwoYEwjbT558rTA8dtWxQXyqWYNEVy/WpIU=";
hash = "sha256-wiDLFRoP7MBzZuDA5drdXPS58Mhrw83xUKES3b1tBow=";
};
nativeBuildInputs = [ setuptools-scm ];

View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "gocardless-pro";
version = "1.52.0";
version = "1.53.0";
pyproject = true;
src = fetchFromGitHub {
owner = "gocardless";
repo = "gocardless-pro-python";
rev = "refs/tags/v${version}";
hash = "sha256-Oi68s4x/rS8ahvJ9TsniYfDidCxtvcvsMwYhJirYlP0=";
hash = "sha256-Z58akjaYuvKVQWFfiP5TZlM/+4CB/vmLzd4eWmnWV90=";
};
build-system = [ setuptools ];

View file

@ -4,12 +4,13 @@
fetchFromGitHub,
pytestCheckHook,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "lcgit";
version = "0.2.1";
format = "setuptools";
version = "1.0.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -17,14 +18,16 @@ buildPythonPackage rec {
owner = "cisagov";
repo = "lcgit";
rev = "refs/tags/v${version}";
hash = "sha256-bLeblC68+j+YwvgnV1wgJiWm/jxZFzhTSDwXpoSzUTg=";
hash = "sha256-aMwjgN9//jAnTYnbJJvQyfE/f+5QosKxF1l4vF+3myc=";
};
postPatch = ''
substituteInPlace pytest.ini \
--replace " --cov" ""
--replace-fail " --cov" ""
'';
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "lcgit" ];

View file

@ -18,21 +18,24 @@
requests,
rich,
semver,
setuptools,
tailer,
}:
buildPythonPackage rec {
pname = "localstack";
version = "3.5.0";
version = "3.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "localstack";
repo = "localstack";
rev = "refs/tags/v${version}";
hash = "sha256-Sd5B4+pvUwNXfP3hsqBkUoHo06YyzUGCUHzc8f77Vx4=";
hash = "sha256-MAECVYO6+1JqSZN8PFvHcMWizeYBUnU+7o7l48uwpv4=";
};
build-system = [ setuptools ];
dependencies = [
apispec
boto3

View file

@ -19,14 +19,14 @@
}:
buildPythonPackage rec {
pname = "qpsolvers";
version = "4.3.2";
version = "4.3.3";
pyproject = true;
src = fetchFromGitHub {
owner = "qpsolvers";
repo = "qpsolvers";
rev = "refs/tags/v${version}";
hash = "sha256-EU7/OGLeOIHw7wyNTibMmHZLAiRTCUFwjEaVNsHg1vw=";
hash = "sha256-AQHd3tBfPzISQXsXHQQyh59nmym5gt8Jfogd6gRG3EM=";
};
nativeBuildInputs = [ flit-core ];

View file

@ -30,7 +30,7 @@
buildPythonPackage rec {
pname = "reptor";
version = "0.20";
version = "0.21";
pyproject = true;
disabled = pythonOlder "3.8";
@ -39,7 +39,7 @@ buildPythonPackage rec {
owner = "Syslifters";
repo = "reptor";
rev = "refs/tags/${version}";
hash = "sha256-6DuIJScNiSaEez4vMRuA5Thr8zmvH0j3oiZmQhONSdY=";
hash = "sha256-XJCysRGCg5V3ftSsu611mS8btbdebs1EOPTp1Z/6PJ0=";
};
pythonRelaxDeps = true;

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1205";
version = "3.0.1206";
pyproject = true;
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-xf+UZbiNiCYnQEneetB5Yz9kQe86XY3N7uaGnedEfLQ=";
hash = "sha256-GjbqBtNgSKYCx7TCTaszrtUiKcxPH0AMmu94/G1fgDE=";
};
build-system = [ setuptools ];

View file

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "towncrier";
version = "23.11.0";
version = "24.7.1";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-E5N8JH4/iuIKxE2JXPX5amCtRs/cwWcXWVMNeDfZ7l0=";
hash = "sha256-V6BX+u2ryt8aYvb5utcmrlZsHzGkETON24MWmT9YOz0=";
};
postPatch = ''

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "zigpy-deconz";
version = "0.23.2";
version = "0.23.3";
pyproject = true;
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-H3WsprBTfBpxMGqasWbj41Yikt/UMU0cKaROzXE2dLU=";
hash = "sha256-z/QulOkvkV/1Z+M7EfzdfGvrrtkapYcvfz+3AijR46k=";
};
postPatch = ''

View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "bacon";
version = "2.18.2";
version = "2.19.0";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-hW37pz7iLkBspnQ0ckfVdZUKppXUPrgjHgwmlhsanlI=";
hash = "sha256-SAlw1TMl8V31wS/nkW3tPrLPV/FlmQtp+beIjtkQ204=";
};
cargoHash = "sha256-5o7TtqJh2CRwTrBU2Xbdh7qae5iWVlUfg4ddzxYepmU=";
cargoHash = "sha256-iK59VumYh1k/IAWBh7lXfNQ67xuapw4LuFxi1uo15Uw=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices

View file

@ -2,9 +2,9 @@
buildDotnetGlobalTool {
pname = "fable";
version = "4.18.0";
version = "4.19.3";
nugetHash = "sha256-PbrFjpltRx4lnQDgQrOKSVHwttePMfOnjljOddkFbmY=";
nugetHash = "sha256-+ZauUmFVDxnlSfYtNWaq5oCK2odTuBfFjKTo/POp0SQ=";
passthru.updateScript = ./update.sh;
meta = with lib; {

View file

@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
pname = "blackfire";
version = "2.28.9";
version = "2.28.10";
src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}");
@ -57,23 +57,23 @@ stdenv.mkDerivation rec {
sources = {
"x86_64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
sha256 = "IP5B0vlB8W6yKunHcwsUhMuQ0c2+UZf8TDk0Rviygaw=";
sha256 = "HWSIffGVZYu9xTBM2uajkhBX7kzH17fepyZxMVQTOp8=";
};
"i686-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
sha256 = "PJhwQ65odKWHPa5CH6b7eiYmzbbg5Rh4nJjkwxlCOsU=";
sha256 = "wbqhEOw7tM3ekHCQUZpy6DiiEtYssoNFNdlzW8SkXgQ=";
};
"aarch64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
sha256 = "5GrsVTDYVjVHqTs3OKJOMpYdZGqDwjB9T90Yv3c59/4=";
sha256 = "LiN2qnhWhLWSMG/9G6Zf4rwCjksvvYWsDhHSPx+Bsjk=";
};
"aarch64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
sha256 = "1yK3b6BXjWeqKDfgtlzD5/3FrSUqvCLrhFSAg7os3Ao=";
sha256 = "lNIGtc7gU1jtkfCqJRnGWu6RXMcVDM/ayKTsUMq9j+M=";
};
"x86_64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
sha256 = "HyI4R7DZJAmMd7MfJX/i3nswoHizgRkalyH137cfChU=";
sha256 = "2gmAVjjTzFx36MxB8yyUTjXyH8oeyUXVhJby3rvV1Ek=";
};
};

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "re-flex";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitHub {
owner = "Genivia";
repo = "RE-flex";
rev = "v${version}";
hash = "sha256-yMFz3KrB1eIzGg0LB3U0H+XQz/DKhJOyiG8ScW9Lm7A=";
hash = "sha256-Dc/nnzJtkLgfmYnilA9FtOPtlOwTqgXtNVWhypFu5hs=";
};
outputs = [ "out" "bin" "dev" ];

View file

@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "spicy";
version = "1.10.1";
version = "1.11.0";
strictDeps = true;
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
owner = "zeek";
repo = "spicy";
rev = "v${version}";
hash = "sha256-D7DWZDZH3/PFggMxsr+x5S1B6SV5E8xpJoXfGcDelKs=";
hash = "sha256-zndqNd4CTzXuDkkc6uzjwKdUnypnV/4NppcVJ0N3S1U=";
fetchSubmodules = true;
};

View file

@ -14,6 +14,8 @@
{
hash ? "",
pname,
pnpmWorkspace ? "",
prePnpmInstall ? "",
...
}@args:
let
@ -29,6 +31,7 @@
outputHash = "";
outputHashAlgo = "sha256";
};
installFlags = lib.optionalString (pnpmWorkspace != "") "--filter=${pnpmWorkspace}";
in
stdenvNoCC.mkDerivation (finalAttrs: (
args'
@ -58,9 +61,15 @@
pnpm config set side-effects-cache false
# As we pin pnpm versions, we don't really care about updates
pnpm config set update-notifier false
# Run any additional pnpm configuration commands that users provide.
${prePnpmInstall}
# pnpm is going to warn us about using --force
# --force allows us to fetch all dependencies including ones that aren't meant for our host platform
pnpm install --frozen-lockfile --ignore-script --force
pnpm install \
--force \
--ignore-scripts \
${installFlags} \
--frozen-lockfile
runHook postInstall
'';

View file

@ -24,7 +24,17 @@ pnpmConfigHook() {
echo "Installing dependencies"
pnpm install --offline --frozen-lockfile --ignore-script
if [[ -n "$pnpmWorkspace" ]]; then
pnpmInstallFlags+=("--filter=$pnpmWorkspace")
fi
runHook prePnpmInstall
pnpm install \
--offline \
--ignore-scripts \
"${pnpmInstallFlags[@]}" \
--frozen-lockfile
echo "Patching scripts"

View file

@ -7,11 +7,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "schemacrawler";
version = "16.21.4";
version = "16.22.1";
src = fetchzip {
url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip";
hash = "sha256-8/Wf5RfR8Tb32VyBhHPAtbiqQN1LsnOxy98MWNPkWrM=";
hash = "sha256-GEorJxVBHrT0JGSDvqNbt00kjs0VMH1aJR9BZ5mewoc=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "summon";
version = "0.9.6";
version = "0.10.0";
src = fetchFromGitHub {
owner = "cyberark";
repo = "summon";
rev = "v${version}";
hash = "sha256-OOIq6U7HCxcYvBFZdewSpglg9lFzITsb6IPu/EID+Z0=";
hash = "sha256-98dgsO/33tJ4hBwCwAdJBJCzWwnpbrSZPbqa5NSNmXM=";
};
vendorHash = "sha256-qh3DJFxf1FqYgbULo4M+0nSOQ6uTlMTjAqNl7l+IPvk=";
vendorHash = "sha256-StcJvUtMfBh7p1sD8ucvHNJ572whRfqz3id6XsFoXtk=";
subPackages = [ "cmd" ];

View file

@ -16,8 +16,7 @@
}:
let
pname = "7kaa";
version = "2.15.5";
version = "2.15.6";
musicVersion = lib.versions.majorMinor version;
music = stdenv.mkDerivation {
@ -37,14 +36,15 @@ let
meta.license = lib.licenses.unfree;
};
in
gccStdenv.mkDerivation rec {
inherit pname version;
gccStdenv.mkDerivation (finalAttrs: {
pname = "7kaa";
inherit version;
src = fetchFromGitHub {
owner = "the3dfxdude";
repo = pname;
rev = "v${version}";
hash = "sha256-Z6TsR6L6vwpzoKTj6xJ6HKy4DxcUBWmYBFi/a9pQBD8=";
repo = "7kaa";
rev = "v${finalAttrs.version}";
hash = "sha256-kkM+kFQ+tGHS5NrVPeDMRWFQb7waESt8xOLfFGaGdgo=";
};
nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config ];
@ -73,4 +73,4 @@ gccStdenv.mkDerivation rec {
platforms = platforms.x86_64 ++ platforms.aarch64;
maintainers = with maintainers; [ _1000101 ];
};
}
})

View file

@ -39,6 +39,7 @@ let
pathsPy = ./paths.py;
pythonInputs = with python3.pkgs; [
distutils
six
python-ldap
dnspython

View file

@ -24,16 +24,16 @@ let
phpPackage = php82.withExtensions ({ enabled, all }: enabled ++ [ all.memcached ]);
in phpPackage.buildComposerProject rec {
pname = "librenms";
version = "23.9.1";
version = "24.7.0";
src = fetchFromGitHub {
owner = "librenms";
repo = pname;
rev = "${version}";
sha256 = "sha256-glcD9AhxkvMmGo/7/RhQFeOtvHJ4pSiEFxaAjeVrTaI=";
sha256 = "sha256-XAtIm1YVmDhf2JjSiLDPGYhXRTL9lDQxDX+4//skC8Q=";
};
vendorHash = "sha256-s6vdGfM7Ehy1bbkB44EQaHBBvTkpVw9yxhVsc/O8dHc=";
vendorHash = "sha256-adPBPmm4BDUEY/BGsvghWGc38SbcFxsnDwLfvX6SjvQ=";
php = phpPackage;

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "junos-czerwonk-exporter";
version = "0.12.3";
version = "0.12.4";
src = fetchFromGitHub {
owner = "czerwonk";
repo = "junos_exporter";
rev = version;
sha256 = "sha256-5haMQlwGJO0WdT75AEfs41k1oWUqrFk9nj+DOcKAom0=";
sha256 = "sha256-L6D2gJ6Vt80J6ERJE9I483L9c2mufHzuAbStODaiOy4=";
};
vendorHash = "sha256-qHs6KuBmJmmkmR23Ae7COadb2F7N8CMUmScx8JFt98Q=";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "unpackerr";
version = "0.14.0";
version = "0.14.3";
src = fetchFromGitHub {
owner = "davidnewhall";
repo = "unpackerr";
rev = "v${version}";
sha256 = "sha256-boDDxQVEUnPOt+ido8J1MvkVUrZRusdSORY0/mPfjDw=";
sha256 = "sha256-QwsrH0Wq5oix1qFqObFadZTCIJr8ny4Umx8cwErcBcM=";
};
vendorHash = "sha256-rxoAHcVxjKII945FQ4/HD3UjtZTwmlFx8zJx0Rfumu4=";
vendorHash = "sha256-wWIw0gNn5tqRq0udzPy/n2OkiIVESpSotOSn2YlBNS4=";
buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ];

View file

@ -5,14 +5,14 @@
, git, nix, nixfmt-classic, jq, coreutils, gnused, curl, cacert, bash }:
stdenv.mkDerivation rec {
version = "2024-07-03";
version = "2024-08-04";
pname = "oh-my-zsh";
src = fetchFromGitHub {
owner = "ohmyzsh";
repo = "ohmyzsh";
rev = "057f3ec67e65661d3c01b757ec5cad0a3718453e";
sha256 = "sha256-gRQ1F13/CZaxLmDT5L+seUPldP7pBy3n3AcnfBnpcO8=";
rev = "0ffcc3b68a1196e9164ff42fac8a5fdd4804abd0";
sha256 = "sha256-wATdyI2NSB7bYJz9uWfYC6aa2tRk5iKPrQdvWBfj/yg=";
};
strictDeps = true;

File diff suppressed because it is too large Load diff

View file

@ -6,27 +6,28 @@
, wrapGAppsHook3
, libglvnd
, libxkbcommon
, openssl
, nix-update-script
}:
rustPlatform.buildRustPackage rec {
pname = "ukmm";
version = "0.12.1";
version = "0.13.0";
src = fetchFromGitHub {
owner = "NiceneNerd";
repo = pname;
repo = "ukmm";
rev = "refs/tags/v${version}";
hash = "sha256-YnF0gn2JihZKkDBwI6Odne2CW8k2trQJiPbxMrtI8Gg=";
hash = "sha256-IhVpsDdFpeE27GY+2iZyAmXjS6F8S4ME09SneQCSuZg=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"egui-aesthetix-0.2.2" = "sha256-LtrMSnz5KWUrYCe50kgGU98WdPxWlo+U7FtRmxSIeI8=";
"egui-aesthetix-0.2.4" = "sha256-6Nt+nx1pAkuehXINRLp8xgiXmq1PzWgtu/hVbcDm5iA=";
"junction-0.2.0" = "sha256-6+pPp5wG1NoIj16Z+OvO4Pvy0jnQibn/A9cTaHAEVq4=";
"msbt-0.1.1" = "sha256-PtBs60xgYrwS7yPnRzXpExwYUD3azIaqObRnnJEL5dE=";
"msyt-1.2.1" = "sha256-aw5whCoQBhO0u9Fx2rTO1sRuPdGnAAlmPWv5q8CbQcI=";
"msyt-1.4.0" = "sha256-Ovp0QVzMR4sT/qKArLJYFG1Olp4SytI1QDE9ixhTIS0=";
};
};
@ -39,6 +40,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
libglvnd
libxkbcommon
openssl
];
# Force linking to libEGL, which is always dlopen()ed, and to

View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "rustypaste-cli";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "orhun";
repo = "rustypaste-cli";
rev = "v${version}";
hash = "sha256-Nx0mnwoyJlZSaOiGsqhrx6o9ZDJAGbEpOBhPknbZBjI=";
hash = "sha256-RF4SGqaEx9/OMB5XEJNiPPPGg1uwTM5ta1gwpj8mbho=";
};
cargoHash = "sha256-z/llEeUfiWPCy8JspmpbbX0FCb8eXPvV1SJAW7ujSyU=";
cargoHash = "sha256-UaOUEuh7NNIhXOKqHEfVRv1hXld7qmdPdazATalXvQU=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security

View file

@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
version = "11.15.1";
version = "11.16.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
rev = "refs/tags/v${version}";
hash = "sha256-r3UivIoWWE6TShTJ9ipCpJ8vgDSi13or/jVXqB7F0qY=";
hash = "sha256-xXN+1t5/0bLjX7lfuKTJDw0cN87LdFCuzYaaVt1plac=";
};
proxyVendor = true;
vendorHash = "sha256-sDTUzWgmosL+jnjXD9T6TPp56dywwEPcJO9+0vXqwHo=";
vendorHash = "sha256-S4RvRGtIUjJ/vDehUrsozxbvZckw/7hpguTCcR6mbCc=";
subPackages = [ "apps/cnspec" ];

View file

@ -5,33 +5,31 @@
python3.pkgs.buildPythonApplication rec {
pname = "ioc-scan";
version = "1.5.4";
format = "setuptools";
version = "2.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "cisagov";
repo = "ioc-scanner";
rev = "refs/tags/v${version}";
hash = "sha256-LQljpIlTDy1uxuwj1WyygwrB5hQ7dib1ViB+SEhRJ6Y=";
hash = "sha256-SCyCANZfi7PqexM2Kc8WJwwEEiBQxPBg0ggWsK9WB4k=";
};
postPatch = ''
substituteInPlace pytest.ini \
--replace " --cov" ""
--replace-fail " --cov" ""
'';
propagatedBuildInputs = with python3.pkgs; [
docopt
];
build-system = with python3.pkgs; [ setuptools ];
propagatedBuildInputs = with python3.pkgs; [ docopt];
nativeCheckInputs = with python3.pkgs; [
pyfakefs
pytestCheckHook
];
pythonImportsCheck = [
"ioc_scan"
];
pythonImportsCheck = [ "ioc_scan" ];
meta = with lib; {
description = "Tool to search a filesystem for indicators of compromise (IoC)";

View file

@ -9910,6 +9910,8 @@ with pkgs;
l3afpad = callPackage ../applications/editors/l3afpad { };
leanblueprint = with python3Packages; toPythonApplication leanblueprint;
leanify = callPackage ../tools/misc/leanify { };
leatherman = callPackage ../development/libraries/leatherman { };
@ -17430,8 +17432,6 @@ with pkgs;
vala-language-server = callPackage ../development/tools/language-servers/vala-language-server { };
verible = callPackage ../development/tools/language-servers/verible { };
vscode-langservers-extracted = callPackage ../development/tools/language-servers/vscode-langservers-extracted { };
zls = callPackage ../development/tools/language-servers/zls { };
@ -33635,7 +33635,10 @@ with pkgs;
printrun = callPackage ../applications/misc/printrun { };
prusa-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer {
stdenv = if stdenv.isDarwin then overrideSDK llvmPackages_14.stdenv "11.0" else stdenv;
# Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory
# on this particular code base (OOM with 32GB memory and --cores 16 on GCC, succeeds
# with --cores 32 on clang).
stdenv = if stdenv.isDarwin then overrideSDK llvmPackages.stdenv "11.0" else llvmPackages.stdenv;
};
super-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer/super-slicer.nix { };

View file

@ -26,6 +26,7 @@ let
category-theory = callPackage ../development/coq-modules/category-theory { };
ceres = callPackage ../development/coq-modules/ceres {};
Cheerios = callPackage ../development/coq-modules/Cheerios {};
coinduction = callPackage ../development/coq-modules/coinduction {};
CoLoR = callPackage ../development/coq-modules/CoLoR (
(lib.optionalAttrs (lib.versions.isEq self.coq.coq-version "8.13") {
bignums = self.bignums.override { version = "8.13.0"; };