mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
K900
commit
6e8dc58e2d
191 changed files with 1124 additions and 696 deletions
|
|
@ -25070,6 +25070,12 @@
|
|||
github = "stasjok";
|
||||
githubId = 1353637;
|
||||
};
|
||||
staslyakhov = {
|
||||
name = "Stas Lyakhov";
|
||||
email = "nix@lyakhovs.dev";
|
||||
github = "staslyakhov";
|
||||
githubId = 19846456;
|
||||
};
|
||||
staticdev = {
|
||||
email = "staticdev-support@proton.me";
|
||||
github = "staticdev";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ let
|
|||
|
||||
makeColor = i: lib.concatMapStringsSep "," (x: "0x" + lib.substring (2 * i) 2 x);
|
||||
|
||||
isUnicode = lib.hasSuffix "UTF-8" (lib.toUpper config.i18n.defaultLocale);
|
||||
isUnicode = config.i18n.defaultCharset == "UTF-8" || cfg.useXkbConfig;
|
||||
|
||||
optimizedKeymap =
|
||||
pkgs.runCommand "keymap"
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ in
|
|||
a writeable configuration, such as quota tracking, enable
|
||||
this option.
|
||||
'';
|
||||
default = lib.versionOlder config.system.stateVersion "25.11";
|
||||
default = lib.versionOlder config.system.stateVersion "26.05";
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
|
|
|
|||
|
|
@ -291,6 +291,12 @@ def config_entry(levels: int, bootspec: BootSpec, label: str, time: str) -> str:
|
|||
entry += f'comment: {bootspec.label}, built on {time}\n'
|
||||
entry += 'kernel_path: ' + get_kernel_uri(bootspec.kernel) + '\n'
|
||||
entry += 'cmdline: ' + ' '.join(['init=' + bootspec.init] + bootspec.kernelParams).strip() + '\n'
|
||||
|
||||
# Set framebuffer resolution for Linux boot entries if configured
|
||||
resolution = config('resolution')
|
||||
if resolution is not None:
|
||||
entry += f'resolution: {resolution}\n'
|
||||
|
||||
if bootspec.initrd:
|
||||
entry += f'module_path: ' + get_kernel_uri(bootspec.initrd) + '\n'
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ let
|
|||
force = cfg.force;
|
||||
enrollConfig = cfg.enrollConfig;
|
||||
style = cfg.style;
|
||||
resolution = cfg.resolution;
|
||||
maxGenerations = if cfg.maxGenerations == null then 0 else cfg.maxGenerations;
|
||||
hostArchitecture = pkgs.stdenv.hostPlatform.parsed.cpu;
|
||||
timeout = if config.boot.loader.timeout != null then config.boot.loader.timeout else 10;
|
||||
|
|
@ -98,6 +99,27 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
resolution = lib.mkOption {
|
||||
default = null;
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
example = "1920x1080x32";
|
||||
description = ''
|
||||
The framebuffer resolution to set when booting Linux entries.
|
||||
This controls the GOP mode that Limine sets before handing off to the kernel,
|
||||
which affects early boot graphics (e.g., simpledrm, efifb).
|
||||
|
||||
Format: `<width>x<height>` or `<width>x<height>x<bpp>`.
|
||||
If bpp is omitted, defaults to 32.
|
||||
|
||||
Note: Refresh rate is not supported because the UEFI GOP protocol only
|
||||
defines framebuffer dimensions and pixel format, not display timing.
|
||||
Refresh rate is determined later by the GPU driver based on EDID.
|
||||
|
||||
This is distinct from {option}`boot.loader.limine.style.interface.resolution`
|
||||
which only affects the Limine bootloader's own menu interface.
|
||||
'';
|
||||
};
|
||||
|
||||
additionalFiles = lib.mkOption {
|
||||
default = { };
|
||||
type = lib.types.attrsOf lib.types.path;
|
||||
|
|
|
|||
|
|
@ -386,6 +386,7 @@ in
|
|||
collectd = runTest ./collectd.nix;
|
||||
commafeed = runTest ./commafeed.nix;
|
||||
connman = runTest ./connman.nix;
|
||||
console-xkb-and-i18n = runTest ./console-xkb-and-i18n.nix;
|
||||
consul = runTest ./consul.nix;
|
||||
consul-template = runTest ./consul-template.nix;
|
||||
containers-bridge = runTest ./containers-bridge.nix;
|
||||
|
|
|
|||
23
nixos/tests/console-xkb-and-i18n.nix
Normal file
23
nixos/tests/console-xkb-and-i18n.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, ... }:
|
||||
{
|
||||
name = "console-xkb-and-i18n";
|
||||
meta.maintainers = with lib.maintainers; [ doronbehar ];
|
||||
|
||||
nodes = {
|
||||
# Nothing to run on this node. Only verify that this configuration doesn't
|
||||
# produce the bugs described here:
|
||||
#
|
||||
# - https://github.com/NixOS/nixpkgs/issues/445666
|
||||
# - https://github.com/NixOS/nixpkgs/issues/411374
|
||||
#
|
||||
x = {
|
||||
i18n.defaultLocale = "eo";
|
||||
console.useXkbConfig = true;
|
||||
services.xserver.xkb = {
|
||||
layout = "us";
|
||||
variant = "colemak";
|
||||
};
|
||||
};
|
||||
};
|
||||
testScript = { nodes, ... }: "";
|
||||
}
|
||||
|
|
@ -92,11 +92,7 @@ stdenv.mkDerivation rec {
|
|||
# Removing it will force it to use our version.
|
||||
rm $out/libexec/lib/bitwig-studio/libxcb-imdkit.so.1
|
||||
|
||||
substitute usr/share/applications/com.bitwig.BitwigStudio.desktop \
|
||||
$out/share/applications/com.bitwig.BitwigStudio.desktop \
|
||||
--replace-fail "Exec=bitwig-studio" "Exec=$out/bin/bitwig-studio"
|
||||
|
||||
runHook postInstall
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
alsa-lib,
|
||||
bison,
|
||||
flex,
|
||||
libsndfile,
|
||||
which,
|
||||
DarwinTools,
|
||||
xcbuild,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.5.5.5";
|
||||
pname = "chuck";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz";
|
||||
sha256 = "sha256-fxbTW0wcKn1q6psRhhCe6pHFJTPFfZUTCmlGr7gFoRU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flex
|
||||
bison
|
||||
which
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
DarwinTools
|
||||
xcbuild
|
||||
];
|
||||
|
||||
buildInputs = [ libsndfile ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
|
||||
|
||||
makeFlags = [
|
||||
"-C src"
|
||||
"DESTDIR=$(out)/bin"
|
||||
];
|
||||
buildFlags = [ (if stdenv.hostPlatform.isDarwin then "mac" else "linux-alsa") ];
|
||||
|
||||
meta = {
|
||||
description = "Programming language for real-time sound synthesis and music creation";
|
||||
homepage = "http://chuck.cs.princeton.edu";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ ftrvxmtrx ];
|
||||
mainProgram = "chuck";
|
||||
};
|
||||
}
|
||||
|
|
@ -6,14 +6,14 @@
|
|||
}:
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "zig.vim";
|
||||
version = "0-unstable-2025-12-07";
|
||||
version = "0-unstable-2026-01-16";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "ziglang";
|
||||
repo = "zig.vim";
|
||||
rev = "74bdb43c9d5da8d6b715809b79f92ef8f711df8e";
|
||||
hash = "sha256-RmrRgJ6YdExMwmua6nGv6W7DPP98k2URIaJTm+O4uR8=";
|
||||
rev = "fc01f73ce0636723a03b784b63a7a89f2f9a84ae";
|
||||
hash = "sha256-bWvwb6k9jyoAqtp07UfYkyUsGo2N8Yvv7H6zq1eiwP8=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"linux-canary": {
|
||||
"hash": "sha256-jomLXlIr+ajJspmh/seNb48alPSuCw8ybYkfc0uAziE=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.852/discord-canary-0.0.852.tar.gz",
|
||||
"version": "0.0.852"
|
||||
"hash": "sha256-HtcgQS8P5R57qV3pKYyVLcT9FCOtZ6UbFBQWFkvU8B0=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.854/discord-canary-0.0.854.tar.gz",
|
||||
"version": "0.0.854"
|
||||
},
|
||||
"linux-development": {
|
||||
"hash": "sha256-EVkjWoqWl9Z+iHCLPOLu4PIUb2wC3HVcPVjOVz++IVw=",
|
||||
|
|
@ -10,19 +10,19 @@
|
|||
"version": "0.0.94"
|
||||
},
|
||||
"linux-ptb": {
|
||||
"hash": "sha256-szmKLp+aXZjrWClTOQ+NTwenY7b5c3eONFUUmszfUSk=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.172/discord-ptb-0.0.172.tar.gz",
|
||||
"version": "0.0.172"
|
||||
"hash": "sha256-Y+e3HHXE5D9Q9qKE7ipaLijZ+E6yEr9NzEOy5c+Gk54=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.173/discord-ptb-0.0.173.tar.gz",
|
||||
"version": "0.0.173"
|
||||
},
|
||||
"linux-stable": {
|
||||
"hash": "sha256-4rJ0l0zSoOz7L65sy3Gegcsb/nJGGFu6h5TGAb0fqUI=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.120/discord-0.0.120.tar.gz",
|
||||
"version": "0.0.120"
|
||||
"hash": "sha256-WR9xyw3Zn/HAZQlfiKMAXqc2TueF6wCfQzvYtnXd1yM=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.121/discord-0.0.121.tar.gz",
|
||||
"version": "0.0.121"
|
||||
},
|
||||
"osx-canary": {
|
||||
"hash": "sha256-ZzqakVB2Rkcq5zME2WnSCw1CLzpD3VDM/pu4nQ7rRNs=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.956/DiscordCanary.dmg",
|
||||
"version": "0.0.956"
|
||||
"hash": "sha256-q/PAGdlOTdkQudiH/NFXSgwhz2XBL9ZwrhJXiY9Iibc=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.958/DiscordCanary.dmg",
|
||||
"version": "0.0.958"
|
||||
},
|
||||
"osx-development": {
|
||||
"hash": "sha256-B1//zMlTv2+RWHfWZSaaU8ubVOwWob+EYjNdtFRwlgg=",
|
||||
|
|
@ -30,13 +30,13 @@
|
|||
"version": "0.0.107"
|
||||
},
|
||||
"osx-ptb": {
|
||||
"hash": "sha256-tjWbvWOvSinVZDvJYFFcbmr+y7W5PmIr/alrS82ECBo=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.204/DiscordPTB.dmg",
|
||||
"version": "0.0.204"
|
||||
"hash": "sha256-QCzJsb1RH6HORk9hw9F9Xu0rE+NCFYJDTJQO9UrdBxo=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.205/DiscordPTB.dmg",
|
||||
"version": "0.0.205"
|
||||
},
|
||||
"osx-stable": {
|
||||
"hash": "sha256-PkZU/1GxPmfxq2qP/5gGU85EFYPI1V42iHfoy9x9fKI=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.372/Discord.dmg",
|
||||
"version": "0.0.372"
|
||||
"hash": "sha256-/CEN67VbRRwK64Iy7GIhs2XFwHe47njI5X6n45j5Q/E=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.373/Discord.dmg",
|
||||
"version": "0.0.373"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,23 +7,22 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "air-formatter";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "posit-dev";
|
||||
repo = "air";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LNU//dQico54GhZdehynEuukfGuU8rQvfFO4zvRsZL0=";
|
||||
hash = "sha256-+AsKwigWikAv8NOaIYVvrH3Pub7Q9qV5YOp2jYU2GkE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9HRDUTYzKLYuh9KCcnvPXB6gDKcht79TOZZ3ze9+gbg=";
|
||||
cargoHash = "sha256-ndd4ps2X/+a62p3dlv8jxhr2bbBG88rytI1XBVntk+g=";
|
||||
|
||||
useNextest = true;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/air";
|
||||
doInstallCheck = true;
|
||||
|
||||
cargoBuildFlags = [ "-p air" ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
wrapGAppsHook3,
|
||||
cairo,
|
||||
glib,
|
||||
goocanvas3,
|
||||
goocanvas_3,
|
||||
gtk3,
|
||||
gtksourceview3,
|
||||
json-glib,
|
||||
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
cairo
|
||||
glib
|
||||
goocanvas3
|
||||
goocanvas_3
|
||||
pantheon.granite
|
||||
gtk3
|
||||
gtksourceview3
|
||||
|
|
|
|||
|
|
@ -310,13 +310,13 @@ buildPythonPackage rec {
|
|||
# Updates yarn.lock and package.json
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts curl pcre "python3.withPackages (ps: with ps; [ pyyaml ])" yarn2nix
|
||||
#!nix-shell -i bash -p common-updater-scripts curl "python3.withPackages (ps: with ps; [ pyyaml ])" yarn2nix
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# Get new version
|
||||
new_version="$(curl -s https://airflow.apache.org/docs/apache-airflow/stable/release_notes.html |
|
||||
pcregrep -o1 'Airflow ([0-9.]+).' | head -1)"
|
||||
grep -oE 'Airflow [0-9.]+' | head -1 | grep -oE '[0-9.]+')"
|
||||
update-source-version ${pname} "$new_version"
|
||||
|
||||
# Update frontend
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
libuuid,
|
||||
ffmpeg,
|
||||
soundtouch,
|
||||
pcre,
|
||||
portaudio, # given up fighting their portaudio.patch?
|
||||
portmidi,
|
||||
linuxHeaders,
|
||||
|
|
@ -115,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
lv2
|
||||
mpg123
|
||||
opusfile
|
||||
pcre
|
||||
portmidi
|
||||
rapidjson
|
||||
serd
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "awstats";
|
||||
version = "7.9";
|
||||
version = "8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/awstats/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-YVF47TE9NDFfFaUi2xpdEsqcOV43hbsGKAq/+V2aBUY=";
|
||||
sha256 = "sha256-Pvdv+WxTmEd92KERNOJm5TikhwZ/aQajrIo4v9EcEeA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -27,7 +27,10 @@ perlPackages.buildPerlPackage rec {
|
|||
|
||||
propagatedBuildOutputs = [ ]; # otherwise out propagates bin -> cycle
|
||||
|
||||
buildInputs = [ ]; # plugins will need some
|
||||
buildInputs = with perlPackages; [
|
||||
JSONXS
|
||||
TryTiny
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
touch Makefile.PL
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkgs,
|
||||
buildPackages,
|
||||
fixDarwinDylibNames,
|
||||
}:
|
||||
|
|
@ -52,5 +51,28 @@ stdenv.mkDerivation rec {
|
|||
--subst-var-by isTargetDarwin '${toString stdenv.targetPlatform.isDarwin}'
|
||||
'';
|
||||
|
||||
inherit (pkgs.build2) passthru;
|
||||
passthru = {
|
||||
configSharedStatic =
|
||||
enableShared: enableStatic:
|
||||
if enableShared && enableStatic then
|
||||
"both"
|
||||
else if enableShared then
|
||||
"shared"
|
||||
else if enableStatic then
|
||||
"static"
|
||||
else
|
||||
throw "neither shared nor static libraries requested";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.build2.org/";
|
||||
description = "Bootstrap for the 'build2' package, you most likely want to use that one";
|
||||
license = lib.licenses.mit;
|
||||
changelog = "https://git.build2.org/cgit/build2/tree/NEWS";
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
hiro98
|
||||
r-burns
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
build2,
|
||||
# Break cycle by using self-contained toolchain for bootstrapping
|
||||
build2-bootstrap,
|
||||
fetchurl,
|
||||
fixDarwinDylibNames,
|
||||
libbutl,
|
||||
|
|
@ -11,18 +12,9 @@
|
|||
enableStatic ? !enableShared,
|
||||
}:
|
||||
let
|
||||
configSharedStatic =
|
||||
enableShared: enableStatic:
|
||||
if enableShared && enableStatic then
|
||||
"both"
|
||||
else if enableShared then
|
||||
"shared"
|
||||
else if enableStatic then
|
||||
"static"
|
||||
else
|
||||
throw "neither shared nor static libraries requested";
|
||||
inherit (build2-bootstrap.passthru) configSharedStatic;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "build2";
|
||||
version = "0.17.0";
|
||||
|
||||
|
|
@ -33,26 +25,25 @@ stdenv.mkDerivation rec {
|
|||
"man"
|
||||
];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
setupHook = build2-bootstrap.setupHook;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pkg.cppget.org/1/alpha/build2/build2-${version}.tar.gz";
|
||||
url = "https://pkg.cppget.org/1/alpha/build2/build2-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-Kx5X/GV3GjFSbjo1mzteiHnnm4mr6+NAKIR/mEE+IdA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove any build/host config entries which refer to nix store paths
|
||||
./remove-config-store-paths.patch
|
||||
# Pick up sysdirs from NIX_LDFLAGS
|
||||
./nix-ldflags-sysdirs.patch
|
||||
];
|
||||
]
|
||||
++ build2-bootstrap.patches;
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
build2
|
||||
build2-bootstrap
|
||||
];
|
||||
disallowedReferences = [
|
||||
build2
|
||||
build2-bootstrap
|
||||
libbutl.dev
|
||||
libpkgconf.dev
|
||||
];
|
||||
|
|
@ -94,14 +85,19 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
passthru = {
|
||||
bootstrap = build2;
|
||||
bootstrap = build2-bootstrap;
|
||||
inherit configSharedStatic;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.build2.org/";
|
||||
inherit (build2-bootstrap.meta)
|
||||
homepage
|
||||
license
|
||||
changelog
|
||||
platforms
|
||||
maintainers
|
||||
;
|
||||
description = "Build2 build system";
|
||||
license = lib.licenses.mit;
|
||||
longDescription = ''
|
||||
build2 is an open source (MIT), cross-platform build toolchain
|
||||
that aims to approximate Rust Cargo's convenience for developing
|
||||
|
|
@ -114,12 +110,6 @@ stdenv.mkDerivation rec {
|
|||
at C/C++ projects as well as mixed-language projects involving
|
||||
one of these languages (see bash and rust modules, for example).
|
||||
'';
|
||||
changelog = "https://git.build2.org/cgit/build2/tree/NEWS";
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
hiro98
|
||||
r-burns
|
||||
];
|
||||
mainProgram = "b";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-codspeed";
|
||||
version = "4.2.1";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CodSpeedHQ";
|
||||
repo = "codspeed-rust";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ljq9d9T3Cx5hDAjP4dbhSnbCYaU1KB42aDhQvRyI7Ws=";
|
||||
hash = "sha256-aOuKz7LEQU9hqJUw0M759A4zk8+9UhiMAnO7OwBc+T0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ryKZyl5CuxFsX1dLadJnCyorssVoD2w5kueKDJP80qU=";
|
||||
cargoHash = "sha256-K1xm8Kw7TMspFmqvW4qRf4QXddarw3eUDTIuwbg1pGA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
curl
|
||||
|
|
|
|||
70
pkgs/by-name/ch/chuck/package.nix
Normal file
70
pkgs/by-name/ch/chuck/package.nix
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
bison,
|
||||
flex,
|
||||
pkg-config,
|
||||
darwin,
|
||||
xcbuild,
|
||||
libsndfile,
|
||||
alsa-lib,
|
||||
libjack2,
|
||||
libpulseaudio,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.5.5.6";
|
||||
pname = "chuck";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ccrma";
|
||||
repo = "chuck";
|
||||
tag = "chuck-${finalAttrs.version}";
|
||||
hash = "sha256-KBmMpycNCjRZJPdRR3HG5nqHQhhVOENciRpiQ7buyok=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
flex
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.DarwinTools
|
||||
xcbuild
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libsndfile
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
alsa-lib
|
||||
libpulseaudio
|
||||
libjack2
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"-C src"
|
||||
"DESTDIR=$(out)/bin"
|
||||
# fix hardcoded gcc
|
||||
"CC=cc"
|
||||
"CXX=c++"
|
||||
];
|
||||
buildFlags = [ (if stdenv.hostPlatform.isDarwin then "mac" else "linux-all") ];
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=chuck-(.*)" ]; };
|
||||
|
||||
meta = {
|
||||
description = "Programming language for real-time sound synthesis and music creation";
|
||||
homepage = "http://chuck.cs.princeton.edu";
|
||||
license = with lib.licenses; [
|
||||
gpl2Plus
|
||||
# or
|
||||
mit
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ ];
|
||||
mainProgram = "chuck";
|
||||
};
|
||||
})
|
||||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "complgen";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adaszko";
|
||||
repo = "complgen";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GUI18RFVIBUu3DA6oVs1BWcsxGzctA68z8PamqJ5aus=";
|
||||
hash = "sha256-fHSDYrfCoLQ4tU1DbrpD3iApufBv5qAGTIFri229pyE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XbrWp1+z7VTD4ggh9+tG3fqXWOD1nYSeNzViHqmOmWg=";
|
||||
cargoHash = "sha256-a6bGE2xxv8IdKlo98X8KNeQl8e//dc9pfaBgGHhx+5M=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/adaszko/complgen/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-applets";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-applets";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-o64sXCWuEIRV1KCRvKeN6iZBZfUyDYtft5yeag4jBNc=";
|
||||
hash = "sha256-+1cqennGetcjJTgVfglq/LJ22goLQmahPCK/atdHxXU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uMMrLd3s0SqYCkSA82wWUxMfiTUzuDdsmyxy/MCYIWY=";
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-applibrary";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-applibrary";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-uQaTSt0sgUQYopEFVmaeDCnejSc1gyGLHeHM2bGzStQ=";
|
||||
hash = "sha256-3vIp+Vs4prsFFiTmjrUXoYqH27y6ccVlUQcP5ICFq3g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-I6C5PrIymU8vZ7LvmnSlFFIp0cvlP1umiFMyrAyYf4A=";
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-bg";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-bg";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-tiqJ0aXXUNyoezXSsHO9klkFZ5PO+gkVv+zXd4/Lq5A=";
|
||||
hash = "sha256-LBIcQG3ZebK1bPVJ8WNHkHMLPsEcw77oZAkQRrd4j6o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-comp";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-comp";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-PBobAoXi3p1xUbs4XmmPkQ93QlMsULEYUoTDqOlJozg=";
|
||||
hash = "sha256-vhWZpn9FPoH+mTKqCf6ug73FdT7Odr6f8pWNNIDKwFs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-A0d00GdspoYI1fUic8TK9UzaQn39wbnvevD8IiPKC7w=";
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-edit";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-edit";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-ZqyaCryXNljJ00qD3ZksfKszANke3HqYgHoGNCHOUqI=";
|
||||
hash = "sha256-4+GfIAsjzo1jr+wa9JjuIUvW3P3r03avP2W5hZJYXHU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ydI/DTbGlgwc9l/XsW1SbTOfSyTdcjM0i0jXLua4+f8=";
|
||||
|
|
|
|||
|
|
@ -12,17 +12,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-files";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-files";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-ZX7eRSrQXgc4oitjugvRicng87zVK41ecSUE80tl0Y0=";
|
||||
hash = "sha256-aHNu6IedGWag6u+uRg2IFfcb8fTu5o4XfGwBXJBOkSM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CGFBvOWu9ZA8kYDYDBVur5uWW8Cs7fT5T96UnKMkvEo=";
|
||||
cargoHash = "sha256-kzyyKzkuCYqEsaaKhAVH31ztbww4k8XZ5HyBQeYO/Nc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-greeter";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-greeter";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-G9ahiwk3/nJEGtlHSaK9dUi4/zGEH90QGKeSdpNQDLU=";
|
||||
hash = "sha256-ivFs/AOUXhzd6I9H+Zw3CS97qFQ/FeiAnlDuzRMneQI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc=";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-icons";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-idle";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-initial-setup";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-initial-setup";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-g1FJiJSyPZTJ1G8cW8A0sxbIUeG3JcjJYo6qHp639d4=";
|
||||
hash = "sha256-xeJfS3vXYCy3R20K5jiyPmgZI+arhkzm3Vz6YQnLe9Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-co7fOPjNLi32XRXKdmCWC+bWhEljsdSc/scasghG4/8=";
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-launcher";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-launcher";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-2LfoqXXYzNpWrnmmwm68IzrG63cX04tMFk0Ly7AJzDs=";
|
||||
hash = "sha256-uKTeNTJtsDx0FS3fmvqMbXPTezMkD1dcn5dPKXvmcp4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bmQ8Ni0sR9gfttsEhh9LNbWmTdOkW/JSMEzOf+kvN98=";
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-notifications";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-notifications";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-lvqqeY/FPv+LFTmZoBUuKWCjAGZozGj/yUCphlFuk/g=";
|
||||
hash = "sha256-BNOerRv9w0Y9Wozoc5IOouMjne7XQN/SItSy2LQrK9w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zyM4iMJs2wPIKIEdji1uJF3WYpPGihFswIK5Wyf6Mns=";
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-osd";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-osd";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-PNFwlxAdbQpFFIe54AEteWG2YRHGRgjDDUpgDwCxXns=";
|
||||
hash = "sha256-6GuLFy1DKXk//LhhRA62KX1P/X+QSsNCy5Eiwjxqk9M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DNQvmE/2swrDybjcQfCAjMRkAttjl+ibbLG0HSlcZwU=";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-panel";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-player";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-player";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-wBR8KvARINQ3XO/gs5POj32cVj5Eoa3IuWyAmxajMmY=";
|
||||
hash = "sha256-F5Phk9JgcSc3Hj+2NxVfqq1Ujz8hv3DVJqAP3aEo2Ic=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Z0+6jtvJ3z/ptcqrbvSuXgjH2liASNJwBIKiHbrVBT8=";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-randr";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-screenshot";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-screenshot";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-lW1nryM/meZjjC9MOH0fimRejdycfq8REwzH1IeV774=";
|
||||
hash = "sha256-xNEICyR/4EYTPTMnlRTag3Ji5rM8HJl6m9MAe7FdHTk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o=";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-session";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-settings-daemon";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-settings";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-settings";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-IYuQlXkdakAbchOH2vje02eWCJMBEp7ONtls4Hm/iCo=";
|
||||
hash = "sha256-/Zzs2b51J0v9PavMr3MuNiFBprb7oJiSC+qDVvMTwEk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XY1ovI73O2jJdx1a5pUk/n6TUazklq7PA+bgva3xslo=";
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-store";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-store";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-na9eRJ9R38wFWOoQSyZj/UlDb5lwvCZrRQ/w/aOqVfY=";
|
||||
hash = "sha256-61O6TY41raQ1+EhCLrCC8Krzt6pWM/BFL61KHkxou2M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VapIpvjtBo+oSUWtilPR0v5crjDVt0OGdHlx73Gb6Jk=";
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-term";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-term";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-SmwXRgYgFelVQhx03GaIRWHCm7x/9eXMdVxH06TLxLE=";
|
||||
hash = "sha256-RYRAJhixba8i8hKpZSZLPLza+V9XZuSaZmWknoIJ3mk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ImWHjEKgu9FQR52A3GjnAkxlPduKuzSUAOANYr0DzMA=";
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-wallpapers";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-workspaces-epoch";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-workspaces-epoch";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-wGhXTQujwOqDBcBesXIRkcTJdQAhs0pavsVHMH98QCw=";
|
||||
hash = "sha256-Gg4ogMf2C3rXf3p/8GPpiZ2aG02KWTtrqby47UW7B3I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZVl09YgeH+V4X3H88rdeiBgua1IpVcfKe0y8A78wzl4=";
|
||||
|
|
|
|||
|
|
@ -59,13 +59,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.57.1";
|
||||
version = "2.58.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-svv6JPRgiXzzjL/CjtEybo0A1B8jr1K0xRO9lCBj1J4=";
|
||||
hash = "sha256-kWMR2qtwgzpYZmbqkpNkII6MuMFb13jkBtI/1pdgSgE=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "framework-tool";
|
||||
version = "0.4.5";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FrameworkComputer";
|
||||
repo = "framework-system";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WhdKU6vyOm5R9RInw9Fj8gELztLn4m5rFGgHbnItguU=";
|
||||
hash = "sha256-wgleuZ0txkmv0+tyr31PiVTNyTSc+OPy/jJwL1Ryyu4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-A7/Q4p26W0AzqlLguL2OJtmm7dAsBU/Yb636ScYXrPs=";
|
||||
cargoHash = "sha256-W+k/PAcdwl9mvajB9D4SUH4o5VqpeD/BnK6ZEJzPpmI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ udev ];
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
gtksourceview3,
|
||||
gspell,
|
||||
libxml2,
|
||||
goocanvas2,
|
||||
goocanvas_2,
|
||||
libplist,
|
||||
glib,
|
||||
gst_all_1,
|
||||
|
|
@ -126,7 +126,7 @@ stdenv.mkDerivation {
|
|||
gspell
|
||||
# webkitgtk_4_0
|
||||
libxml2
|
||||
goocanvas2
|
||||
goocanvas_2
|
||||
libplist
|
||||
ratify
|
||||
chimara
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
goocanvas2,
|
||||
goocanvas_2,
|
||||
gtkmm3,
|
||||
gnome,
|
||||
}:
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkg-config ];
|
||||
propagatedBuildInputs = [
|
||||
gtkmm3
|
||||
goocanvas2
|
||||
goocanvas_2
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -2,27 +2,32 @@
|
|||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "clasp";
|
||||
version = "2.5.0";
|
||||
version = "3.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "clasp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Wt9caSgYNSx6yVUm3eg86GNdrheqHM5IYY8QohclHkQ=";
|
||||
hash = "sha256-Pxt3MaDDsk/qq3NSuwG3jOoPthwrL0QelaruoC37hfA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-iRC2iLNe/4ZP2liUDjIgyMNtlmjcXAGdSmhx3qFBjsA=";
|
||||
patches = [
|
||||
# https://github.com/google/clasp/pull/1112
|
||||
(fetchpatch {
|
||||
url = "https://github.com/google/clasp/commit/b183d4b5fbdb51f7bc2e3edadf5fd3bbff28bad1.patch";
|
||||
hash = "sha256-lnC7DfKsV4E5guxbjZ+WfkLj5wDLYwObPtH21dmFUcc=";
|
||||
})
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-IyFcGcT3ceoaaf2sCPriEIoWPavg+YGsvkxr1MkLj5c=";
|
||||
|
||||
# `npm run build` tries installing clasp globally
|
||||
npmBuildScript = [ "compile" ];
|
||||
# Remove dangling symlink of a dependency
|
||||
postInstall = ''
|
||||
rm $out/lib/node_modules/@google/clasp/node_modules/.bin/sshpk-{verify,sign,conv}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Develop Apps Script Projects locally";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
goocanvas3,
|
||||
goocanvas_3,
|
||||
nix-update-script,
|
||||
gpredict,
|
||||
}:
|
||||
|
||||
(gpredict.override {
|
||||
goocanvas2 = goocanvas3;
|
||||
goocanvas_2 = goocanvas_3;
|
||||
}).overrideAttrs
|
||||
(finalAttrs: {
|
||||
version = "2.2.1-unstable-2025-09-20";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
gtk3,
|
||||
glib,
|
||||
curl,
|
||||
goocanvas2,
|
||||
goocanvas_2,
|
||||
gpsd,
|
||||
hamlib_4,
|
||||
wrapGAppsHook3,
|
||||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
curl
|
||||
glib
|
||||
gtk3
|
||||
goocanvas2
|
||||
goocanvas_2
|
||||
gpsd
|
||||
hamlib_4
|
||||
];
|
||||
|
|
|
|||
9
pkgs/by-name/gt/gtk-sharp-3_0/builder.sh
Normal file
9
pkgs/by-name/gt/gtk-sharp-3_0/builder.sh
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
genericBuild
|
||||
|
||||
# !!! hack
|
||||
export ALL_INPUTS="$out $pkgs"
|
||||
|
||||
find $out -name "*.dll.config" | while read configFile; do
|
||||
echo "modifying config file $configFile"
|
||||
$monoDLLFixer "$configFile"
|
||||
done
|
||||
15
pkgs/by-name/gt/gtk3/hooks/clean-immodules-cache.sh
Normal file
15
pkgs/by-name/gt/gtk3/hooks/clean-immodules-cache.sh
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
# shellcheck shell=bash
|
||||
|
||||
fixupOutputHooks+=(_gtkCleanImmodulesCache)
|
||||
|
||||
# Clean comments that link to generator of the file
|
||||
_gtkCleanImmodulesCache() {
|
||||
# gtk_module_path is where the modules are installed
|
||||
# https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.24/gtk/gtkmodules.c#L68
|
||||
# gtk_binary_version can be retrived with:
|
||||
# pkg-config --variable=gtk_binary_version gtk+-3.0
|
||||
local f="${prefix:?}/lib/@gtk_module_path@/@gtk_binary_version@/immodules.cache"
|
||||
if [ -f "$f" ]; then
|
||||
sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f"
|
||||
fi
|
||||
}
|
||||
19
pkgs/by-name/gt/gtk3/hooks/drop-icon-theme-cache.sh
Normal file
19
pkgs/by-name/gt/gtk3/hooks/drop-icon-theme-cache.sh
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# shellcheck shell=bash
|
||||
|
||||
# Packages often run gtk-update-icon-cache to include their icons in themes’ icon cache.
|
||||
# However, since each package is installed to its own prefix, the files will only collide.
|
||||
dropIconThemeCache() {
|
||||
if [[ -z "${dontDropIconThemeCache:-}" ]]; then
|
||||
local icondir="${out:?}/share/icons"
|
||||
if [[ -d "${icondir}" ]]; then
|
||||
# App icons are supposed to go to hicolor theme, since it is a fallback theme as per [icon-theme-spec], but some might still choose to install stylized icons to other themes.
|
||||
find "${icondir}" -name 'icon-theme.cache' -print0 \
|
||||
| while IFS= read -r -d '' file; do
|
||||
echo "Removing ${file}"
|
||||
rm -f "${file}"
|
||||
done
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
appendToVar preFixupPhases dropIconThemeCache
|
||||
15
pkgs/by-name/gt/gtk4/hooks/clean-immodules-cache.sh
Normal file
15
pkgs/by-name/gt/gtk4/hooks/clean-immodules-cache.sh
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
# shellcheck shell=bash
|
||||
|
||||
fixupOutputHooks+=(_gtkCleanImmodulesCache)
|
||||
|
||||
# Clean comments that link to generator of the file
|
||||
_gtkCleanImmodulesCache() {
|
||||
# gtk_module_path is where the modules are installed
|
||||
# https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.24/gtk/gtkmodules.c#L68
|
||||
# gtk_binary_version can be retrived with:
|
||||
# pkg-config --variable=gtk_binary_version gtk+-3.0
|
||||
local f="${prefix:?}/lib/@gtk_module_path@/@gtk_binary_version@/immodules.cache"
|
||||
if [ -f "$f" ]; then
|
||||
sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f"
|
||||
fi
|
||||
}
|
||||
19
pkgs/by-name/gt/gtk4/hooks/drop-icon-theme-cache.sh
Normal file
19
pkgs/by-name/gt/gtk4/hooks/drop-icon-theme-cache.sh
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# shellcheck shell=bash
|
||||
|
||||
# Packages often run gtk-update-icon-cache to include their icons in themes’ icon cache.
|
||||
# However, since each package is installed to its own prefix, the files will only collide.
|
||||
dropIconThemeCache() {
|
||||
if [[ -z "${dontDropIconThemeCache:-}" ]]; then
|
||||
local icondir="${out:?}/share/icons"
|
||||
if [[ -d "${icondir}" ]]; then
|
||||
# App icons are supposed to go to hicolor theme, since it is a fallback theme as per [icon-theme-spec], but some might still choose to install stylized icons to other themes.
|
||||
find "${icondir}" -name 'icon-theme.cache' -print0 \
|
||||
| while IFS= read -r -d '' file; do
|
||||
echo "Removing ${file}"
|
||||
rm -f "${file}"
|
||||
done
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
appendToVar preFixupPhases dropIconThemeCache
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue