mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-13 21:25:30 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
797a2b9bcc
46 changed files with 823 additions and 672 deletions
|
|
@ -6544,6 +6544,16 @@
|
|||
fingerprint = "6C2B 55D4 4E04 8266 6B7D DA1A 422E 9EDA E015 7170";
|
||||
}];
|
||||
};
|
||||
infinitivewitch = {
|
||||
name = "Infinitive Witch";
|
||||
email = "infinitivewitch@disroot.org";
|
||||
matrix = "@infinitivewitch:fedora.im";
|
||||
github = "infinitivewitch";
|
||||
githubId = 128256833;
|
||||
keys = [{
|
||||
fingerprint = "CF3D F4AD C7BD 1FDB A88B E4B3 CA2D 43DA 939D 94FB";
|
||||
}];
|
||||
};
|
||||
ingenieroariel = {
|
||||
email = "ariel@nunez.co";
|
||||
github = "ingenieroariel";
|
||||
|
|
|
|||
|
|
@ -259,10 +259,10 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
[headscale's example configuration](https://github.com/juanfont/headscale/blob/main/config-example.yaml)
|
||||
can be directly written as attribute-set in Nix within this option.
|
||||
|
||||
- `hardware.video.hidpi` now provides defaults that are consistent with `fontconfig`'s documentation:
|
||||
- antialiasing and font hinting are disabled, as they have no visible effects at high pixel densities;
|
||||
- subpixel order isn't set: it was irrelevant with the above disabled, and the module *cannot* know the correct
|
||||
setting for the user's screen.
|
||||
- The `hardware.video.hidpi.enable` was renamed to `fonts.optimizeForVeryHighDPI` to be consistent with what it actually does.
|
||||
They disable by default: antialiasing, hinting and LCD filter for subpixel rendering. They can be overridden if you experience problems with font rendering.
|
||||
On Xorg, the default cursor is upscaled.
|
||||
Please see the documentation for the new option to decide if you want to keep it enabled.
|
||||
|
||||
- `nixos/lib/make-disk-image.nix` can now mutate EFI variables, run user-provided EFI firmware or variable templates. This is now extensively documented in the NixOS manual.
|
||||
|
||||
|
|
|
|||
|
|
@ -46,13 +46,11 @@ in
|
|||
|
||||
font = mkOption {
|
||||
type = with types; nullOr (either str path);
|
||||
default = "Lat2-Terminus16";
|
||||
default = null;
|
||||
example = "LatArCyrHeb-16";
|
||||
description = mdDoc ''
|
||||
The font used for the virtual consoles. Leave empty to use
|
||||
whatever the {command}`setfont` program considers the
|
||||
default font.
|
||||
Can be either a font name or a path to a PSF font file.
|
||||
The font used for the virtual consoles.
|
||||
Can be `null`, a font name, or a path to a PSF font file.
|
||||
|
||||
Use `null` to let the kernel choose a built-in font.
|
||||
The default is 8x16, and, as of Linux 5.3, Terminus 32 bold for display
|
||||
|
|
|
|||
|
|
@ -3,29 +3,7 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
# A scalable variant of the X11 "core" cursor
|
||||
#
|
||||
# If not running a fancy desktop environment, the cursor is likely set to
|
||||
# the default `cursor.pcf` bitmap font. This is 17px wide, so it's very
|
||||
# small and almost invisible on 4K displays.
|
||||
fontcursormisc_hidpi = pkgs.xorg.fontxfree86type1.overrideAttrs (old:
|
||||
let
|
||||
# The scaling constant is 230/96: the scalable `left_ptr` glyph at
|
||||
# about 23 points is rendered as 17px, on a 96dpi display.
|
||||
# Note: the XLFD font size is in decipoints.
|
||||
size = 2.39583 * config.services.xserver.dpi;
|
||||
sizeString = builtins.head (builtins.split "\\." (toString size));
|
||||
in
|
||||
{
|
||||
postInstall = ''
|
||||
alias='cursor -xfree86-cursor-medium-r-normal--0-${sizeString}-0-0-p-0-adobe-fontspecific'
|
||||
echo "$alias" > $out/lib/X11/fonts/Type1/fonts.alias
|
||||
'';
|
||||
});
|
||||
|
||||
hasHidpi =
|
||||
config.hardware.video.hidpi.enable &&
|
||||
config.services.xserver.dpi != null;
|
||||
cfg = config.fonts;
|
||||
|
||||
defaultFonts =
|
||||
[ pkgs.dejavu_fonts
|
||||
|
|
@ -36,16 +14,12 @@ let
|
|||
pkgs.noto-fonts-emoji
|
||||
];
|
||||
|
||||
defaultXFonts =
|
||||
[ (if hasHidpi then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc)
|
||||
pkgs.xorg.fontmiscmisc
|
||||
];
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
imports = [
|
||||
(mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.")
|
||||
(mkRenamedOptionModule [ "hardware" "video" "hidpi" "enable" ] [ "fonts" "optimizeForVeryHighDPI" ])
|
||||
];
|
||||
|
||||
options = {
|
||||
|
|
@ -69,13 +43,32 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
optimizeForVeryHighDPI = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Optimize configuration for very high-density (>200 DPI) displays:
|
||||
- disable subpixel anti-aliasing
|
||||
- disable hinting
|
||||
- automatically upscale the default X11 cursor
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkMerge [
|
||||
{ fonts.fonts = mkIf config.fonts.enableDefaultFonts defaultFonts; }
|
||||
{ fonts.fonts = mkIf config.services.xserver.enable defaultXFonts; }
|
||||
{ fonts.fonts = mkIf cfg.enableDefaultFonts defaultFonts; }
|
||||
(mkIf cfg.optimizeForVeryHighDPI {
|
||||
services.xserver.upscaleDefaultCursor = mkDefault true;
|
||||
# Conforms to the recommendation in fonts/fontconfig.nix
|
||||
# for > 200DPI.
|
||||
fonts.fontconfig = {
|
||||
antialias = mkDefault false;
|
||||
hinting.enable = mkDefault false;
|
||||
subpixel.lcdfilter = mkDefault "none";
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
{ lib, pkgs, config, ...}:
|
||||
with lib;
|
||||
|
||||
{
|
||||
options.hardware.video.hidpi.enable = mkEnableOption (lib.mdDoc "Font/DPI configuration optimized for HiDPI displays");
|
||||
|
||||
config = mkIf config.hardware.video.hidpi.enable {
|
||||
console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-v32n.psf.gz";
|
||||
|
||||
# Needed when typing in passwords for full disk encryption
|
||||
console.earlySetup = mkDefault true;
|
||||
boot.loader.systemd-boot.consoleMode = mkDefault "1";
|
||||
|
||||
|
||||
# Disable font anti-aliasing, hinting, and sub-pixel rendering by default
|
||||
# See recommendations in fonts/fontconfig.nix
|
||||
fonts.fontconfig = {
|
||||
antialias = mkDefault false;
|
||||
hinting.enable = mkDefault false;
|
||||
subpixel.lcdfilter = mkDefault "none";
|
||||
};
|
||||
|
||||
# TODO Find reasonable defaults X11 & wayland
|
||||
};
|
||||
}
|
||||
|
|
@ -518,21 +518,6 @@ EOF
|
|||
}
|
||||
}
|
||||
|
||||
# For lack of a better way to determine it, guess whether we should use a
|
||||
# bigger font for the console from the display mode on the first
|
||||
# framebuffer. A way based on the physical size/actual DPI reported by
|
||||
# the monitor would be nice, but I don't know how to do this without X :)
|
||||
my $fb_modes_file = "/sys/class/graphics/fb0/modes";
|
||||
if (-f $fb_modes_file && -r $fb_modes_file) {
|
||||
my $modes = read_file($fb_modes_file);
|
||||
$modes =~ m/([0-9]+)x([0-9]+)/;
|
||||
my $console_width = $1, my $console_height = $2;
|
||||
if ($console_width > 1920) {
|
||||
push @attrs, "# high-resolution display";
|
||||
push @attrs, 'hardware.video.hidpi.enable = lib.mkDefault true;';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# Generate the hardware configuration file.
|
||||
|
||||
|
|
|
|||
|
|
@ -95,7 +95,6 @@
|
|||
./hardware/video/bumblebee.nix
|
||||
./hardware/video/capture/mwprocapture.nix
|
||||
./hardware/video/displaylink.nix
|
||||
./hardware/video/hidpi.nix
|
||||
./hardware/video/nvidia.nix
|
||||
./hardware/video/switcheroo-control.nix
|
||||
./hardware/video/uvcvideo/default.nix
|
||||
|
|
|
|||
|
|
@ -9,10 +9,27 @@ let
|
|||
|
||||
settingsFile = settingsFormat.generate "starship.toml" cfg.settings;
|
||||
|
||||
in {
|
||||
initOption =
|
||||
if cfg.interactiveOnly then
|
||||
"promptInit"
|
||||
else
|
||||
"shellInit";
|
||||
|
||||
in
|
||||
{
|
||||
options.programs.starship = {
|
||||
enable = mkEnableOption (lib.mdDoc "the Starship shell prompt");
|
||||
|
||||
interactiveOnly = mkOption {
|
||||
default = true;
|
||||
example = false;
|
||||
type = types.bool;
|
||||
description = lib.mdDoc ''
|
||||
Whether to enable starship only when the shell is interactive.
|
||||
Some plugins require this to be set to false to function correctly.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
inherit (settingsFormat) type;
|
||||
default = { };
|
||||
|
|
@ -25,21 +42,21 @@ in {
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.bash.promptInit = ''
|
||||
programs.bash.${initOption} = ''
|
||||
if [[ $TERM != "dumb" && (-z $INSIDE_EMACS || $INSIDE_EMACS == "vterm") ]]; then
|
||||
export STARSHIP_CONFIG=${settingsFile}
|
||||
eval "$(${pkgs.starship}/bin/starship init bash)"
|
||||
fi
|
||||
'';
|
||||
|
||||
programs.fish.promptInit = ''
|
||||
programs.fish.${initOption} = ''
|
||||
if test "$TERM" != "dumb" -a \( -z "$INSIDE_EMACS" -o "$INSIDE_EMACS" = "vterm" \)
|
||||
set -x STARSHIP_CONFIG ${settingsFile}
|
||||
eval (${pkgs.starship}/bin/starship init fish)
|
||||
end
|
||||
'';
|
||||
|
||||
programs.zsh.promptInit = ''
|
||||
programs.zsh.${initOption} = ''
|
||||
if [[ $TERM != "dumb" && (-z $INSIDE_EMACS || $INSIDE_EMACS == "vterm") ]]; then
|
||||
export STARSHIP_CONFIG=${settingsFile}
|
||||
eval "$(${pkgs.starship}/bin/starship init zsh)"
|
||||
|
|
|
|||
|
|
@ -303,8 +303,8 @@ in
|
|||
then if (backup.paths != null) then concatStringsSep " " backup.paths else ""
|
||||
else "--files-from ${filesFromTmpFile}";
|
||||
pruneCmd = optionals (builtins.length backup.pruneOpts > 0) [
|
||||
(resticCmd + " forget --prune --cache-dir=%C/restic-backups-${name} " + (concatStringsSep " " backup.pruneOpts))
|
||||
(resticCmd + " check --cache-dir=%C/restic-backups-${name} " + (concatStringsSep " " backup.checkOpts))
|
||||
(resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts))
|
||||
(resticCmd + " check " + (concatStringsSep " " backup.checkOpts))
|
||||
];
|
||||
# Helper functions for rclone remotes
|
||||
rcloneRemoteName = builtins.elemAt (splitString ":" backup.repository) 1;
|
||||
|
|
@ -314,6 +314,7 @@ in
|
|||
in
|
||||
nameValuePair "restic-backups-${name}" ({
|
||||
environment = {
|
||||
RESTIC_CACHE_DIR = "%C/restic-backups-${name}";
|
||||
RESTIC_PASSWORD_FILE = backup.passwordFile;
|
||||
RESTIC_REPOSITORY = backup.repository;
|
||||
RESTIC_REPOSITORY_FILE = backup.repositoryFile;
|
||||
|
|
@ -332,7 +333,7 @@ in
|
|||
restartIfChanged = false;
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup --cache-dir=%C/restic-backups-${name} ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} ${backupPaths}" ])
|
||||
ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} ${backupPaths}" ])
|
||||
++ pruneCmd;
|
||||
User = backup.user;
|
||||
RuntimeDirectory = "restic-backups-${name}";
|
||||
|
|
|
|||
|
|
@ -138,6 +138,26 @@ let
|
|||
concatMapStringsSep "\n" (line: prefix + line) (splitString "\n" str);
|
||||
|
||||
indent = prefixStringLines " ";
|
||||
|
||||
# A scalable variant of the X11 "core" cursor
|
||||
#
|
||||
# If not running a fancy desktop environment, the cursor is likely set to
|
||||
# the default `cursor.pcf` bitmap font. This is 17px wide, so it's very
|
||||
# small and almost invisible on 4K displays.
|
||||
fontcursormisc_hidpi = pkgs.xorg.fontxfree86type1.overrideAttrs (old:
|
||||
let
|
||||
# The scaling constant is 230/96: the scalable `left_ptr` glyph at
|
||||
# about 23 points is rendered as 17px, on a 96dpi display.
|
||||
# Note: the XLFD font size is in decipoints.
|
||||
size = 2.39583 * cfg.dpi;
|
||||
sizeString = builtins.head (builtins.split "\\." (toString size));
|
||||
in
|
||||
{
|
||||
postInstall = ''
|
||||
alias='cursor -xfree86-cursor-medium-r-normal--0-${sizeString}-0-0-p-0-adobe-fontspecific'
|
||||
echo "$alias" > $out/lib/X11/fonts/Type1/fonts.alias
|
||||
'';
|
||||
});
|
||||
in
|
||||
|
||||
{
|
||||
|
|
@ -576,6 +596,15 @@ in
|
|||
Whether to terminate X upon server reset.
|
||||
'';
|
||||
};
|
||||
|
||||
upscaleDefaultCursor = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Upscale the default X cursor to be more visible on high-density displays.
|
||||
Requires `config.services.xserver.dpi` to be set.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
|
@ -627,6 +656,10 @@ in
|
|||
+ "${toString (length primaryHeads)} heads set to primary: "
|
||||
+ concatMapStringsSep ", " (x: x.output) primaryHeads;
|
||||
})
|
||||
{
|
||||
assertion = cfg.upscaleDefaultCursor -> cfg.dpi != null;
|
||||
message = "Specify `config.services.xserver.dpi` to upscale the default cursor.";
|
||||
}
|
||||
];
|
||||
|
||||
environment.etc =
|
||||
|
|
@ -851,6 +884,10 @@ in
|
|||
'';
|
||||
|
||||
fonts.enableDefaultFonts = mkDefault true;
|
||||
fonts.fonts = [
|
||||
(if cfg.upscaleDefaultCursor then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc)
|
||||
pkgs.xorg.fontmiscmisc
|
||||
];
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.54.0";
|
||||
version = "2.55.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-3UCsMzpoHq4gD4bw/MT1qbl8AnXQnFJqpMi1mlPvv5w=";
|
||||
hash = "sha256-N0BhbqZvZs3IP+jMxr85KlHs6I/fxWgoK884EKT9C9Y=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
|||
|
|
@ -89,6 +89,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
description = "Manga reader for GNOME";
|
||||
homepage = "https://valos.gitlab.io/Komikku/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ chuangzhu ];
|
||||
maintainers = with maintainers; [ chuangzhu infinitivewitch ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -3,10 +3,10 @@
|
|||
rec {
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "111.0";
|
||||
version = "111.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "cdb300fdbb2b60068b0fc10a18df587b417e484901d36f52dd174d320d3440a42b02ea000f325c5781fd8853a5171b1a5184562fb535ece90619e4c64d46bb82";
|
||||
sha512 = "e7d248b845cb524efc28818e0a0cad06ba5acac30219886191b702b61314388d10a1690c6d704b0a70d2bc2c4b1f04ed02350dcb9dce9c56503d2af3baefe4d3";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ let
|
|||
ptb = "0.0.39";
|
||||
canary = "0.0.150";
|
||||
} else {
|
||||
stable = "0.0.264";
|
||||
stable = "0.0.273";
|
||||
ptb = "0.0.59";
|
||||
canary = "0.0.283";
|
||||
};
|
||||
|
|
@ -28,7 +28,7 @@ let
|
|||
x86_64-darwin = {
|
||||
stable = fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
|
||||
sha256 = "1jvlxmbfqhslsr16prsgbki77kq7i3ipbkbn67pnwlnis40y9s7p";
|
||||
sha256 = "1vz2g83gz9ks9mxwx7gl7kys2xaw8ksnywwadrpsbj999fzlyyal";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
|
||||
|
|
|
|||
|
|
@ -5,22 +5,35 @@
|
|||
, glib-networking
|
||||
, gst_all_1
|
||||
, gtkmm3
|
||||
, libappindicator-gtk3
|
||||
, libayatana-appindicator
|
||||
, libcanberra
|
||||
, libepoxy
|
||||
, libpsl
|
||||
, libdatrie
|
||||
, libdeflate
|
||||
, libselinux
|
||||
, libsepol
|
||||
, libsysprof-capture
|
||||
, libthai
|
||||
, libxkbcommon
|
||||
, sqlite
|
||||
, pcre
|
||||
, pcre2
|
||||
, pkg-config
|
||||
, webkitgtk
|
||||
, wrapGAppsHook
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "whatsapp-for-linux";
|
||||
version = "1.3.1";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eneshecan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TX6fMuhe6VHbhWJSsPM0iOV4CuCfULD5McJyHuTW4lI=";
|
||||
sha256 = "sha256-oghO6DNVJqWFHRjUAkqfnoWc7qHJnK3givVLq6xGJeo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -36,9 +49,23 @@ stdenv.mkDerivation rec {
|
|||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gtkmm3
|
||||
libappindicator-gtk3
|
||||
libayatana-appindicator
|
||||
libcanberra
|
||||
libdatrie
|
||||
libdeflate
|
||||
libepoxy
|
||||
libpsl
|
||||
libselinux
|
||||
libsepol
|
||||
libsysprof-capture
|
||||
libthai
|
||||
libxkbcommon
|
||||
pcre
|
||||
pcre2
|
||||
sqlite
|
||||
webkitgtk
|
||||
xorg.libXdmcp
|
||||
xorg.libXtst
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, alsa-lib
|
||||
, expat
|
||||
, fontconfig
|
||||
, libGL
|
||||
, vulkan-loader
|
||||
, xorg
|
||||
, darwin
|
||||
}:
|
||||
|
|
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
|
|||
alsa-lib
|
||||
expat
|
||||
fontconfig
|
||||
libGL
|
||||
vulkan-loader
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
|
|
@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
patchelf $out/bin/sniffnet \
|
||||
--add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]}
|
||||
--add-rpath ${lib.makeLibraryPath [ vulkan-loader xorg.libX11 ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lefthook";
|
||||
version = "1.3.5";
|
||||
version = "1.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
sha256 = "sha256-v4ES3TbuDRUBK8xH/viP5QOZmp3eWjsy0YRaSxfTZV4=";
|
||||
hash = "sha256-6wVzl2hu6bH2dqB/m/kgUQxRxOxMQltcGlo/TIIgh/Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VeR/lyrQrjXWvHdxpG4H+XPlAud9rrlzX8GqhVzn1sg=";
|
||||
vendorHash = "sha256-cMRl+TqSLlfoAja+JNaNKfHDR9fkvMTWdB1FT3XxPd4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
30
pkgs/data/fonts/bqn386/default.nix
Normal file
30
pkgs/data/fonts/bqn386/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "bqn386";
|
||||
version = "unstable-2022-05-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dzaima";
|
||||
repo = "BQN386";
|
||||
rev = "81e18d1eb8cb6b66df9e311b3b63ec086d910d18";
|
||||
hash = "sha256-f0MbrxdkEiOqod41U07BvdDFDbFCqJuGyDIcx2Y24D0=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 -t $out/share/fonts/truetype *.ttf
|
||||
install -Dm644 -t $out/share/fonts/woff2 *.woff2
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An APL and BQN font extending on APL386";
|
||||
homepage = "https://dzaima.github.io/BQN386/";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ skykanin ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -4,43 +4,11 @@
|
|||
, unzip
|
||||
, runCommand
|
||||
, darwin
|
||||
# we need a way to build other dart versions
|
||||
# than the latest, because flutter might want
|
||||
# another version
|
||||
, version ? "2.19.3"
|
||||
, sources ? let
|
||||
base = "https://storage.googleapis.com/dart-archive/channels";
|
||||
x86_64 = "x64";
|
||||
i686 = "ia32";
|
||||
aarch64 = "arm64";
|
||||
in
|
||||
{
|
||||
"${version}-aarch64-darwin" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${aarch64}-release.zip";
|
||||
sha256 = "sha256-wfUh6rXy8jAC0TVQJzXh4SrV2DQs9SvY8PGtNgZx+cA=";
|
||||
};
|
||||
"${version}-x86_64-darwin" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
|
||||
sha256 = "sha256-zyu6r8akId/AHpBKH95wJXXu1LD9CKShWYKfppnSRx4=";
|
||||
};
|
||||
"${version}-x86_64-linux" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
||||
sha256 = "sha256-45HE7Y9iO5dI+JfLWF1ikFfBFB+er46bK+EYkyuhFjI=";
|
||||
};
|
||||
"${version}-i686-linux" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
|
||||
sha256 = "sha256-IkSJWfAocT1l8F2igAkR+Y5PNYD5PZ0j21D8aJk9JCY=";
|
||||
};
|
||||
"${version}-aarch64-linux" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
|
||||
sha256 = "sha256-Bt18brbJA/XfiyP5o197HDXMuGm+a1AZx92Thoriv78=";
|
||||
};
|
||||
}
|
||||
, sources ? import ./sources.nix {inherit fetchurl;}
|
||||
, version ? sources.versionUsed
|
||||
}:
|
||||
|
||||
assert version != null && version != "";
|
||||
assert sources != null && (builtins.isAttrs sources);
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dart";
|
||||
inherit version;
|
||||
|
|
@ -59,7 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
libPath = lib.makeLibraryPath [ stdenv.cc.cc ];
|
||||
dontStrip = true;
|
||||
passthru.tests = {
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
tests = {
|
||||
testCreate = runCommand "dart-test-create" { nativeBuildInputs = [ finalAttrs.finalPackage ]; } ''
|
||||
PROJECTNAME="dart_test_project"
|
||||
dart create --no-pub $PROJECTNAME
|
||||
|
|
@ -82,6 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
touch $out
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.dartlang.org/";
|
||||
maintainers = with maintainers; [ grburst ];
|
||||
|
|
|
|||
24
pkgs/development/compilers/dart/sources.nix
Normal file
24
pkgs/development/compilers/dart/sources.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
let version = "2.19.3"; in
|
||||
{ fetchurl }: {
|
||||
versionUsed = version;
|
||||
"${version}-x86_64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
|
||||
sha256 = "193hf56j7bws8bzqxxzz2sgbn2d80g5s8vp8ihi22cm3mmppfi4v";
|
||||
};
|
||||
"${version}-aarch64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
|
||||
sha256 = "0b30l8kfcsl1j6w2vbq08p0v4h4gca013l5fpznjqq0midxhybnw";
|
||||
};
|
||||
"${version}-aarch64-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
|
||||
sha256 = "0qyi7ppsf4rmzx1qgx3qbn4k7bgbncxjql6a9f2b1aj6l6lllvmg";
|
||||
};
|
||||
"${version}-x86_64-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
|
||||
sha256 = "0iq7mdwpsnykk3j2bsgmazg30m4qg7i2lpv1ygbhy2lbhrkdpdck";
|
||||
};
|
||||
"${version}-i686-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
|
||||
sha256 = "0xksis14ff6bzjvycgxgldg96n88rh42adjyrrhcay2s183vh480";
|
||||
};
|
||||
}
|
||||
77
pkgs/development/compilers/dart/update.sh
Executable file
77
pkgs/development/compilers/dart/update.sh
Executable file
|
|
@ -0,0 +1,77 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# so if the script fails, debug logs are on stderr
|
||||
log() {
|
||||
>&2 echo "DART_UPDATER: $@"
|
||||
}
|
||||
|
||||
# fetch the latest version number from upstream
|
||||
NEW_VER_DETAILS=$(curl -sL https://storage.googleapis.com/dart-archive/channels/stable/release/latest/VERSION)
|
||||
NEW_VER=$(jq -r '.version' <<< "$NEW_VER_DETAILS")
|
||||
|
||||
MY_PATH=$(dirname $(realpath "$0"))
|
||||
SRC_FILE=$(mktemp)
|
||||
|
||||
log "file to write is $SRC_FILE"
|
||||
|
||||
PRELUDE="let version = \"$NEW_VER\"; in
|
||||
{ fetchurl }: {
|
||||
versionUsed = version;"
|
||||
echo "$PRELUDE" > "$SRC_FILE"
|
||||
log "wrote prelude"
|
||||
|
||||
# Fetches the source, then writes the fetcher and hash into the sources file.
|
||||
# Arguments:
|
||||
# - $1: VARIABLE NAME of (table of nix platform -> dart platform mappings) ("DARWIN_PLATFORMS"|"LIN_PLATFORMS")
|
||||
# - $2: Dart-OS ("macos"|"linux")
|
||||
write_for_platform() {
|
||||
BASE_OF_ALL_URLS='https://storage.googleapis.com/dart-archive/channels/stable/release'
|
||||
BASE_URL_WRITTEN="$BASE_OF_ALL_URLS/\${version}/sdk"
|
||||
BASE_URL_FETCHED="$BASE_OF_ALL_URLS/$NEW_VER/sdk"
|
||||
|
||||
TABLE_NAME=$1
|
||||
declare -n TABLE=$TABLE_NAME
|
||||
|
||||
for platform in "${!TABLE[@]}"; do
|
||||
DART_PLATFORM="${TABLE[$platform]}"
|
||||
log "trying for dartplatform $DART_PLATFORM (platform $platform) (OS $2)"
|
||||
|
||||
URL_POSTFIX="dartsdk-$2-$DART_PLATFORM-release.zip"
|
||||
URL="$BASE_URL_FETCHED/$URL_POSTFIX"
|
||||
log "URL for $DART_PLATFORM: $URL"
|
||||
|
||||
HASH=$(nix-prefetch-url "$URL" --type sha256)
|
||||
log "hash for platform $platform: $HASH"
|
||||
|
||||
FETCHER=" \"\${version}-$platform\" = fetchurl {
|
||||
url = \"$BASE_URL_WRITTEN/$URL_POSTFIX\";
|
||||
sha256 = \"$HASH\";
|
||||
};"
|
||||
|
||||
echo "$FETCHER" >> $SRC_FILE
|
||||
done
|
||||
log "finished for $1"
|
||||
|
||||
}
|
||||
|
||||
# Map nix platforms -> Dart platforms
|
||||
X8664="x64"
|
||||
AARCH64="arm64"
|
||||
I686="ia32"
|
||||
declare -A DARWIN_PLATFORMS=(["aarch64-darwin"]="$AARCH64"
|
||||
["x86_64-darwin"]="$X8664")
|
||||
|
||||
declare -A LIN_PLATFORMS=( ["x86_64-linux"]="$X8664"
|
||||
["i686-linux"]="$I686"
|
||||
["aarch64-linux"]="$AARCH64")
|
||||
|
||||
write_for_platform "DARWIN_PLATFORMS" "macos"
|
||||
write_for_platform "LIN_PLATFORMS" "linux"
|
||||
|
||||
echo '}' >> $SRC_FILE
|
||||
|
||||
log "moving tempfile to target directory"
|
||||
mv "$SRC_FILE" "$MY_PATH/sources.nix"
|
||||
|
|
@ -14,8 +14,7 @@ let
|
|||
dune_3
|
||||
luv
|
||||
extlib
|
||||
] else if lib.versionAtLeast version "4.0"
|
||||
then with ocaml-ng.ocamlPackages_4_10; [
|
||||
] else with ocaml-ng.ocamlPackages_4_10; [
|
||||
ocaml
|
||||
findlib
|
||||
sedlex
|
||||
|
|
@ -26,9 +25,6 @@ let
|
|||
dune_3
|
||||
luv
|
||||
extlib-1-7-7
|
||||
] else with ocaml-ng.ocamlPackages_4_05; [
|
||||
ocaml
|
||||
camlp4
|
||||
];
|
||||
|
||||
defaultPatch = ''
|
||||
|
|
@ -120,24 +116,6 @@ let
|
|||
};
|
||||
};
|
||||
in {
|
||||
# this old version is required to compile some libraries
|
||||
haxe_3_2 = generic {
|
||||
version = "3.2.1";
|
||||
sha256 = "1x9ay5a2llq46fww3k07jxx8h1vfpyxb522snc6702a050ki5vz3";
|
||||
prePatch = ''
|
||||
sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' main.ml
|
||||
substituteInPlace extra/haxelib_src/src/tools/haxelib/Main.hx \
|
||||
--replace '"neko"' '"${neko}/bin/neko"'
|
||||
'';
|
||||
};
|
||||
haxe_3_4 = generic {
|
||||
version = "3.4.6";
|
||||
sha256 = "1myc4b8fwp0f9vky17wv45n34a583f5sjvajsc93f5gm1wanp4if";
|
||||
prePatch = ''
|
||||
${defaultPatch}
|
||||
sed -i -re 's!(let +prefix_path += +).*( +in)!\1"'"$out/"'"\2!' src/main.ml
|
||||
'';
|
||||
};
|
||||
haxe_4_0 = generic {
|
||||
version = "4.0.5";
|
||||
sha256 = "0f534pchdx0m057ixnk07ab4s518ica958pvpd0vfjsrxg5yjkqa";
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cimg";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtschump";
|
||||
owner = "GreycLab";
|
||||
repo = "CImg";
|
||||
rev = "v.${version}";
|
||||
hash = "sha256-MPkZGKewusCw5TsW5NOtnrjqEK2dxRSCal1fn7Yiaio=";
|
||||
hash = "sha256-koXew0Lwb7wW8MQctTjxpo7TNVtrS5MzxQFfUS1gwZs=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
|||
processing applications.
|
||||
'';
|
||||
license = licenses.cecill-c;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
maintainers = [ maintainers.AndersonTorres maintainers.lilyinstarlight ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "installer";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pradyunsg";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-IXznSrc/4LopgZDGFSC6cAOCbts+siKpdl5SvN1FFvA=";
|
||||
hash = "sha256-thHghU+1Alpay5r9Dc3v7ATRFfYKV8l9qR0nbGOOX/A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
|
|
@ -27,8 +27,9 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/pypa/installer/blob/${src.rev}/docs/changelog.md";
|
||||
homepage = "https://github.com/pradyunsg/installer";
|
||||
description = "A low-level library for installing a Python package from a wheel distribution.";
|
||||
description = "A low-level library for installing a Python package from a wheel distribution";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cpcloud fridh ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
|
|
@ -45,6 +46,11 @@ buildPythonPackage rec {
|
|||
# Fixes hanging tests on Darwin
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
preCheck = lib.optionalString stdenv.isDarwin ''
|
||||
# Darwin issue: OSError: [Errno 24] Too many open files
|
||||
ulimit -n 1024
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pygls" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, cssselect
|
||||
, feedparser
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, gdata
|
||||
, gnupg
|
||||
, google-api-python-client
|
||||
|
|
@ -13,6 +14,7 @@
|
|||
, lxml
|
||||
, mechanize
|
||||
, nose
|
||||
, packaging
|
||||
, pdfminer-six
|
||||
, pillow
|
||||
, prettytable
|
||||
|
|
@ -23,12 +25,14 @@
|
|||
, requests
|
||||
, simplejson
|
||||
, termcolor
|
||||
, testers
|
||||
, unidecode
|
||||
, woob
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "woob";
|
||||
version = "3.0";
|
||||
version = "3.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -37,10 +41,11 @@ buildPythonPackage rec {
|
|||
owner = "woob";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-XLcHNidclORbxVXgcsHY6Ja/dak+EVSKTaVQmg1f/rw=";
|
||||
hash = "sha256-aPkMfPRDjPfHIlGDEvorGwk09yQuEWwOkJJUST0vLAs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
packaging
|
||||
pyqt5
|
||||
];
|
||||
|
||||
|
|
@ -57,6 +62,7 @@ buildPythonPackage rec {
|
|||
libyaml
|
||||
lxml
|
||||
mechanize
|
||||
packaging
|
||||
pdfminer-six
|
||||
pillow
|
||||
prettytable
|
||||
|
|
@ -68,11 +74,12 @@ buildPythonPackage rec {
|
|||
unidecode
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "with-doctest = 1" "" \
|
||||
--replace "with-coverage = 1" ""
|
||||
'';
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/woob/woob/-/commit/861b1bb92be53998d8174dcca6fa643d1c7cde12.patch";
|
||||
sha256 = "sha256-IXcE59pMFtPLTOYa2inIvuA14USQvck6Q4hrKZTC0DE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
nose
|
||||
|
|
@ -86,6 +93,11 @@ buildPythonPackage rec {
|
|||
"woob"
|
||||
];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = woob;
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collection of applications and APIs to interact with websites";
|
||||
homepage = "https://woob.tech";
|
||||
|
|
|
|||
|
|
@ -2,17 +2,23 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitea-actions-runner";
|
||||
version = "unstable-2023-02-08";
|
||||
version = "unstable-2023-03-18";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "gitea.com";
|
||||
owner = "gitea";
|
||||
repo = "act_runner";
|
||||
rev = "990cf93c7136669408eb1832cd05df3ad4dd81b3";
|
||||
sha256 = "1ysp7g199dzh1zpxxhki88pn96qghln7a5g8zfjip9173q1rgiyb";
|
||||
rev = "9eb8b08a69e8b1c699c9c07a06c1ff8e5f6ad0fe";
|
||||
sha256 = "sha256-B8vD+86X8cqZhPmDmEjHgSsq3TdJuCf9h3XgdXC7hQY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0a3q7rsk37dc6v3vnqaywkimaqvyjmkrwljhcjcnswsdfcgng62b";
|
||||
vendorSha256 = "sha256-K/d/ip8icc+rjTmajsGxw5aij1VMW6wJJu4LCkKqaVQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X gitea.com/gitea/act_runner/cmd.version=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
mainProgram = "act_runner";
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jenkins";
|
||||
version = "2.375.3";
|
||||
version = "2.387.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
|
||||
hash = "sha256-1WBl8eXEMj/sNqlqv3cQskUeNLxPudoXnn3xKaTMwaw=";
|
||||
hash = "sha256-wTKh4AtoWvx5luulML5CijJ5xkk5lBf5+jj8vA2+wCc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -51,11 +51,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
version="$(jq -r .version <<<$core_json)"
|
||||
sha256="$(jq -r .sha256 <<<$core_json)"
|
||||
hash="$(nix-hash --type sha256 --to-base32 "$sha256")"
|
||||
url="$(jq -r .url <<<$core_json)"
|
||||
hash="$(nix hash to-sri --type sha256 "$sha256")"
|
||||
|
||||
if [ ! "$oldVersion" = "$version" ]; then
|
||||
update-source-version jenkins "$version" "$hash" "$url"
|
||||
update-source-version jenkins "$version" "$hash"
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix"
|
||||
nixfmt "$default_nix"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, fetchgit
|
||||
, libplist
|
||||
, libxml2
|
||||
, openssl_1_1
|
||||
, openssl
|
||||
, CoreFoundation
|
||||
, Security
|
||||
}:
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
libplist
|
||||
libxml2
|
||||
openssl_1_1
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreFoundation
|
||||
Security
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "yq-go";
|
||||
version = "4.31.2";
|
||||
version = "4.32.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikefarah";
|
||||
repo = "yq";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Cf9Y7sdvpflQhhnOuRZUTyYQ3fpFTLo28dZtePsayfE=";
|
||||
hash = "sha256-gP5Ah/KVWtmEl1CUKge5XdsYwoAAdNabb10b0pdN0tk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nv1sJ5GGB2IbGF1ebGZmeKF6qHLXgFebdibcsB36juY=";
|
||||
vendorHash = "sha256-/7ah71isg0GB9PncNamMKaW2cW+EMN2BaPqP7gsLMmg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ let
|
|||
|
||||
# Dependencies that are required to build kernel modules
|
||||
moduleBuildDependencies = [
|
||||
pahole
|
||||
perl
|
||||
libelf
|
||||
# module makefiles often run uname commands to find out the kernel version
|
||||
|
|
|
|||
|
|
@ -1,23 +1,18 @@
|
|||
{ lib
|
||||
, python3Packages
|
||||
, python3
|
||||
}:
|
||||
|
||||
with python3Packages; buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "synadm";
|
||||
version = "0.38";
|
||||
version = "0.40";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-l1KRUnjzj1/MEb1nxV6hMaxi15q7baG+iiK2yatZYRc=";
|
||||
hash = "sha256-iDG2wsC0820unKlKNDKwgCNC+SAWJm8ltSB4knmLqeQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "Click>=7.0,<8.0" "Click"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
click
|
||||
click-option-group
|
||||
dnspython
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "redis";
|
||||
version = "7.0.9";
|
||||
version = "7.0.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.redis.io/releases/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-93E1wqR8kVHUAov+o7NEcKtNMk0UhPeahMbzKjz7n2U=";
|
||||
hash = "sha256-He5MZIc0HK571kMv91kJBlIiFaBh/e+Hx9BAoMtgATE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "stripe-cli";
|
||||
version = "1.10.3";
|
||||
version = "1.13.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stripe";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jos6SZ2ZkUeWOM0ALlsc5a+5kcullNF/2AknTQpRnIc=";
|
||||
hash = "sha256-Zk7Mt2ffhuVT3RB+ZeBRIBybIfEO9AQ4LNVmWU2FutU=";
|
||||
};
|
||||
vendorSha256 = "sha256-1c+YtfRy1ey0z117YHHkrCnpb7g+DmM+LR1rjn1YwMQ=";
|
||||
vendorHash = "sha256-rjYV69BWkqIkgyeauAo4KEfbB7cxnwn3VSjLrMrCu1c=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -23,6 +23,16 @@ buildGoModule rec {
|
|||
preCheck = ''
|
||||
# the tests expect the Version ldflag not to be set
|
||||
unset ldflags
|
||||
|
||||
# requires internet access
|
||||
rm pkg/cmd/plugin_cmds_test.go
|
||||
rm pkg/cmd/resources_test.go
|
||||
rm pkg/cmd/root_test.go
|
||||
|
||||
# TODO: no clue why it's broken (1.13.12), remove for now.
|
||||
rm pkg/login/client_login_test.go
|
||||
rm pkg/git/editor_test.go
|
||||
rm pkg/rpcservice/sample_create_test.go
|
||||
'' + lib.optionalString (
|
||||
# delete plugin tests on all platforms but exact matches
|
||||
# https://github.com/stripe/stripe-cli/issues/850
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, stdenv
|
||||
, variant ? "standalone"
|
||||
, fetchzip
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, ninja
|
||||
, wrapQtAppsHook
|
||||
, opencv3
|
||||
, openexr
|
||||
, graphicsmagick
|
||||
|
|
@ -19,12 +20,6 @@
|
|||
, gmic
|
||||
, qtbase
|
||||
, qttools
|
||||
, writeShellScript
|
||||
, common-updater-scripts
|
||||
, gnugrep
|
||||
, gnused
|
||||
, coreutils
|
||||
, jq
|
||||
, nix-update-script
|
||||
, gimpPlugins
|
||||
}:
|
||||
|
|
@ -50,20 +45,20 @@ assert lib.assertMsg (builtins.hasAttr variant variants) "gmic-qt variant “${v
|
|||
|
||||
assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps or []) "gmic-qt variant “${variant}” is missing one of its dependencies.";
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
|
||||
hash = "sha256-2lMnn19FcFKnfIjSxOObqxIjqLMUoWgi0ADZBCBePY4=";
|
||||
hash = "sha256-Z6FU0BRTiOIoM6ViYgcwOifat4/IISFJXvyC8PwR5mA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "gmic-qt-3.2.1-fix-system-gmic.patch";
|
||||
url = "https://github.com/c-koi/gmic-qt/commit/e8d7a3523753ff592da63b1d54edf0921c54fe53.patch";
|
||||
hash = "sha256-kBFZo2qvod4pH3oK8gvnmw39x6eMH9zjr4mMcY74mFo=";
|
||||
name = "gmic-3.2.2-cmake-fixes.patch";
|
||||
url = "https://github.com/c-koi/gmic-qt/compare/5379307f9e484ad171b8d09e3572b93d120a9159..420e85e005401d942a3ca5f5c39ee3c867fe8bdd.diff";
|
||||
hash = "sha256-l2y9EFtE3nv8NBSSn6Wo0pLRoYO2hoyb5HZk0QmlSpk=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -73,6 +68,7 @@ mkDerivation rec {
|
|||
cmake
|
||||
pkg-config
|
||||
ninja
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -119,6 +115,7 @@ mkDerivation rec {
|
|||
description = variants.${variant}.description;
|
||||
homepage = "http://gmic.eu/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.lilyinstarlight ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, cmake
|
||||
, ninja
|
||||
|
|
@ -27,31 +26,23 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gmic";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtschump";
|
||||
owner = "GreycLab";
|
||||
repo = "gmic";
|
||||
rev = "v.${version}";
|
||||
hash = "sha256-oEH4GlSV+642TGSJJhV4yzydh1hAQZfzwaiPAZFNQtI=";
|
||||
hash = "sha256-XLDnIs7IRIhQtz+qgdNypJODk6WJRPQ2M6LU6DJ+T7I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "gmic-3.2.1-fix-system-gmic.patch";
|
||||
url = "https://github.com/GreycLab/gmic/commit/9db3f6a39d9ed67b4279654da88993a8057575ff.patch";
|
||||
hash = "sha256-JznKCs56t6cJ4HLqlhMZjSOupEB8cdkn3j6RgZpcpzo=";
|
||||
})
|
||||
];
|
||||
|
||||
# TODO: build this from source
|
||||
# https://github.com/dtschump/gmic/blob/b36b2428db5926af5eea5454f822f369c2d9907e/src/Makefile#L675-L729
|
||||
gmic_stdlib = fetchurl {
|
||||
name = "gmic_stdlib.h";
|
||||
url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h";
|
||||
hash = "sha256-f8d9jTVnHwSoyMuiM+Qv86e/BYX9SSx9cl3borihxnc=";
|
||||
hash = "sha256-lABUPhwlzoRODX7z8arOEU0JJszcXREhZ20WRToKNY4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -119,7 +110,8 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Open and full-featured framework for image processing";
|
||||
homepage = "https://gmic.eu/";
|
||||
license = licenses.cecill20;
|
||||
license = licenses.cecill21;
|
||||
maintainers = [ maintainers.lilyinstarlight ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "disfetch";
|
||||
version = "3.6";
|
||||
version = "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "q60";
|
||||
repo = "disfetch";
|
||||
rev = version;
|
||||
sha256 = "sha256-/Not2jNwk3jX8TLN7CT3JXDilatSYXPaudGKNAgQDPY=";
|
||||
sha256 = "sha256-xzOE+Pnx0qb3B9vWWrF5Q0nhUo0QYBUO6j6al8N3deY=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "moar";
|
||||
version = "1.11.4";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "walles";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Op9A0C1MnVoNyxTEKARASrKDTIT/vNa01Bnww6BWg0Y=";
|
||||
sha256 = "sha256-5gWPqGrnb/wMdr+AQ1nkl3wUUpmgn3eDTaktWHLDAxc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-XexIBg49gK+b2Zef5eR7NfqFZHPp5DXhlcC3Loh6PfI=";
|
||||
vendorHash = "sha256-aFCv6VxHD1bOLhCHXhy4ubik8Z9uvU6AeqcMqIZI2Oo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nfpm";
|
||||
version = "2.26.0";
|
||||
version = "2.27.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MRtmfRriHArmzSfSr4Wf3+2wA3sOlHZs2HKQ2d+Bd20=";
|
||||
sha256 = "sha256-77E8TXTzU37/V1VmfwUjt/4MiFOrNG+sOHch/brb8bY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UUpi/6R36g6ofnEmn/qxEeJlzM/INYD4FuvRaBZ6pss=";
|
||||
vendorHash = "sha256-+Ph0QpDnucf6brWFP05x+s5fCHijaXA7rO1hbesU1Sk=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,15 @@ let
|
|||
};
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
});
|
||||
poetry-core = super.poetry-core.overridePythonAttrs (old: rec {
|
||||
version = "1.5.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-poetry";
|
||||
repo = "poetry-core";
|
||||
rev = version;
|
||||
hash = "sha256-GpZ0vMByHTu5kl7KrrFFK2aZMmkNO7xOEc8NI2H9k34=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "poetry-plugin-up";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MousaZeidBaker";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-16p0emvgWa56Km8U5HualCSStbulqyINbC3Jez9Y1n0=";
|
||||
hash = "sha256-QDfXgLkwh5rfyNZv0S7+cq6ubldXsbuCiTr6VYx8ZQs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "poetry";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -53,7 +53,7 @@ buildPythonPackage rec {
|
|||
owner = "python-poetry";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vbG9nsrCvytpKLJbC1EKeyTSjaDlsKvdRCwT6aSq6B4=";
|
||||
hash = "sha256-jNRFtEhaswG5RmFxpVcchIe6u2BCyoeNzneWR+9SuCY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -640,6 +640,8 @@ mapAliases ({
|
|||
hardlink = throw "hardlink was merged into util-linux since 2019-06-14."; # Added 2022-08-12
|
||||
inherit (harePackages) hare harec; # Added 2022-08-10
|
||||
hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15
|
||||
haxe_3_2 = throw "'haxe_3_2' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15
|
||||
haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15
|
||||
hdr-plus = throw "hdr-plus has been removed because it is unmaintained, often breaks and no longer consumed as a dependency"; # Added 2022-11-08
|
||||
heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05
|
||||
heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22
|
||||
|
|
|
|||
|
|
@ -5652,9 +5652,7 @@ with pkgs;
|
|||
|
||||
string-machine = callPackage ../applications/audio/string-machine { };
|
||||
|
||||
stripe-cli = callPackage ../tools/admin/stripe-cli {
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
stripe-cli = callPackage ../tools/admin/stripe-cli { };
|
||||
|
||||
bash-supergenpass = callPackage ../tools/security/bash-supergenpass { };
|
||||
|
||||
|
|
@ -15134,8 +15132,6 @@ with pkgs;
|
|||
haxe_4_2
|
||||
haxe_4_1
|
||||
haxe_4_0
|
||||
haxe_3_4
|
||||
haxe_3_2
|
||||
;
|
||||
|
||||
haxe = haxe_4_2;
|
||||
|
|
@ -27380,6 +27376,8 @@ with pkgs;
|
|||
|
||||
brise = callPackage ../data/misc/brise { };
|
||||
|
||||
bqn386 = callPackage ../data/fonts/bqn386 { };
|
||||
|
||||
cacert = callPackage ../data/misc/cacert { };
|
||||
|
||||
caladea = callPackage ../data/fonts/caladea { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue