Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
K900
2025-06-09 20:28:49 +03:00
33 changed files with 609 additions and 273 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ For new packages please briefly describe the package or provide a link to its ho
- [NixOS 25.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2511.section.md) (or backporting [24.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2411.section.md) and [25.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) NixOS Release notes)
- [ ] (Module updates) Added a release notes entry if the change is significant
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md), [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md), [maintainers/README.md](https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md) and other contributing documentation in corresponding paths.
<!--
To help with the large amounts of pull requests, we would appreciate your
+10 -1
View File
@@ -69,10 +69,19 @@ in
environment.systemPackages = [ cfg.package ];
environment.etc."man_db.conf".text =
let
# We unfortunately cant use the customized `cfg.package` when
# crosscompiling. Instead we detect that situation and work
# around it by using the vanilla one, like the OpenSSH module.
buildPackage =
if pkgs.stdenv.buildPlatform.canExecute pkgs.stdenv.hostPlatform then
cfg.package
else
pkgs.buildPackages.man-db;
manualCache =
pkgs.runCommand "man-cache"
{
nativeBuildInputs = [ cfg.package ];
nativeBuildInputs = [ buildPackage ];
}
''
echo "MANDB_MAP ${cfg.manualPages}/share/man $out" > man.conf
@@ -359,8 +359,7 @@ in
systemd.services.pipewire.bindsTo = [ "dbus.service" ];
systemd.user.services.pipewire.bindsTo = [ "dbus.service" ];
# Enable either system or user units. Note that for pipewire-pulse there
# are only user units, which work in both cases.
# Enable either system or user units.
systemd.sockets.pipewire.enable = cfg.systemWide;
systemd.services.pipewire.enable = cfg.systemWide;
systemd.user.sockets.pipewire.enable = !cfg.systemWide;
+60
View File
@@ -0,0 +1,60 @@
{
lib,
fetchFromGitHub,
crystal_1_15,
versionCheckHook,
}:
let
# Use the same Crystal minor version as specified in upstream
crystal = crystal_1_15;
in
crystal.buildCrystalPackage rec {
pname = "ameba-ls";
version = "0.1.0";
src = fetchFromGitHub {
owner = "crystal-lang-tools";
repo = "ameba-ls";
tag = "v${version}";
hash = "sha256-TEHjR+34wrq24XJNLhWZCEzcDEMDlmUHv0iiF4Z6JlI=";
};
shardsFile = ./shards.nix;
crystalBinaries.ameba-ls.src = "src/ameba-ls.cr";
buildTargets = [
"ameba-ls"
];
# There are no actual tests
doCheck = false;
installPhase = ''
runHook preInstall
install -Dm555 bin/ameba-ls -t "$out/bin/"
runHook postInstall
'';
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/ameba-ls";
versionCheckProgramArg = "--version";
meta = {
description = "Crystal language server powered by Ameba linter";
homepage = "https://github.com/crystal-lang-tools/ameba-ls";
changelog = "https://github.com/crystal-lang-tools/ameba-ls/blob/v${version}/CHANGELOG.md";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [
kachick
];
mainProgram = "ameba-ls";
};
}
+27
View File
@@ -0,0 +1,27 @@
{
ameba = {
url = "https://github.com/crystal-ameba/ameba.git";
rev = "a21dea0b44642f4fc87429283f8b0dd9f1e47a9f";
sha256 = "1kzr4ynd4r5w87y2czzrlir1dvqmv43ijm07804kgsy1g20k00fs";
};
larimar = {
url = "https://github.com/nobodywasishere/larimar.git";
rev = "97d37e665f7189a7ec35f54fb65003a8438d6cf0";
sha256 = "0s5hnfdybwbfk8sbjzrly2p6xppc5niww14h9cx00xkm8m1rlyj2";
};
lsprotocol = {
url = "https://github.com/nobodywasishere/lsprotocol-crystal.git";
rev = "28986890c7657af4aefea8355ca3f3c7fc2bc9dd";
sha256 = "0pccgq5g87mnvrhpgw3j22p3wgch8kp1svxcrbz2dha7zvgn65kj";
};
rwlock = {
url = "https://github.com/spider-gazelle/readers-writer.git";
rev = "v1.0.7";
sha256 = "1cs4ang50cza7sb5zh94rl1ppwcn9z1l8jjcsshhy4w72wkbqyny";
};
tree_sitter = {
url = "https://github.com/crystal-lang-tools/crystal-tree-sitter.git";
rev = "1d46ca231a641b30b8e7fbbae7eba050f7717a9f";
sha256 = "16g0ii3b3pmpnwmx2iz9dr1865pgfka7a724dfj62csjavqm5i1k";
};
}
+58
View File
@@ -0,0 +1,58 @@
{
lib,
rustPlatform,
fetchFromGitHub,
llvmPackages,
_experimental-update-script-combinators,
unstableGitUpdater,
nix-update-script,
}:
rustPlatform.buildRustPackage {
pname = "artichoke";
version = "0-unstable-2025-06-01";
src = fetchFromGitHub {
owner = "artichoke";
repo = "artichoke";
rev = "7c35392d8c7622cd8ab8eccaee73d57633b2b901";
hash = "sha256-7YPExT+5F+5MMk/yLfG4Rk8ZDwsYfVKlkvIroFB22No=";
};
cargoHash = "sha256-cN70yYYKhktUoswow63ZXHvfFbXDo1rUrTWm22LluCM=";
nativeBuildInputs = [
rustPlatform.bindgenHook
];
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
stdout="$("$out/bin/artichoke" -e 'puts "Hello World!"')"
[[ "$stdout" == 'Hello World!' ]]
runHook postInstallCheck
'';
passthru = {
updateScript = _experimental-update-script-combinators.sequence [
(unstableGitUpdater { })
(nix-update-script {
# Updating `cargoHash`
extraArgs = [ "--version=skip" ];
})
];
};
meta = {
description = "Ruby implementation written in Rust and Ruby";
homepage = "https://www.artichokeruby.org/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
kachick
];
mainProgram = "artichoke";
platforms = with lib.platforms; unix ++ windows;
};
}
+56
View File
@@ -0,0 +1,56 @@
{
boring,
buildGoModule,
fetchFromGitHub,
installShellFiles,
lib,
stdenv,
testers,
}:
buildGoModule (finalAttrs: {
pname = "boring";
version = "0.11.4";
src = fetchFromGitHub {
owner = "alebeck";
repo = "boring";
tag = finalAttrs.version;
hash = "sha256-N0GVXtw6Gp6iHKBD2Lk6FX8XaUnkPgZduPaczYdApAs=";
};
nativeBuildInputs = [
installShellFiles
];
vendorHash = "sha256-j8A0F+o3EnzJdge+T/gHAwRGwzC86oD6ddZejUs/C7o=";
ldflags = [
"-s"
"-w"
"-X main.version=${finalAttrs.version}"
];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd boring \
--bash <($out/bin/boring --shell bash) \
--fish <($out/bin/boring --shell fish) \
--zsh <($out/bin/boring --shell zsh)
'';
passthru.tests.version = testers.testVersion {
package = boring;
command = "boring version";
version = "boring ${finalAttrs.version}";
};
meta = {
description = "SSH tunnel manager";
homepage = "https://github.com/alebeck/boring";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
jacobkoziej
];
mainProgram = "boring";
};
})
+3 -1
View File
@@ -205,7 +205,8 @@ stdenv.mkDerivation {
# Fix path to bash in $BINARYWRAPPER
substituteInPlace $BINARYWRAPPER \
--replace /bin/bash ${stdenv.shell}
--replace /bin/bash ${stdenv.shell} \
--replace-fail 'CHROME_WRAPPER' 'WRAPPER'
ln -sf $BINARYWRAPPER $out/bin/brave
@@ -263,6 +264,7 @@ stdenv.mkDerivation {
coreutils
]
}
--set CHROME_WRAPPER ${pname}
${optionalString (enableFeatures != [ ]) ''
--add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+,WaylandWindowDecorations --enable-wayland-ime=true}}"
''}
+7 -7
View File
@@ -12,20 +12,20 @@
}:
let
pname = "dependabot-cli";
version = "1.65.0";
version = "1.66.0";
# `tag` is what `dependabot` uses to find the relevant docker images.
tag = "nixpkgs-dependabot-cli-${version}";
# Get these hashes from
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
updateJobProxy.imageDigest = "sha256:ef245bd38aaa3cf89cafcffe0630d3ad3cff840488a2051a48517454e7f42368";
updateJobProxy.hash = "sha256-yndoGLpyV2MiIs0QXbF/W0xJ6jtmnw/ezL54VM80/CI=";
updateJobProxy.imageDigest = "sha256:0b0d8c67cad11fa0885fcc3fe0add06638c29c19f05a83f80077d5dbb70c2037";
updateJobProxy.hash = "sha256-7O/1NYdhtmO+MAwfu8BSaJQ1RVkXrFPBpfRy0N7p1lQ=";
# Get these hashes from
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
updaterGitHubActions.imageDigest = "sha256:adeaa00b4ae49e942adccec76d4487a393eebd0dec27cd75a3cdf6cc46d801d7";
updaterGitHubActions.hash = "sha256-ni9rSEpeo0gIdYy2CIIpnIWg0kttoTnvRwbZ71QwmIg=";
updaterGitHubActions.imageDigest = "sha256:11de6594db1c23e7ed4a6b621e8584b4a3b34484d51f2f8aa850c21fbce9094f";
updaterGitHubActions.hash = "sha256-cImOCW7tggBWEPlmE55b4OFMxf/+VGLoqx0tRualowo=";
in
buildGoModule {
inherit pname version;
@@ -34,10 +34,10 @@ buildGoModule {
owner = "dependabot";
repo = "cli";
rev = "v${version}";
hash = "sha256-A7CPn0YDeyr+d1OUde2TGfSt3eCfrK4k3S7NWsvCGx0=";
hash = "sha256-9VgcQgiNv1v6+jnaWK10yccC1ILSxiIj9ZCIhHY57jk=";
};
vendorHash = "sha256-pnB1SkuEGm0KfkDfjnoff5fZRsAgD5w2H4UwsD3Jlbo=";
vendorHash = "sha256-gENlo1EPzsML+HkDBg4a2VGTUhyKY8AhlpHVszYWBno=";
ldflags = [
"-s"
+2 -2
View File
@@ -13,13 +13,13 @@
buildGoModule rec {
pname = "git-town";
version = "20.2.0";
version = "21.0.0";
src = fetchFromGitHub {
owner = "git-town";
repo = "git-town";
tag = "v${version}";
hash = "sha256-q1wiqE2pd1qLw0nTw3CEpJybGia+KwRacgejofk4kJ8=";
hash = "sha256-Wnp3qkF7e358uGftBy5vi3GandyZsAyxESvgUFB7mmM=";
};
vendorHash = null;
+3 -3
View File
@@ -7,18 +7,18 @@
rustPlatform.buildRustPackage rec {
pname = "harper";
version = "0.40.0";
version = "0.41.0";
src = fetchFromGitHub {
owner = "Automattic";
repo = "harper";
rev = "v${version}";
hash = "sha256-QrIRfAehrKgJwAB3pWfSpIUnIwRLjuuRbTEgUpCe2LM=";
hash = "sha256-o5F9gDeHFq2U9q/kRQVn4otbbQVV4tg6n5Ap7Dwm7oI=";
};
buildAndTestSubdir = "harper-ls";
useFetchCargoVendor = true;
cargoHash = "sha256-hkr7gNRwY+L45Efk6mWPrykj60n3ChryBKRFCC4W1Q0=";
cargoHash = "sha256-KgcsLzFrN+ZDgV6cZmkUv4tUt5ko4+giHq19NjfuF74=";
passthru.updateScript = nix-update-script { };
+15 -10
View File
@@ -5,20 +5,25 @@
mpi,
perl,
autoreconfHook,
pkg-config,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "ior";
version = "3.3.0";
version = "4.0.0";
src = fetchFromGitHub {
owner = "hpc";
repo = "ior";
rev = version;
sha256 = "sha256-pSjptDfiPlaToXe1yHyk9MQMC9PqcVSjqAmWLD11iOM=";
tag = finalAttrs.version;
hash = "sha256-WsfJWHHfkiHZ+rPk6ck6mDErTXwt6Dhgm+yqOtw4Fvo=";
};
nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
mpi
perl
@@ -26,11 +31,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with lib; {
meta = {
homepage = "https://ior.readthedocs.io/en/latest/";
description = "Parallel file system I/O performance test";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ bzizou ];
license = lib.licenses.gpl2Only;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ bzizou ];
};
}
})
+48 -27
View File
@@ -1,42 +1,63 @@
diff --git a/public/utils.js b/public/utils.js
index 3cd38b63..54152694 100644
index c5963e41..30f72965 100644
--- a/public/utils.js
+++ b/public/utils.js
@@ -17,7 +17,7 @@ const osShortName = function () {
@@ -17,7 +17,7 @@ const osShortName = (function () {
export function iconsPath() {
if (!app.isPackaged) {
- return path.join(__dirname, "..", "resources", osShortName, "icons");
+ return path.join(__dirname, "..", "..", "icons");
}
if (!app.isPackaged) {
- return path.join(__dirname, "..", "resources", osShortName, "icons");
+ return path.join(__dirname, "..", "..", "icons");
}
return path.join(process.resourcesPath, "icons");
@@ -25,26 +25,14 @@ export function iconsPath() {
return path.join(process.resourcesPath, "icons");
@@ -25,47 +25,14 @@ export function iconsPath() {
export function publicPath() {
if (!app.isPackaged) {
- return path.join(__dirname, "..", "public");
+ return path.join(__dirname, "..", "..", "public");
}
if (!app.isPackaged) {
- return path.join(__dirname, "..", "public");
+ return path.join(__dirname, "..", "..", "public");
}
return process.resourcesPath;
return process.resourcesPath;
}
export function defaultServerBinary() {
- if (!app.isPackaged) {
- return {
- "mac": path.join(__dirname, "..", "..", "dist", "kopia_darwin_amd64", "kopia"),
- "win": path.join(__dirname, "..", "..", "dist", "kopia_windows_amd64", "kopia.exe"),
- "linux": path.join(__dirname, "..", "..", "dist", "kopia_linux_amd64", "kopia"),
- }[osShortName]
- }
-
- if (!app.isPackaged) {
- return {
- "mac": path.join(process.resourcesPath, "server", "kopia"),
- "win": path.join(process.resourcesPath, "server", "kopia.exe"),
- "linux": path.join(process.resourcesPath, "server", "kopia"),
- }[osShortName]
+ return "KOPIA"
- mac: path.join(
- __dirname,
- "..",
- "..",
- "dist",
- "kopia_darwin_amd64",
- "kopia",
- ),
- win: path.join(
- __dirname,
- "..",
- "..",
- "dist",
- "kopia_windows_amd64",
- "kopia.exe",
- ),
- linux: path.join(
- __dirname,
- "..",
- "..",
- "dist",
- "kopia_linux_amd64",
- "kopia",
- ),
- }[osShortName];
- }
-
- return {
- mac: path.join(process.resourcesPath, "server", "kopia"),
- win: path.join(process.resourcesPath, "server", "kopia.exe"),
- linux: path.join(process.resourcesPath, "server", "kopia"),
- }[osShortName];
+ return "KOPIA";
}
export function selectByOS(x) {
return x[osShortName]
return x[osShortName];
+3 -3
View File
@@ -10,12 +10,12 @@
kopia,
}:
let
version = "0.20.0";
version = "0.20.1";
src = fetchFromGitHub {
owner = "kopia";
repo = "kopia";
tag = "v${version}";
hash = "sha256-AM9Mpy+9ZCvEtFtzYC87vqCNpLxO+yWVd4th9DDQ2QI=";
hash = "sha256-hKtrHv7MQjA/AQ/frjP2tPT6zqVPPGnBxYuhWtUgIl0=";
};
in
buildNpmPackage {
@@ -24,7 +24,7 @@ buildNpmPackage {
sourceRoot = "${src.name}/app";
npmDepsHash = "sha256-FXPfZnqpuI6NgHk81HEJ7Hj8xCpXD0BKJgFeQ/Oce04=";
npmDepsHash = "sha256-5gXM5aLsUsJhxbt6IKY4Sg4SBI9ATe248K1TyZThg/0=";
makeCacheWritable = true;
nativeBuildInputs = [
@@ -1,13 +0,0 @@
diff --git a/vcpkg.json b/vcpkg.json
index 5a824884b2..e4193aa45f 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -199,7 +199,7 @@
},
{
"name": "skia",
- "version": "134#2"
+ "version": "129#0"
},
{
"name": "sqlite3",
+4 -11
View File
@@ -38,22 +38,15 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "ladybird";
version = "0-unstable-2025-05-24";
version = "0-unstable-2025-06-03";
src = fetchFromGitHub {
owner = "LadybirdWebBrowser";
repo = "ladybird";
rev = "fbd1f771613fc6f13fcc20dcad04c7065633a2c2";
hash = "sha256-Gtfnq46JrzfpcapMr6Ez+5BNQ59H/Djsgp7n6QvMSUM=";
rev = "4c54a28c45be4e8185158d40a37e083e038a6465";
hash = "sha256-YHWkG2RJk6NaouRvis2L+njtYWKB7T569y1Tq+mYdz0=";
};
patches = [
# Revert https://github.com/LadybirdBrowser/ladybird/commit/51d189198d3fc61141fc367dc315c7f50492a57e
# This commit doesn't update the skia used by ladybird vcpkg, but it does update the skia that
# that cmake wants.
./001-revert-fake-skia-update.patch
];
postPatch = ''
sed -i '/iconutil/d' UI/CMakeLists.txt
@@ -146,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
# ld: [...]/OESVertexArrayObject.cpp.o: undefined reference to symbol 'glIsVertexArrayOES'
# ld: [...]/libGL.so.1: error adding symbols: DSO missing from command line
# https://github.com/LadybirdBrowser/ladybird/issues/371#issuecomment-2616415434
env.NIX_LDFLAGS = "-lGL";
env.NIX_LDFLAGS = "-lGL -lfontconfig";
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications $out/bin
-33
View File
@@ -1,33 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
autoreconfHook,
pkg-config,
}:
stdenv.mkDerivation rec {
pname = "libast";
version = "0.8";
src = fetchFromGitHub {
owner = "mej";
repo = "libast";
rev = version;
hash = "sha256-rnqToFi+d6D6O+JDHQxkVjTc/0RBag6Jqv4uDcE4PNc=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
];
meta = with lib; {
inherit (src.meta) homepage;
description = "Library of Assorted Spiffy Things";
mainProgram = "libast-config";
license = licenses.bsd2;
maintainers = [ ];
platforms = platforms.unix;
};
}
-39
View File
@@ -1,39 +0,0 @@
{
lib,
stdenv,
fetchurl,
libdvdread,
}:
stdenv.mkDerivation rec {
pname = "lxdvdrip";
version = "1.77";
src = fetchurl {
url = "mirror://sourceforge/lxdvdrip/lxdvdrip-${version}.tgz";
hash = "sha256-OzHrscftsCmJvSw7bb/Z2WDP322VCuQDY58dW2OqxB8=";
};
postPatch = ''
sed -i -e s,/usr/local,$out, -e s,/etc,$out/etc,g Makefile
sed -i -e s,/usr/local,$out, mbuffer/Makefile
'';
makeFlags = [
"PREFIX=${placeholder "out"}"
];
preInstall = ''
mkdir -p $out/man/man1 $out/bin $out/share $out/etc
'';
buildInputs = [ libdvdread ];
meta = {
broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
description = "Command line tool to make a copy from a video DVD for private use";
homepage = "https://sourceforge.net/projects/lxdvdrip";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}
+9 -16
View File
@@ -7,35 +7,28 @@
pkg-config,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "multimarkdown";
version = "6.6.0";
version = "6.7.0";
src = fetchFromGitHub {
owner = "fletcher";
repo = "MultiMarkdown-6";
rev = version;
hash = "sha256-emJbY0wucoc/GdjlILoeqjwuwuPpTjXTqZN0gUKOyLg=";
tag = finalAttrs.version;
hash = "sha256-b6yCn0NFpONI7WwfjDOc0d2nCKMIiUXi+rsnytiNc0Q=";
};
postPatch = ''
patchShebangs tools/enumsToPerl.pl
'';
postInstall = ''
# Move files from $out/ to sub directories to prevent conflicts
# with other packages:
mkdir -p $out/share/doc/multimarkdown/
mv $out/LICENSE.txt $out/README.txt $out/share/doc/multimarkdown/
'';
nativeBuildInputs = [
cmake
perl
pkg-config
];
meta = with lib; {
meta = {
homepage = "https://fletcher.github.io/MultiMarkdown-6/introduction.html";
description = "Derivative of Markdown that adds new syntax features";
longDescription = ''
@@ -59,8 +52,8 @@ stdenv.mkDerivation rec {
- glossary entries (LaTeX only)
- document metadata (e.g. title, author, date, etc.)
'';
license = with licenses; [ mit ];
platforms = platforms.all;
maintainers = with maintainers; [ ];
license = with lib.licenses; [ mit ];
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ ];
};
}
})
+3 -3
View File
@@ -24,7 +24,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "neuron";
version = "8.2.6";
version = "8.2.7";
# format is for pythonModule conversion
format = "other";
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
python3.pkgs.mpi4py
]
++ optionals useRx3d [
python3.pkgs.cython_0 # NOTE: cython<3 is required as of 8.2.6
python3.pkgs.cython_0 # NOTE: cython<3 is required as of 8.2.7
python3.pkgs.numpy
];
@@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
repo = "nrn";
rev = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-xASBpsF8rIzrb5G+4Qi6rvWC2wqL7nAGlSeMsBAI6WM=";
hash = "sha256-dmpx0Wud0IhdFvvTJuW/w1Uq6vFYaNal9n27LAqV1Qc=";
};
meta = with lib; {
+9
View File
@@ -3,6 +3,7 @@
dbus,
eudev,
fetchFromGitHub,
installShellFiles,
libdisplay-info,
libglvnd,
libinput,
@@ -15,6 +16,7 @@
pkg-config,
rustPlatform,
seatd,
stdenv,
systemd,
wayland,
withDbus ? true,
@@ -46,6 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
strictDeps = true;
nativeBuildInputs = [
installShellFiles
pkg-config
rustPlatform.bindgenHook
];
@@ -88,6 +91,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
''
+ lib.optionalString withDinit ''
install -Dm0644 resources/dinit/niri{-shutdown,} -t $out/lib/dinit.d/user
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd $pname \
--bash <($out/bin/niri completions bash) \
--fish <($out/bin/niri completions fish) \
--zsh <($out/bin/niri completions zsh)
'';
env = {
@@ -1,22 +0,0 @@
commit 61865b5b5ad715e2b812087947281f0add9aa05e
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: 2024-11-19 14:38:38 +0100
cob: fix documentation
`no_run` will compile but not run the code. Use `ignore` instead, and also added
`rust` for syntax highlighting.
diff --git a/radicle-cob/src/backend/git/stable.rs b/radicle-cob/src/backend/git/stable.rs
index 0d8ea27b..ef18ae55 100644
--- a/radicle-cob/src/backend/git/stable.rs
+++ b/radicle-cob/src/backend/git/stable.rs
@@ -53,7 +53,7 @@ pub fn read_timestamp() -> i64 {
///
/// # Usage
///
-/// ```no_run
+/// ```rust, ignore
/// let oid1 = with_advanced_timestamp(|| cob.update("New revision OID"));
/// let oid2 = with_advanced_timestamp(|| cob.update("Another revision OID"));
/// ```
+15 -8
View File
@@ -19,20 +19,22 @@
}:
rustPlatform.buildRustPackage rec {
pname = "radicle-node";
version = "1.1.0";
version = "1.2.0";
env.RADICLE_VERSION = version;
src = fetchgit {
url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git";
rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}";
hash = "sha256-M4oz9tWjI/eqV4Gz1b512MEmvsZ5u3R9y6P9VeeH9CA=";
rev = "refs/namespaces/z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM/refs/tags/v${version}";
hash = "sha256-AWgLhL6GslE3r2FcZu2imV5ZtEKlUD+a4C5waRGO2lM=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse HEAD > $out/.git_head
git -C $out log -1 --pretty=%ct HEAD > $out/.git_time
rm -rf $out/.git
'';
};
useFetchCargoVendor = true;
cargoHash = "sha256-SzwBQxTqQafHDtH8+OWkAMDnKh3AH0PeSMBWpHprQWM=";
patches = [
./61865b5b5ad715e2b812087947281f0add9aa05e.patch
];
cargoHash = "sha256-/6VlRwWtJfHf6tXD2HJUTbThwTYeZFTJqtaxclrm3+c=";
nativeBuildInputs = [
asciidoctor
@@ -41,6 +43,11 @@ rustPlatform.buildRustPackage rec {
];
nativeCheckInputs = [ git ];
preBuild = ''
export GIT_HEAD=$(<$src/.git_head)
export SOURCE_DATE_EPOCH=$(<$src/.git_time)
'';
# tests regularly time out on aarch64
doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86;
+4 -2
View File
@@ -16,7 +16,7 @@
stdenv,
}:
let
version = "2.51.1534";
version = "2.52.1538";
urlVersion = builtins.replaceStrings [ "." ] [ "0" ] version;
in
stdenv.mkDerivation {
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
hash = "sha256-x9zbWJ4lrqfC1CPquGsdgzhO3WBzd46dlZy6APqJbcg=";
hash = "sha256-pWg1Cp8aNdR/hoVZDF3kUznJtYsjJYX9J4g1xbmn/lg=";
};
dontConfigure = true;
@@ -104,6 +104,7 @@ stdenv.mkDerivation {
runHook postInstall
'';
passthru.updateScript = ./update.py;
meta = with lib; {
description = "Music player for music lovers";
changelog = "https://community.roonlabs.com/c/roon/software-release-notes/18";
@@ -113,6 +114,7 @@ stdenv.mkDerivation {
maintainers = with maintainers; [
lovesegfault
steell
ramblurr
];
platforms = [ "x86_64-linux" ];
mainProgram = "RoonServer";
+131
View File
@@ -0,0 +1,131 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i python3 -p python3 curl common-updater-scripts nix coreutils
"""
Updater script for the roon-server package.
"""
import subprocess
import urllib.request
import re
import sys
import os
def get_current_version():
"""Get the current version of roon-server from the package.nix file."""
result = subprocess.run(
[
"nix-instantiate",
"--eval",
"-E",
"with import ./. {}; roon-server.version or (lib.getVersion roon-server)",
],
capture_output=True,
text=True,
)
result.check_returncode()
return result.stdout.strip().strip('"')
def get_latest_version_info():
"""Get the latest version information from the Roon Labs API."""
url = "https://updates.roonlabs.net/update/?v=2&platform=linux&version=&product=RoonServer&branding=roon&branch=production&curbranch=production"
with urllib.request.urlopen(url) as response:
content = response.read().decode("utf-8")
# Parse the response
info = {}
for line in content.splitlines():
if "=" in line:
key, value = line.split("=", 1)
info[key] = value
return info
def parse_version(display_version):
"""Parse the display version string to get the version in the format used in the package.nix file."""
# Example: "2.47 (build 1510) production" -> "2.47.1510"
match = re.search(r"(\d+\.\d+)\s+\(build\s+(\d+)\)", display_version)
if match:
return f"{match.group(1)}.{match.group(2)}"
return None
def get_hash(url):
"""Calculate the hash of the package."""
result = subprocess.run(
["nix-prefetch-url", "--type", "sha256", url], capture_output=True, text=True
)
result.check_returncode()
pkg_hash = result.stdout.strip()
result = subprocess.run(
["nix", "hash", "to-sri", f"sha256:{pkg_hash}"], capture_output=True, text=True
)
result.check_returncode()
return result.stdout.strip()
def update_package(new_version, hash_value):
"""Update the package.nix file with the new version and hash."""
subprocess.run(
[
"update-source-version",
"roon-server",
new_version,
hash_value,
"--ignore-same-version",
],
check=True,
)
def main():
current_version = get_current_version()
print(f"Current roon-server version: {current_version}")
try:
latest_info = get_latest_version_info()
display_version = latest_info.get("displayversion", "")
download_url = latest_info.get("updateurl", "")
if not display_version or not download_url:
print("Error: Failed to get version information from Roon Labs API")
sys.exit(1)
print(f"Latest version from API: {display_version}")
print(f"Download URL: {download_url}")
new_version = parse_version(display_version)
if not new_version:
print(
f"Error: Failed to parse version from display version: {display_version}"
)
sys.exit(1)
print(f"Parsed version: {new_version}")
if new_version == current_version:
print("roon-server is already up to date!")
return
print(f"Calculating hash for new version {new_version}...")
hash_value = get_hash(download_url)
print(
f"Updating package.nix with new version {new_version} and hash {hash_value}"
)
update_package(new_version, hash_value)
print(f"Successfully updated roon-server to version {new_version}")
except Exception as e:
print(f"Error: {e}")
sys.exit(1)
if __name__ == "__main__":
main()
+2 -2
View File
@@ -5,13 +5,13 @@
}:
buildGoModule rec {
pname = "sesh";
version = "2.13.0";
version = "2.14.0";
src = fetchFromGitHub {
owner = "joshmedeski";
repo = "sesh";
rev = "v${version}";
hash = "sha256-YFvUYacuvyzNXwY+y9kI4tPlrlojDuZpR7VaTGdVqb8=";
hash = "sha256-Dla43xI6y7J9M18IloSm1uDeHAhfslU56Z0Q3nVzjIk=";
};
vendorHash = "sha256-3wNp1meUoUFPa2CEgKjuWcu4I6sxta3FPFvCb9QMQhQ=";
@@ -0,0 +1,64 @@
{
lib,
fetchFromGitHub,
rustPlatform,
_experimental-update-script-combinators,
unstableGitUpdater,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "shaperglot-cli";
version = "0-unstable-2025-05-27";
src = fetchFromGitHub {
owner = "googlefonts";
repo = "shaperglot";
rev = "0d934110dfdf315761255e34040f207f7d7868b5";
hash = "sha256-5Bgvx4Yv74nQLd037L5uBj6oySqqp947LI/6yGwYSKY=";
};
cargoHash = "sha256-UMPoPNpyM/+1rq4U6xQ1DF4W+51p5YjQXr/8zLiPvEI=";
cargoBuildFlags = [
"--package=shaperglot-cli"
];
cargoTestFlags = [
"--package=shaperglot-cli"
];
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
describe_output="$("$out/bin/shaperglot" describe English)"
[[ "$describe_output" == *'support'* ]]
runHook postInstallCheck
'';
passthru = {
updateScript = _experimental-update-script-combinators.sequence [
(unstableGitUpdater {
branch = "main";
# Git tag differs from CLI version: https://github.com/googlefonts/shaperglot/issues/138
hardcodeZeroVersion = true;
})
(nix-update-script {
# Updating `cargoHash`
extraArgs = [ "--version=skip" ];
})
];
};
meta = {
description = "Test font files for language support";
homepage = "https://github.com/googlefonts/shaperglot";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
kachick
];
mainProgram = "shaperglot";
};
})
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "storj-uplink";
version = "1.128.4";
version = "1.130.6";
src = fetchFromGitHub {
owner = "storj";
repo = "storj";
rev = "v${version}";
hash = "sha256-7CH//aZ7DOXIP6A1gAZpiFO55LrLtBhvtZl/tVhYl8g=";
hash = "sha256-5IFMIiDP+HmR/yc7OQjs23lO5Cw12lZBsD8oIo2CaLE=";
};
subPackages = [ "cmd/uplink" ];
vendorHash = "sha256-CTcFTEKj5s43OlrIC7lOh3Lh/6k8/Igckv0zwrdGKbE=";
vendorHash = "sha256-PnRnnl3uFs889eYQbD+oNvDtJgNepNIJ90KTjnGthI8=";
ldflags = [
"-s"
+2 -17
View File
@@ -1,6 +1,5 @@
{
curl,
esbuild,
fetchFromGitHub,
git,
jq,
@@ -15,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vencord";
version = "1.12.2";
version = "1.12.3";
src = fetchFromGitHub {
owner = "Vendicated";
repo = "Vencord";
rev = "v${finalAttrs.version}";
hash = "sha256-a4lbeuXEHDMDko8wte7jUdJ0yUcjfq3UPQAuSiz1UQU=";
hash = "sha256-fOZXgyA61G+D7otNNO8d89ghR/GiYPJ7vSZtj9TeGuU=";
};
pnpmDeps = pnpm_10.fetchDeps {
@@ -36,20 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
];
env = {
ESBUILD_BINARY_PATH = lib.getExe (
esbuild.overrideAttrs (
final: _: {
version = "0.25.1";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${final.version}";
hash = "sha256-vrhtdrvrcC3dQoJM6hWq6wrGJLSiVww/CNPlL1N5kQ8=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
}
)
);
VENCORD_REMOTE = "${finalAttrs.src.owner}/${finalAttrs.src.repo}";
VENCORD_HASH = "${finalAttrs.version}";
};
@@ -1,73 +1,73 @@
{
"version": "3.32.0",
"engineVersion": "18818009497c581ede5d8a3b8b833b81d00cebb7",
"version": "3.32.2",
"engineVersion": "109150893958777c8f2215f6cfd3e89e984e8dea",
"engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
"engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
"channel": "stable",
"engineHashes": {
"aarch64-linux": {
"aarch64-linux": "sha256-zGlgnVbNPZ9OX5VFxaajc8xqPKftzZMkyem2NLk8EH8=",
"x86_64-linux": "sha256-zGlgnVbNPZ9OX5VFxaajc8xqPKftzZMkyem2NLk8EH8="
"aarch64-linux": "sha256-l/7p9fPVPIx/CqT4xTUPQLlBU18aZSlimamELMgkAjY=",
"x86_64-linux": "sha256-l/7p9fPVPIx/CqT4xTUPQLlBU18aZSlimamELMgkAjY="
},
"x86_64-linux": {
"aarch64-linux": "sha256-TWwsPtAnkQzsvNLUd5Q3G80ALeh7nM/XV4M6rfBvUGY=",
"x86_64-linux": "sha256-TWwsPtAnkQzsvNLUd5Q3G80ALeh7nM/XV4M6rfBvUGY="
"aarch64-linux": "sha256-6shoelu1oOcTbzXlFcAOsVMF3b/3RZ2vHuMEXvKyzbo=",
"x86_64-linux": "sha256-6shoelu1oOcTbzXlFcAOsVMF3b/3RZ2vHuMEXvKyzbo="
}
},
"dartVersion": "3.8.0",
"dartVersion": "3.8.1",
"dartHash": {
"x86_64-linux": "sha256-/b6dNwqeMymHKI4cz2ggfVtcHWtdsrlVyEZ1Z2G0RKw=",
"aarch64-linux": "sha256-tXIeGM7n1lx9GOwOMEFapiW0sHBlhupx5NCAtFd73Pk=",
"x86_64-darwin": "sha256-wD9Z3J29N4ecWKmCetj5GnbTQ8LiJ1tZFEbPuG6ny5w=",
"aarch64-darwin": "sha256-IIFn6OTpTH8LzwZzF7V8yUrhHkjavMUWX7n62YEMABk="
"x86_64-linux": "sha256-3eE40VMwrPFD502lIaz+CkD7mBnSI/WqJ3C4DVQ01Z4=",
"aarch64-linux": "sha256-0GXCO00ar5532h+cXBEIe8BhGVKOuGuoPzr1M00muh4=",
"x86_64-darwin": "sha256-S3iGDVLollApke2SnXAcV919qsDTVmz5Gf9fTletr00=",
"aarch64-darwin": "sha256-haHQks9N1mBIqRsYg9sOLw7ra7gC708gsTWfKxvIK1c="
},
"flutterHash": "sha256-Wk84RfnPvPVVnnbwGcnHIcRnu3Kizo2AkRQbVSEw+1M=",
"flutterHash": "sha256-bL+WRW9tOLEXeAwZKgwN4y8Vj6s6FOCUm3JJilLCkY8=",
"artifactHashes": {
"android": {
"aarch64-darwin": "sha256-+YUzIG/qUFb4X2ftR6Gf0h1mt/5Dy59B7QD09X1XVYY=",
"aarch64-linux": "sha256-lZIo8AGzrXant29kfiOKlfQ0SJAPXpsdZCaKfqxn0zA=",
"x86_64-darwin": "sha256-+YUzIG/qUFb4X2ftR6Gf0h1mt/5Dy59B7QD09X1XVYY=",
"x86_64-linux": "sha256-lZIo8AGzrXant29kfiOKlfQ0SJAPXpsdZCaKfqxn0zA="
"aarch64-darwin": "sha256-VW1JzE6NfpGk2WFyPnvgkhlc+/dgkVtfPJ3HLF2SxjM=",
"aarch64-linux": "sha256-aNZyIBedC35v2/lePY1UcJYP3Wh0JccPrsABHlhdoOI=",
"x86_64-darwin": "sha256-VW1JzE6NfpGk2WFyPnvgkhlc+/dgkVtfPJ3HLF2SxjM=",
"x86_64-linux": "sha256-aNZyIBedC35v2/lePY1UcJYP3Wh0JccPrsABHlhdoOI="
},
"fuchsia": {
"aarch64-darwin": "sha256-F4uNyPIt6FSVCSOjR6mtgHHMMcJd3pAdT4uEiBJSASk=",
"aarch64-linux": "sha256-F4uNyPIt6FSVCSOjR6mtgHHMMcJd3pAdT4uEiBJSASk=",
"x86_64-darwin": "sha256-F4uNyPIt6FSVCSOjR6mtgHHMMcJd3pAdT4uEiBJSASk=",
"x86_64-linux": "sha256-F4uNyPIt6FSVCSOjR6mtgHHMMcJd3pAdT4uEiBJSASk="
"aarch64-darwin": "sha256-8Jo1dP2uugp75BjQvvgvxnCJI0oyLlClJ2YaaiSkJzs=",
"aarch64-linux": "sha256-8Jo1dP2uugp75BjQvvgvxnCJI0oyLlClJ2YaaiSkJzs=",
"x86_64-darwin": "sha256-8Jo1dP2uugp75BjQvvgvxnCJI0oyLlClJ2YaaiSkJzs=",
"x86_64-linux": "sha256-8Jo1dP2uugp75BjQvvgvxnCJI0oyLlClJ2YaaiSkJzs="
},
"ios": {
"aarch64-darwin": "sha256-HlGXG7hyi4oCdN4bGP6GYa++rTruZC7v+laR4733xS4=",
"aarch64-linux": "sha256-HlGXG7hyi4oCdN4bGP6GYa++rTruZC7v+laR4733xS4=",
"x86_64-darwin": "sha256-HlGXG7hyi4oCdN4bGP6GYa++rTruZC7v+laR4733xS4=",
"x86_64-linux": "sha256-HlGXG7hyi4oCdN4bGP6GYa++rTruZC7v+laR4733xS4="
"aarch64-darwin": "sha256-75DZ9m1yxybk/xP2UMDr/thBtP2q3iOHPakxxHRbIWs=",
"aarch64-linux": "sha256-75DZ9m1yxybk/xP2UMDr/thBtP2q3iOHPakxxHRbIWs=",
"x86_64-darwin": "sha256-75DZ9m1yxybk/xP2UMDr/thBtP2q3iOHPakxxHRbIWs=",
"x86_64-linux": "sha256-75DZ9m1yxybk/xP2UMDr/thBtP2q3iOHPakxxHRbIWs="
},
"linux": {
"aarch64-darwin": "sha256-y/xxUQK/9GeXjMTUPZSGhfP83rJzCm1Pd2PMjnAHdnk=",
"aarch64-linux": "sha256-y/xxUQK/9GeXjMTUPZSGhfP83rJzCm1Pd2PMjnAHdnk=",
"x86_64-darwin": "sha256-P5UQiY4QHLJQMmTpTfTFfh6QrqelhWyaGpSXNtM8vJE=",
"x86_64-linux": "sha256-P5UQiY4QHLJQMmTpTfTFfh6QrqelhWyaGpSXNtM8vJE="
"aarch64-darwin": "sha256-7gGCUYERyMdga0bgxWo2ZCn9yUwIKKBOuzXvNfWS6Bw=",
"aarch64-linux": "sha256-7gGCUYERyMdga0bgxWo2ZCn9yUwIKKBOuzXvNfWS6Bw=",
"x86_64-darwin": "sha256-VlkWtHFJc8AbzvQbEL8IzXNpkrz4hIR7yK+gRHH1Qtc=",
"x86_64-linux": "sha256-VlkWtHFJc8AbzvQbEL8IzXNpkrz4hIR7yK+gRHH1Qtc="
},
"macos": {
"aarch64-darwin": "sha256-FkvjRiKWa/FUITdwK1ldLCcsfjs8nrH7L0mXGHnVIko=",
"aarch64-linux": "sha256-FkvjRiKWa/FUITdwK1ldLCcsfjs8nrH7L0mXGHnVIko=",
"x86_64-darwin": "sha256-FkvjRiKWa/FUITdwK1ldLCcsfjs8nrH7L0mXGHnVIko=",
"x86_64-linux": "sha256-FkvjRiKWa/FUITdwK1ldLCcsfjs8nrH7L0mXGHnVIko="
"aarch64-darwin": "sha256-fonn1C8JJ/Dpid6eyzqgTw5jm4dgdt1KF+sd0d5wRNc=",
"aarch64-linux": "sha256-fonn1C8JJ/Dpid6eyzqgTw5jm4dgdt1KF+sd0d5wRNc=",
"x86_64-darwin": "sha256-fonn1C8JJ/Dpid6eyzqgTw5jm4dgdt1KF+sd0d5wRNc=",
"x86_64-linux": "sha256-fonn1C8JJ/Dpid6eyzqgTw5jm4dgdt1KF+sd0d5wRNc="
},
"universal": {
"aarch64-darwin": "sha256-bt/UiY3t1wZUnpMo1uVQPdlG/7X+OrAOZRXIaXKH3Ls=",
"aarch64-linux": "sha256-NShVNyK6Cx5bddhv6hg3rM+QPczrm2MmHCgb14h78SA=",
"x86_64-darwin": "sha256-zXSufTmlyaHM0fJinirUfB3XjD3dzKFD6iyhUADsyQY=",
"x86_64-linux": "sha256-MQw71FYYuLKd60cwMddAjVe9vgwx8MR4xVe0Z9J7uAo="
"aarch64-darwin": "sha256-XXktfE+Rx2kj+4PYlWZmfHCRheWDF1K+kCo1McnjZao=",
"aarch64-linux": "sha256-jRJ5OLuoV0b/Rd7SpYmyjCL7ED8iWjawvS8ZMAqVowE=",
"x86_64-darwin": "sha256-lTudK0BzZznIOAc2bTildCLg0ZeLJX19suhG4ZgH1Eo=",
"x86_64-linux": "sha256-M41bQrf1amzW1QGkq37gNgN5zh3v4/+OuBxp4CWUSqI="
},
"web": {
"aarch64-darwin": "sha256-dpMJQsUd98X+tmUnqRZQ1o5g334i7dyxBNvg2znJeaE=",
"aarch64-linux": "sha256-dpMJQsUd98X+tmUnqRZQ1o5g334i7dyxBNvg2znJeaE=",
"x86_64-darwin": "sha256-dpMJQsUd98X+tmUnqRZQ1o5g334i7dyxBNvg2znJeaE=",
"x86_64-linux": "sha256-dpMJQsUd98X+tmUnqRZQ1o5g334i7dyxBNvg2znJeaE="
"aarch64-darwin": "sha256-l6/ZekcmlueBP7DdAuQpjGuYc6MFlMSWW4tnU2PixNU=",
"aarch64-linux": "sha256-l6/ZekcmlueBP7DdAuQpjGuYc6MFlMSWW4tnU2PixNU=",
"x86_64-darwin": "sha256-l6/ZekcmlueBP7DdAuQpjGuYc6MFlMSWW4tnU2PixNU=",
"x86_64-linux": "sha256-l6/ZekcmlueBP7DdAuQpjGuYc6MFlMSWW4tnU2PixNU="
},
"windows": {
"x86_64-darwin": "sha256-3ZfYqlyjBaBaZjxp9k2DCsD4QZL/+fbXfCFxX3i4Q/Q=",
"x86_64-linux": "sha256-3ZfYqlyjBaBaZjxp9k2DCsD4QZL/+fbXfCFxX3i4Q/Q="
"x86_64-darwin": "sha256-zxVV76R80bRqzJaWCBj9RlLkpB4HmX1iTYcdLAbiqT4=",
"x86_64-linux": "sha256-zxVV76R80bRqzJaWCBj9RlLkpB4HmX1iTYcdLAbiqT4="
}
},
"pubspecLock": {
@@ -266,11 +266,11 @@
"dependency": "direct main",
"description": {
"name": "dds",
"sha256": "4e206d308bd94595af42e4a561948ef8dba211c9db47f4360c48a5a1f8b44cb5",
"sha256": "76fc5140ce4e8922711bbe6dfd3713283ecc7f386c52fc7f594cd5f3e6b80633",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.0.0"
"version": "5.0.2"
},
"dds_service_extensions": {
"dependency": "direct main",
@@ -286,11 +286,11 @@
"dependency": "direct main",
"description": {
"name": "devtools_shared",
"sha256": "fa71f07006dfdf3f226ec76db95a4bad156820c081452cc99d18a4f291001bee",
"sha256": "659e2d65aa5ef5c3551163811c5c6fa1b973b3df80d8cac6f618035edcdc1096",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "11.2.0"
"version": "11.2.1"
},
"dtd": {
"dependency": "direct main",
+20
View File
@@ -7,6 +7,8 @@
qtwebsockets,
minizinc,
makeWrapper,
copyDesktopItems,
makeDesktopItem,
}:
let
@@ -31,12 +33,30 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
qmake
makeWrapper
copyDesktopItems
];
buildInputs = [
qtbase
qtwebsockets
];
desktopItems = [
(makeDesktopItem {
name = "minizinc";
desktopName = "MiniZincIDE";
icon = "minizinc";
comment = meta.description;
exec = "MiniZincIDE";
type = "Application";
terminal = false;
categories = [
"Science"
"Development"
"Education"
];
})
];
sourceRoot = "${src.name}/MiniZincIDE";
dontWrapQtApps = true;
+2
View File
@@ -992,6 +992,7 @@ mapAliases {
ledger_agent = ledger-agent; # Added 2024-01-07
lfs = dysk; # Added 2023-07-03
libAfterImage = throw "'libAfterImage' has been removed from nixpkgs, as it's no longer in development for a long time"; # Added 2024-06-01
libast = throw "'libast' has been removed due to lack of maintenance upstream."; # Added 2025-06-09
libav = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25
libav_0_8 = libav; # Added 2024-08-25
libav_11 = libav; # Added 2024-08-25
@@ -1166,6 +1167,7 @@ mapAliases {
lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18
lxd = lib.warnOnInstantiate "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01
lxd-unwrapped = lib.warnOnInstantiate "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01
lxdvdrip = throw "'lxdvdrip' has been removed due to lack of upstream maintenance."; # Added 2025-06-09
lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17
lzwolf = throw "'lzwolf' has been removed because it's no longer maintained upstream. Consider using 'ecwolf'"; # Added 2025-03-02
+1 -1
View File
@@ -166,7 +166,7 @@ mapAliases ({
cryptacular = throw "cryptacular was removed, because it was disabled on all python version since 3.6 and last updated in 2021"; # Added 2024-05-13
cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23
cufflinks = throw "cufflinks has removed, since it is abandoned and broken"; # added 2025-02-16
curve25519-donna = throw "unused leaf package with dead upstream repository and no release in 10 years"; # added 2025-05-21
curve25519-donna = throw "curve25519-donna was removed, since it is abandoned and unmaintained since 2015"; # added 2025-05-21
cx_Freeze = cx-freeze; # added 2023-08-02
cx_oracle = cx-oracle; # added 2024-01-03
d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30