mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
1bf55a993f
54 changed files with 532 additions and 282 deletions
|
|
@ -1602,3 +1602,33 @@ The following rules are desired to be respected:
|
|||
If necessary, `pname` has to be given a different value within `fetchPypi`.
|
||||
* Attribute names in `python-packages.nix` should be sorted alphanumerically to
|
||||
avoid merge conflicts and ease locating attributes.
|
||||
|
||||
## Package set maintenance
|
||||
|
||||
The whole Python package set has a lot of packages that do not see regular
|
||||
updates, because they either are a very fragile component in the Python
|
||||
ecosystem, like for example the `hypothesis` package, or packages that have
|
||||
no maintainer, so maintenance falls back to the package set maintainers.
|
||||
|
||||
### Updating packages in bulk
|
||||
|
||||
There is a tool to update alot of python libraries in bulk, it exists at
|
||||
`maintainers/scripts/update-python-libraries` with this repository.
|
||||
|
||||
It can quickly update minor or major versions for all packages selected
|
||||
and create update commits, and supports the `fetchPypi`, `fetchurl` and
|
||||
`fetchFromGitHub` fetchers. When updating lots of packages that are
|
||||
hosted on GitHub, exporting a `GITHUB_API_TOKEN` is highly recommended.
|
||||
|
||||
Updating packages in bulk leads to lots of breakages, which is why a
|
||||
stabilization period on the `python-unstable` branch is required.
|
||||
|
||||
Once the branch is sufficiently stable it should normally be merged
|
||||
into the `staging` branch.
|
||||
|
||||
An exemplary call to update all python libraries between minor versions
|
||||
would be:
|
||||
|
||||
```ShellSession
|
||||
$ maintainers/scripts/update-python-libraries --target minor --commit --use-pkgs-prefix pkgs/development/python-modules/**/default.nix
|
||||
```
|
||||
|
|
|
|||
|
|
@ -2,6 +2,52 @@
|
|||
|
||||
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.fontcursormisc.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;
|
||||
|
||||
defaultFonts =
|
||||
[ pkgs.dejavu_fonts
|
||||
pkgs.freefont_ttf
|
||||
pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts
|
||||
pkgs.liberation_ttf
|
||||
pkgs.unifont
|
||||
pkgs.noto-fonts-emoji
|
||||
];
|
||||
|
||||
defaultXFonts =
|
||||
[ (if hasHidpi then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc)
|
||||
pkgs.xorg.fontmiscmisc
|
||||
] ++ optionals (config.nixpkgs.config.allowUnfree or false)
|
||||
[ # these are unfree, and will make usage with xserver fail
|
||||
pkgs.xorg.fontbhlucidatypewriter100dpi
|
||||
pkgs.xorg.fontbhlucidatypewriter75dpi
|
||||
pkgs.xorg.fontbh100dpi
|
||||
];
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
imports = [
|
||||
(mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.")
|
||||
|
|
@ -32,25 +78,9 @@ with lib;
|
|||
|
||||
};
|
||||
|
||||
config = {
|
||||
|
||||
fonts.fonts = mkIf config.fonts.enableDefaultFonts
|
||||
([
|
||||
pkgs.dejavu_fonts
|
||||
pkgs.freefont_ttf
|
||||
pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts
|
||||
pkgs.liberation_ttf
|
||||
pkgs.xorg.fontmiscmisc
|
||||
pkgs.xorg.fontcursormisc
|
||||
pkgs.unifont
|
||||
pkgs.noto-fonts-emoji
|
||||
] ++ lib.optionals (config.nixpkgs.config.allowUnfree or false) [
|
||||
# these are unfree, and will make usage with xserver fail
|
||||
pkgs.xorg.fontbhlucidatypewriter100dpi
|
||||
pkgs.xorg.fontbhlucidatypewriter75dpi
|
||||
pkgs.xorg.fontbh100dpi
|
||||
]);
|
||||
|
||||
};
|
||||
config = mkMerge [
|
||||
{ fonts.fonts = mkIf config.fonts.enableDefaultFonts defaultFonts; }
|
||||
{ fonts.fonts = mkIf config.services.xserver.enable defaultXFonts; }
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -324,7 +324,7 @@ let
|
|||
|
||||
};
|
||||
|
||||
groupOpts = { name, ... }: {
|
||||
groupOpts = { name, config, ... }: {
|
||||
|
||||
options = {
|
||||
|
||||
|
|
@ -358,6 +358,10 @@ let
|
|||
|
||||
config = {
|
||||
name = mkDefault name;
|
||||
|
||||
members = mapAttrsToList (n: u: u.name) (
|
||||
filterAttrs (n: u: elem config.name u.extraGroups) cfg.users
|
||||
);
|
||||
};
|
||||
|
||||
};
|
||||
|
|
@ -419,12 +423,7 @@ let
|
|||
initialPassword initialHashedPassword;
|
||||
shell = utils.toShellPath u.shell;
|
||||
}) cfg.users;
|
||||
groups = mapAttrsToList (n: g:
|
||||
{ inherit (g) name gid;
|
||||
members = g.members ++ (mapAttrsToList (n: u: u.name) (
|
||||
filterAttrs (n: u: elem g.name u.extraGroups) cfg.users
|
||||
));
|
||||
}) cfg.groups;
|
||||
groups = attrValues cfg.groups;
|
||||
});
|
||||
|
||||
systemShells =
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ let
|
|||
cfg = config.services.grafana;
|
||||
opt = options.services.grafana;
|
||||
declarativePlugins = pkgs.linkFarm "grafana-plugins" (builtins.map (pkg: { name = pkg.pname; path = pkg; }) cfg.declarativePlugins);
|
||||
useMysql = cfg.database.type == "mysql";
|
||||
usePostgresql = cfg.database.type == "postgres";
|
||||
|
||||
envOptions = {
|
||||
PATHS_DATA = cfg.dataDir;
|
||||
|
|
@ -635,7 +637,7 @@ in {
|
|||
systemd.services.grafana = {
|
||||
description = "Grafana Service Daemon";
|
||||
wantedBy = ["multi-user.target"];
|
||||
after = ["networking.target"];
|
||||
after = ["networking.target"] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";
|
||||
environment = {
|
||||
QT_QPA_PLATFORM = "offscreen";
|
||||
} // mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "spotify-tui";
|
||||
version = "0.24.0";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Rigellute";
|
||||
repo = "spotify-tui";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vi6b22ygi6nwydjwqirph9k18akbw81m3bci134nrbnrb30glla";
|
||||
sha256 = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1l91xcgr3hcjaphns1hs0i8w1ynxqwx7rbgpl0i5xnyrkw0gn9lj";
|
||||
cargoSha256 = "sha256-iucI4/iMF+uXRlnMttobu4xo3IQXq7tGiSSN8eCrLM0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ];
|
||||
buildInputs = [ ]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
|
||||
, msgpack, neovim, python3Packages, qtbase }:
|
||||
, msgpack, neovim, python3Packages, qtbase, qtsvg }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "neovim-qt-unwrapped";
|
||||
|
|
@ -20,6 +20,7 @@ mkDerivation rec {
|
|||
buildInputs = [
|
||||
neovim.unwrapped # only used to generate help tags at build time
|
||||
qtbase
|
||||
qtsvg
|
||||
] ++ (with python3Packages; [
|
||||
jinja2 python msgpack
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "451";
|
||||
version = "452";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HoaXbnhwh6kDWgRFVs+VttzIY3MaxriteFTE1fwBUYs=";
|
||||
sha256 = "sha256-CSWrmjJ6lFQ6tG403Uf+VAOfvBd1oAhd2kTU/7XA3f0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
From 76c25147328d71960c70bbdd5a9396aac4a362a2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
|
||||
Date: Wed, 20 May 2020 14:19:07 -0300
|
||||
From b65921873585616c86a591eee9efbc68f84eb3d3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
|
||||
Date: Wed, 25 Aug 2021 12:03:09 -0300
|
||||
Subject: [PATCH] Fix paths
|
||||
|
||||
---
|
||||
fbmenugen | 14 ++++++--------
|
||||
1 file changed, 6 insertions(+), 8 deletions(-)
|
||||
fbmenugen | 11 +++++------
|
||||
1 file changed, 5 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/fbmenugen b/fbmenugen
|
||||
index 46a18dc..0c8eb08 100755
|
||||
index 241be16..5fc9aea 100755
|
||||
--- a/fbmenugen
|
||||
+++ b/fbmenugen
|
||||
@@ -214,9 +214,7 @@ my %CONFIG = (
|
||||
|
|
@ -22,15 +22,6 @@ index 46a18dc..0c8eb08 100755
|
|||
"$home_dir/.local/share/applications",
|
||||
],
|
||||
#>>>
|
||||
@@ -232,7 +230,7 @@ my %CONFIG = (
|
||||
force_icon_size => 0,
|
||||
generic_fallback => 0,
|
||||
locale_support => 1,
|
||||
- use_gtk3 => 0,
|
||||
+ use_gtk3 => 1,
|
||||
|
||||
VERSION => $version,
|
||||
);
|
||||
@@ -252,7 +250,7 @@ if (not -e $config_file) {
|
||||
}
|
||||
|
||||
|
|
@ -40,7 +31,7 @@ index 46a18dc..0c8eb08 100755
|
|||
require File::Copy;
|
||||
File::Copy::copy($etc_schema_file, $schema_file)
|
||||
or warn "$0: can't copy file `$etc_schema_file' to `$schema_file': $!\n";
|
||||
@@ -570,7 +568,7 @@ EXIT
|
||||
@@ -588,7 +586,7 @@ EXIT
|
||||
$generated_menu .= begin_category(@{$schema->{fluxbox}}) . <<"FOOTER";
|
||||
[config] (Configure)
|
||||
[submenu] (System Styles) {Choose a style...}
|
||||
|
|
@ -49,7 +40,7 @@ index 46a18dc..0c8eb08 100755
|
|||
[end]
|
||||
[submenu] (User Styles) {Choose a style...}
|
||||
[stylesdir] (~/.fluxbox/styles)
|
||||
@@ -580,12 +578,12 @@ EXIT
|
||||
@@ -598,12 +596,13 @@ EXIT
|
||||
[exec] (Screenshot - JPG) {import screenshot.jpg && display -resize 50% screenshot.jpg}
|
||||
[exec] (Screenshot - PNG) {import screenshot.png && display -resize 50% screenshot.png}
|
||||
[exec] (Run) {fbrun}
|
||||
|
|
@ -59,11 +50,11 @@ index 46a18dc..0c8eb08 100755
|
|||
[commanddialog] (Fluxbox Command)
|
||||
[reconfig] (Reload config)
|
||||
[restart] (Restart)
|
||||
- [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) | xmessage -file - -center}
|
||||
[exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) | xmessage -file - -center}
|
||||
+ [exec] (About) {(@fluxbox@/bin/fluxbox -v; @fluxbox@/bin/fluxbox -info | @gnused@/bin/sed 1d) | @xmessage@/bin/xmessage -file - -center}
|
||||
[separator]
|
||||
[exit] (Exit)
|
||||
[end]
|
||||
--
|
||||
2.26.2
|
||||
2.32.0
|
||||
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "fbmenugen";
|
||||
version = "0.85";
|
||||
version = "0.86";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trizen";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1pmms3wzkm8h41a8zrkpn6gq9m9yy5wr5rrzmb84lbacprqq6q7q";
|
||||
sha256 = "0ya7s8b5xbaplz365bnr580szxxsngrs2n7smj8vz8a7kwi0319q";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -68,7 +68,7 @@ perlPackages.buildPerlPackage rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://github.com/trizen/fbmenugen";
|
||||
description = "Simple menu generator for the Fluxbox Window Manager";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "joplin-desktop";
|
||||
version = "2.1.9";
|
||||
version = "2.3.5";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
|
@ -16,8 +16,8 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
|
||||
sha256 = {
|
||||
x86_64-linux = "1s7zydi90yzafii42m3aaf3niqlmdy2m494j2b3yrz2j26njj4q9";
|
||||
x86_64-darwin = "1pvl08yhcrnrvdybfmkigaidhfrrg42bb6rzv96zyq9w4k0l0lm8";
|
||||
x86_64-linux = "sha256-Qy/CpIEfAZ9735mwcNaJIw+qVmYXVwQ7gJuUj2lpQc4=";
|
||||
x86_64-darwin = "sha256-7I+fhcFFW/WihuUkSE5Pc8RhKszSgByP58H3sKSJbrc=";
|
||||
}.${system} or throwSystem;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "slides";
|
||||
version = "0.4.1";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maaslalani";
|
||||
repo = "slides";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cywqrqj199hmx532h4vn0j17ypswq2zkmv8qpxpayvjwimx4pwk";
|
||||
sha256 = "175g823n253d3xg8hxycw3gm1hhqb0vz8zs7xxcbdw5rlpd2hjii";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
|||
ruby
|
||||
];
|
||||
|
||||
vendorSha256 = "0y6fz9rw702mji571k0gp4kpfx7xbv7rvlnmpfjygy6lmp7wga6f";
|
||||
vendorSha256 = "13kx47amwvzyzc251iijsbwa52s8bpld4xllb4y85qkwllfnmq2g";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "94.0.4606.12",
|
||||
"sha256": "1yv34wahg1f0l35kvlm3x17wvqdg8yyzmjj6naz2lnl5qai89zr8",
|
||||
"sha256bin64": "19z9yzj6ig5ym8f9zzs8b4yixkspc0x62sz526r39803pbgs7s7i",
|
||||
"version": "94.0.4606.20",
|
||||
"sha256": "0wp9fdw7jkrzhaz8dils7k1ssd6v7kkiz4y9l81s37xxi3xj1drg",
|
||||
"sha256bin64": "059rn0jj2cajrxx57gmr0ndkgixgfqazb73rxbprqj4857w4d5da",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-08-11",
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2021.8.2";
|
||||
version = "2021.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
rev = version;
|
||||
sha256 = "sha256-5PMKVWBOWkUhmCSttbhu7UdS3dLqr0epJpQL1jfS31c=";
|
||||
sha256 = "sha256-gipLjABvJ1QK98uX7Gl6feHXUei95yHlSNkqlQ7pVg4=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
, bridge-utils
|
||||
, conntrack-tools
|
||||
, buildGoPackage
|
||||
, git
|
||||
, runc
|
||||
, kmod
|
||||
, libseccomp
|
||||
|
|
@ -44,8 +43,8 @@ with lib;
|
|||
# Those pieces of software we entirely ignore upstream's handling of, and just
|
||||
# make sure they're in the path if desired.
|
||||
let
|
||||
k3sVersion = "1.21.3+k3s1"; # k3s git tag
|
||||
k3sCommit = "1d1f220fbee9cdeb5416b76b707dde8c231121f2"; # k3s git commit at the above version
|
||||
k3sVersion = "1.21.4+k3s1"; # k3s git tag
|
||||
k3sCommit = "3e250fdbab72d88f7e6aae57446023a0567ffc97"; # k3s git commit at the above version
|
||||
|
||||
traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION
|
||||
k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION
|
||||
|
|
@ -102,7 +101,7 @@ let
|
|||
k3sRepo = fetchgit {
|
||||
url = "https://github.com/k3s-io/k3s";
|
||||
rev = "v${k3sVersion}";
|
||||
sha256 = "sha256-K4HVXFp5cpByEO4dUwmpzOuhsGh1k7X6k5aShCorTjg=";
|
||||
sha256 = "1w7drvk0bmlmqrxh1y6dxjy7dk6bdrl72pkd25lc1ir6wbzb05h9";
|
||||
};
|
||||
# Stage 1 of the k3s build:
|
||||
# Let's talk about how k3s is structured.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder,
|
||||
attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus,
|
||||
prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3,
|
||||
setuptools, fetchpatch, installShellFiles,
|
||||
setuptools, installShellFiles,
|
||||
|
||||
pytest, faker, pytest-aiohttp, aioresponses,
|
||||
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "pantalaimon";
|
||||
version = "0.9.2";
|
||||
version = "0.10.2";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -19,17 +19,9 @@ buildPythonApplication rec {
|
|||
owner = "matrix-org";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "11dfv5b2slqybisq6npmrqxrzslh4bjs4093vrc05s94046d9d9n";
|
||||
sha256 = "sha256-sjaJomKMKSZqLlKWTG7Oa87dXa5SnGQlVnrdS707A1w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# accept newer matrix-nio versions
|
||||
(fetchpatch {
|
||||
url = "https://github.com/matrix-org/pantalaimon/commit/73f68c76fb05037bd7fe71688ce39eb1f526a385.patch";
|
||||
sha256 = "0wvqcfan8yp67p6khsqkynbkifksp2422b9jy511mvhpy51sqykl";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
appdirs
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
inherit (perlPackages) PodParser;
|
||||
};
|
||||
|
||||
url_hint = callPackage ./url_hint { };
|
||||
|
||||
weechat-matrix-bridge = callPackage ./weechat-matrix-bridge {
|
||||
inherit (luaPackages) cjson luaffi;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, stdenv, fetchurl, weechat }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "url_hint";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/weechat/scripts/10671d785ea3f9619d0afd0d7a1158bfa4ee3938/python/url_hint.py";
|
||||
sha256 = "0aw59kq74yqh0qbdkldfl6l83d0bz833232xr2w4741szck43kss";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
passthru.scripts = [ "url_hint.py" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D $src $out/share/url_hint.py
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit (weechat.meta) platforms;
|
||||
description = "url_hint.py is a URL opening script.";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ eraserhd ];
|
||||
};
|
||||
}
|
||||
|
|
@ -19,16 +19,16 @@ let
|
|||
maintainers = with maintainers; [ fliegendewurst ];
|
||||
};
|
||||
|
||||
version = "0.47.5";
|
||||
version = "0.47.7";
|
||||
|
||||
desktopSource = {
|
||||
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
|
||||
sha256 = "16sm93vzlsqmrykbzdvgwszbhq79brd74zp9n9q5wrf4s44xizzv";
|
||||
sha256 = "1fcrc01wr8ln1i77q9h89i90wwyijpfp58fa717wbdvyly4860sh";
|
||||
};
|
||||
|
||||
serverSource = {
|
||||
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
|
||||
sha256 = "0jk9pf3ljzfdv7d91wxda8z9qz653qas58wsrx42gnf7zxn1l648";
|
||||
sha256 = "0qp37y3xgbhl6vj2bkwz1lfylkn82kx7n0lcfr58wxwkn00149ry";
|
||||
};
|
||||
|
||||
in {
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fastp";
|
||||
version = "0.20.1";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenGene";
|
||||
repo = "fastp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pANwppkO9pfV9vctB7HmNCzYRtf+Xt+5HMKzvFuvyFM=";
|
||||
sha256 = "sha256-XR76hNz7iGXQYSBbBandHZ+oU3wyTf1AKlu9Xeq/GyE=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitui";
|
||||
version = "0.16.2";
|
||||
version = "0.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "extrawurst";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FRPRkFGf6Z/+smK651wR6ETWrvvQ1AKalxXW6d6otIo=";
|
||||
sha256 = "sha256-UM1L95VKmUh2E56dlKo3TkNYRlib5Hg5VHGokBqTP+s=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-3ubeZgB7XNKysy6s+cdg4GDj/Mn4Mdp9VupcbBRTRh4=";
|
||||
cargoSha256 = "sha256-i/Z1pOrg7rKH5uDqkyh7V9jZRHXZ3Bhhw5UpzKWOjJ0=";
|
||||
|
||||
nativeBuildInputs = [ python3 perl ];
|
||||
buildInputs = [ openssl ]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,56 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, ghq
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gst";
|
||||
version = "5.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uetchy";
|
||||
repo = "gst";
|
||||
rev = "v${version}";
|
||||
sha256 = "0fqgkmhn84402hidxv4niy9himcdwm1h80prkfk9vghwcyynrbsj";
|
||||
};
|
||||
|
||||
vendorSha256 = "0k5xl55vzpl64gwsgaff92jismpx6y7l2ia0kx7gamd1vklf0qwh";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
ghq
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X=main.Version=${version}"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
if [[ "$("$out/bin/${pname}" --version)" == "${pname} version ${version}" ]]; then
|
||||
export HOME=$(mktemp -d)
|
||||
git config --global user.name "Test User"
|
||||
git config --global user.email "test@example.com"
|
||||
git config --global init.defaultBranch "main"
|
||||
git config --global ghq.user "user"
|
||||
ghq create test > /dev/null 2>&1
|
||||
touch $HOME/ghq/github.com/user/test/SmokeTest
|
||||
$out/bin/${pname} list | grep SmokeTest > /dev/null
|
||||
echo '${pname} smoke check passed'
|
||||
else
|
||||
echo '${pname} smoke check failed'
|
||||
return 1
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Supercharge your ghq workflow";
|
||||
homepage = "https://github.com/uetchy/gst";
|
||||
maintainers = with lib.maintainers; [ _0x4A6F ];
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gdk-pixbuf
|
||||
, gtk-engine-murrine
|
||||
|
|
@ -8,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marwaita-peppermint";
|
||||
version = "0.6";
|
||||
version = "10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0mhkkx2qa66z4b2h5iynhy63flwdf6b2phd21r1j8kp4m08dynms";
|
||||
sha256 = "09lqp82aymj3silpwmjkkf4mgv3b1xw7181ck89lz2nxb98sr9im";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Marwaita GTK theme with Peppermint Os Linux style";
|
||||
homepage = "https://www.pling.com/p/1399569/";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lib3mf";
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "3MFConsortium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1417xlxc1y5jnipixhbjfrrjgkrprbbraj8647sff9051m3hpxc3";
|
||||
sha256 = "sha256-WMTTYYgpCIM86a6Jw8iah/YVXN9T5youzEieWL/d+Bc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openexr";
|
||||
version = "3.0.5";
|
||||
version = "3.1.1";
|
||||
|
||||
outputs = [ "bin" "dev" "out" "doc" ];
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "AcademySoftwareFoundation";
|
||||
repo = "openexr";
|
||||
rev = "v${version}";
|
||||
sha256 = "0inmpby1syyxxzr0sazqvpb8j63vpj09vpkp4xi7m2qd4rxynkph";
|
||||
sha256 = "1p0l07vfpb25fx6jcgk1747v8x9xgpifx4cvvgi3g2473wlx6pyb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openxr-loader";
|
||||
version = "1.0.18";
|
||||
version = "1.0.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenXR-SDK-Source";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-Ek4gFL10/aRciCoJBNaaSX/Hdbap4X/K4k+KeAfpKDg=";
|
||||
sha256 = "sha256-LEXxqzHzTadgK2PV9Wiud9MzblDHdF4L5T4fVydRJW8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jenkins-job-builder";
|
||||
version = "3.9.0";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4a53e146843d567c375c2e61e70a840d75a412402fd78c1dd3da5642a6aaa375";
|
||||
sha256 = "sha256-8MP8YHIkxDqjPsUYv6ROmuRwcGMzPpsVCRwxga3XdYU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,28 +1,45 @@
|
|||
{ lib, fetchPypi
|
||||
, buildPythonPackage, pythonOlder
|
||||
, pytest, pytest-runner
|
||||
, parse, six, enum34
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, parse
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "parse_type";
|
||||
version = "0.5.2";
|
||||
pname = "parse-type";
|
||||
version = "0.5.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "02wclgiqky06y36b3q07b7ngpks5j0gmgl6n71ac2j2hscc0nsbz";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jenisys";
|
||||
repo = "parse_type";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CJroqJIi5DpmR8i1lr8OJ+234615PhpVUsqK91XOT3E=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest pytest-runner ];
|
||||
propagatedBuildInputs = [ parse six ] ++ lib.optional (pythonOlder "3.4") enum34;
|
||||
propagatedBuildInputs = [
|
||||
parse
|
||||
six
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
py.test tests
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace "--metadata PACKAGE_UNDER_TEST parse_type" "" \
|
||||
--replace "--metadata PACKAGE_VERSION 0.5.6" "" \
|
||||
--replace "--html=build/testing/report.html --self-contained-html" "" \
|
||||
--replace "--junit-xml=build/testing/report.xml" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "parse_type" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jenisys/parse_type";
|
||||
description = "Simplifies to build parse types based on the parse module";
|
||||
homepage = "https://github.com/jenisys/parse_type";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ alunduil ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -22,13 +22,6 @@ buildPythonPackage rec {
|
|||
sha256 = "129sz33a270v120bzl9l98nmvdzn7ns4cf9w2v18lmzlldbyz2vn";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace setup.py --replace 'pyjwt==2.0.1' 'pyjwt>=2.0.1'
|
||||
substituteInPlace setup.py --replace 'ratelimit==2.2.1' 'ratelimit>=2.2.1'
|
||||
substituteInPlace setup.py --replace 'pytz==2019.2' 'pytz>=2019.2'
|
||||
substituteInPlace setup.py --replace 'requests==2.24.0' 'requests>=2.24.0'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyjwt
|
||||
ratelimit
|
||||
|
|
@ -41,15 +34,6 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/ChrisMandich/PyFlume/issues/18
|
||||
substituteInPlace setup.py \
|
||||
--replace "pyjwt==2.0.1" "pyjwt>=2.0.1" \
|
||||
--replace "ratelimit==2.2.1" "ratelimit>=2.2.1" \
|
||||
--replace "pytz==2019.2" "pytz>=2019.2" \
|
||||
--replace "requests==2.24.0" "requests>=2.24.0"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pyflume" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -13,21 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymupdf";
|
||||
version = "1.18.16";
|
||||
version = "1.18.17";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyMuPDF";
|
||||
inherit version;
|
||||
sha256 = "b21e39098fbbe0fdf269fdb2d1dd25a3847bbf22785ee8903d3a5637c2d0b9d7";
|
||||
sha256 = "fa39ee5e91eae77818e07b6bb7e0cb0b402ad88e39a74b08626ce1c2150c5414";
|
||||
};
|
||||
|
||||
patchFlags = [ "--binary" "--ignore-whitespace" ];
|
||||
patches = [
|
||||
# Add NIX environment support.
|
||||
# Should be removed next pyMuPDF release.
|
||||
./nix-support.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '/usr/include/mupdf' ${mupdf.dev}/include/mupdf
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -36,10 +36,14 @@ LIBRARIES = {
|
||||
"opensuse": OPENSUSE,
|
||||
"fedora": FEDORA,
|
||||
"alpine": ALPINE,
|
||||
+ "nix": FEDORA,
|
||||
}
|
||||
|
||||
|
||||
def load_libraries():
|
||||
+ if os.getenv("NIX_STORE"):
|
||||
+ return LIBRARIES["nix"]
|
||||
+
|
||||
try:
|
||||
import distro
|
||||
|
||||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-engineio";
|
||||
version = "4.0.0";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miguelgrinberg";
|
||||
repo = "python-engineio";
|
||||
rev = "v${version}";
|
||||
sha256 = "00x9pmmnl1yd59wd96ivkiqh4n5nphl8cwk43hf4nqr0icgsyhar";
|
||||
sha256 = "sha256-QfX8Volz5nabGVhQLXfSD/QooxLsU6DvCq1WRkRZ6hU=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-socketio";
|
||||
version = "5.0.4";
|
||||
version = "5.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miguelgrinberg";
|
||||
repo = "python-socketio";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mpqr53mrdzk9ki24y1inpsfvjlvm7pvxf8q4d52m80i5pcd5v5q";
|
||||
sha256 = "sha256-jyTTWxShLDDnbT+MYIJIjwpn3xfIB04je78doIOG+FQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ buildGoModule rec {
|
|||
-s -w
|
||||
-X main.Version=v${version}
|
||||
-X main.DefaultBuildkitdImage=earthly/buildkitd:v${version}
|
||||
-extldflags -static
|
||||
'';
|
||||
|
||||
BUILDTAGS = "dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake
|
||||
, libiconv
|
||||
, useMimalloc ? false
|
||||
# FIXME: Test doesn't pass under rustc 1.52.1 due to different escaping of `'` in string.
|
||||
, doCheck ? false
|
||||
, doCheck ? true
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
|
@ -17,9 +16,16 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-6Tbgy77Essi3Hyd5kdJ7JJbx7RuFZQWURfRrpScvPPQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Code format and git history check require more dependencies but don't really matter for packaging.
|
||||
# So just ignore them.
|
||||
./ignore-git-and-rustfmt-tests.patch
|
||||
];
|
||||
|
||||
buildAndTestSubdir = "crates/rust-analyzer";
|
||||
|
||||
cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc";
|
||||
cargoTestFlags = lib.optional useMimalloc "--features=mimalloc";
|
||||
|
||||
nativeBuildInputs = lib.optional useMimalloc cmake;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
--- a/crates/rust-analyzer/tests/slow-tests/tidy.rs
|
||||
+++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs
|
||||
@@ -6,6 +6,7 @@ use std::{
|
||||
use xshell::{cmd, pushd, pushenv, read_file};
|
||||
|
||||
#[test]
|
||||
+#[ignore]
|
||||
fn check_code_formatting() {
|
||||
let _dir = pushd(sourcegen::project_root()).unwrap();
|
||||
let _e = pushenv("RUSTUP_TOOLCHAIN", "stable");
|
||||
@@ -138,6 +139,7 @@ fn check_cargo_toml(path: &Path, text: String) -> () {
|
||||
}
|
||||
|
||||
#[test]
|
||||
+#[ignore]
|
||||
fn check_merge_commits() {
|
||||
let stdout = cmd!("git rev-list --merges --invert-grep --author 'bors\\[bot\\]' HEAD~19..")
|
||||
.read()
|
||||
|
|
@ -389,12 +389,12 @@ final: prev:
|
|||
|
||||
bufferline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "bufferline-nvim";
|
||||
version = "2021-08-21";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "akinsho";
|
||||
repo = "bufferline.nvim";
|
||||
rev = "35ac1c1e2e6f7cbf6a1ad027d8bf019a284b28d5";
|
||||
sha256 = "1sdq5yjav7ak5lkw0kiz8mwffnxva94w1xav8y8kxy8f95b78a2g";
|
||||
rev = "21fda2cfb4c692f91e4df486dc2e28a37c628a76";
|
||||
sha256 = "05wi1zb1b3b08av3l8i40jggvb2mpkqmg0w8dqhxannblfkk8h8c";
|
||||
};
|
||||
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
|
||||
};
|
||||
|
|
@ -449,12 +449,12 @@ final: prev:
|
|||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2021-08-22";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "b84f08364a3b3a6eb9795ecdab418d1e786b0be4";
|
||||
sha256 = "0jh6xbiqrnldk1l2p1jqfi34wwci7nx2pxhvcv0fi9mb7r5bzvmw";
|
||||
rev = "d8089b752346fdccdd4fe85cec82c0f9919823fa";
|
||||
sha256 = "12nn4467jhhfi2vwsywzf6fqadwjsymmmmny5d4jsbz3l5xhcfmz";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
|
@ -581,12 +581,12 @@ final: prev:
|
|||
|
||||
cmp-nvim-lsp = buildVimPluginFrom2Nix {
|
||||
pname = "cmp-nvim-lsp";
|
||||
version = "2021-08-16";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "cmp-nvim-lsp";
|
||||
rev = "09e4ab0fb66ad07d64b311d1bd7916905bf3364b";
|
||||
sha256 = "0573ywym8favv12g78qln4zx15j1ic26y8j2rbdlh8n22zll0v1x";
|
||||
rev = "899f70af0786d4100fb29987b9ab03eac7eedd6a";
|
||||
sha256 = "1gw478b77smkn3k42h2q3ddq2kcd7vm6mnmjmksvbsfv5xp9pln0";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/";
|
||||
};
|
||||
|
|
@ -713,12 +713,12 @@ final: prev:
|
|||
|
||||
coc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coc-nvim";
|
||||
version = "2021-08-22";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc.nvim";
|
||||
rev = "5f5e3135de04c9e245c1ecf53b67836c692fd06a";
|
||||
sha256 = "1cljdxgqxiyq6gg71pg9k5b8iwvj8nzg4m7llzj957lrhfpavfxg";
|
||||
rev = "595e60210f7d0c9e5a21672428bae8c3f518a3b9";
|
||||
sha256 = "0mdqb07avwk2f5h5xylq2lkg56jk82dccyrxb17cxfw2dsgbs93m";
|
||||
};
|
||||
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
||||
};
|
||||
|
|
@ -966,12 +966,12 @@ final: prev:
|
|||
|
||||
Coqtail = buildVimPluginFrom2Nix {
|
||||
pname = "Coqtail";
|
||||
version = "2021-08-16";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "whonore";
|
||||
repo = "Coqtail";
|
||||
rev = "358747255db85579498dfc6e03dcd808d5b81d34";
|
||||
sha256 = "086q1bx6xz3qzkyll6lszcgljyz8b5w4ywa8wvcv71al3cxd9n7b";
|
||||
rev = "b292682c16176f961e11e1e68eb799d9b1b3e4e9";
|
||||
sha256 = "1278z0rgvg65kprxyg02yl2fixrfy9pg5fj3d796nc607ipzdhvb";
|
||||
};
|
||||
meta.homepage = "https://github.com/whonore/Coqtail/";
|
||||
};
|
||||
|
|
@ -1508,12 +1508,12 @@ final: prev:
|
|||
|
||||
dracula-vim = buildVimPluginFrom2Nix {
|
||||
pname = "dracula-vim";
|
||||
version = "2021-08-06";
|
||||
version = "2021-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "vim";
|
||||
rev = "074a6b34952f2d14be196c217a3995749670f627";
|
||||
sha256 = "0vvz81dg64pp0x08imcicrqkp4z90ahfxsikhswraslklc1k1ar1";
|
||||
rev = "d1ff992bf605c098577b7f0e632e3ea887b71520";
|
||||
sha256 = "04zmqz270willnpfsf61pa9xx5i5phx1g6r6nw317r9rs0dnk0wj";
|
||||
};
|
||||
meta.homepage = "https://github.com/dracula/vim/";
|
||||
};
|
||||
|
|
@ -1555,6 +1555,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
|
||||
};
|
||||
|
||||
editorconfig-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "editorconfig-nvim";
|
||||
version = "2021-08-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gpanders";
|
||||
repo = "editorconfig.nvim";
|
||||
rev = "8840aacb025af17e42c6c215a34568f3dbcf94f6";
|
||||
sha256 = "1flr9mhz33bcrqp6iwnvhsz18hrd4ynvh7qdihnpd5qn0mwf034w";
|
||||
};
|
||||
meta.homepage = "https://github.com/gpanders/editorconfig.nvim/";
|
||||
};
|
||||
|
||||
elm-vim = buildVimPluginFrom2Nix {
|
||||
pname = "elm-vim";
|
||||
version = "2020-09-23";
|
||||
|
|
@ -1823,12 +1835,12 @@ final: prev:
|
|||
|
||||
friendly-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "friendly-snippets";
|
||||
version = "2021-08-19";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafamadriz";
|
||||
repo = "friendly-snippets";
|
||||
rev = "2d7bcab215c8b7a8f889b371c4060dda2a6c6541";
|
||||
sha256 = "0kxm6nl167b51gjwli64d9qp5s1cdy9za0zfq9hy8phivjk2pmyl";
|
||||
rev = "d438b0fc71447c502029320377f0ed53603b9e0c";
|
||||
sha256 = "0hnn5rlm9gb59afbfi78rs5lp9fq844x8qrpqnwi0kcz8b3d6bp7";
|
||||
};
|
||||
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
|
||||
};
|
||||
|
|
@ -2039,12 +2051,12 @@ final: prev:
|
|||
|
||||
gitsigns-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "gitsigns-nvim";
|
||||
version = "2021-08-16";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "70705a33ab816c61011ed9c97ebb5925eaeb89c1";
|
||||
sha256 = "1bcrba17icpdmk69p284kb2k3jpwimnbcn5msa7xq46wj97hy12k";
|
||||
rev = "1ddb1f64f5fb15dac2d02e52af918d1fb11feb2d";
|
||||
sha256 = "0y33dsxhw55h28kvqq3655cmnl4nq4z497v69xa72872gf1dsi80";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
||||
};
|
||||
|
|
@ -2808,12 +2820,12 @@ final: prev:
|
|||
|
||||
lightspeed-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lightspeed-nvim";
|
||||
version = "2021-08-21";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggandor";
|
||||
repo = "lightspeed.nvim";
|
||||
rev = "177ef542f6f26147f16be7b07c1e6fcfa66bf128";
|
||||
sha256 = "0c6bwdgi2d43jar05zcfarsas3r7y9v7igr3ldsgd7491wf8hjhg";
|
||||
rev = "9a613fb6ea8b8a41e7956f272c8cd0dc9a65102b";
|
||||
sha256 = "1l19cn04ibw0pd1isw02mllqxzp4gy4jd0mnv4mzf24ydjkyixkn";
|
||||
};
|
||||
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
|
||||
};
|
||||
|
|
@ -2964,12 +2976,12 @@ final: prev:
|
|||
|
||||
luasnip = buildVimPluginFrom2Nix {
|
||||
pname = "luasnip";
|
||||
version = "2021-08-22";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "l3mon4d3";
|
||||
repo = "luasnip";
|
||||
rev = "6d398e3443933a68607215538e614662d2ffa5c8";
|
||||
sha256 = "0ll54nqa3lxzhxyjsya8y4qiyyicfsp5yz25mjdgqmvvf4i39jxz";
|
||||
rev = "2ee1dfa64e14201a1016cd7088b612a0d2a116e2";
|
||||
sha256 = "0hqj4xv3mxdcknjqhazvnsk01jdc3x6qqgyyf6sy5d4kxm5q9q0w";
|
||||
};
|
||||
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
|
||||
};
|
||||
|
|
@ -3468,12 +3480,12 @@ final: prev:
|
|||
|
||||
neosnippet-vim = buildVimPluginFrom2Nix {
|
||||
pname = "neosnippet-vim";
|
||||
version = "2021-08-20";
|
||||
version = "2021-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "neosnippet.vim";
|
||||
rev = "c1634915a8f798cded2bef39c6f24a9d988aca10";
|
||||
sha256 = "02cvrxfy6n7z5xl5ijw2fkz81j7lm18agyx6qs11a5l5f515h4a2";
|
||||
rev = "3f6f5f8ad34d63ecb1060dbd6d7e2513238da528";
|
||||
sha256 = "14f0ksrn4grkpjfn766hxg1p19dryngxai33b2322dy0qaw244d2";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shougo/neosnippet.vim/";
|
||||
};
|
||||
|
|
@ -3696,12 +3708,12 @@ final: prev:
|
|||
|
||||
null-ls-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "null-ls-nvim";
|
||||
version = "2021-08-18";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "null-ls.nvim";
|
||||
rev = "f907d945d0285f42dc9ebffbc075ea725b93b6aa";
|
||||
sha256 = "1jg6wxknbzirq9j880yki8bm8v1zdkk60fyis67syf722vric9i8";
|
||||
rev = "414ed4690583315705955c80cdf52e86cfc134aa";
|
||||
sha256 = "084n4x0ikhxh9h33cqyzr3ajxd9zm9x7lh2q8dv0i5jlyxyb1grf";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
|
||||
};
|
||||
|
|
@ -3864,12 +3876,12 @@ final: prev:
|
|||
|
||||
nvim-dap-ui = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-dap-ui";
|
||||
version = "2021-08-15";
|
||||
version = "2021-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcarriga";
|
||||
repo = "nvim-dap-ui";
|
||||
rev = "c9fc568ca157429cd76986ca2bfaa60488a7d2fb";
|
||||
sha256 = "09jk0v2ki0hsy1m2hg3dwi66yaqn670vnjbbrbdxrq55n260gds3";
|
||||
rev = "8f34bb2e4700d83a84402ec776d4d3336e0e63f9";
|
||||
sha256 = "1lfrmi48vkkr92zfwzr5mbdczfw2w9lw04bvwnx77ir798lbp6mc";
|
||||
};
|
||||
meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
|
||||
};
|
||||
|
|
@ -3912,24 +3924,24 @@ final: prev:
|
|||
|
||||
nvim-gps = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-gps";
|
||||
version = "2021-08-22";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "smiteshp";
|
||||
repo = "nvim-gps";
|
||||
rev = "f365bc331c1fd752429427cdfed4aa142e9fc74f";
|
||||
sha256 = "1phzrw37y9gzcimy5r3phy2x53c9b2q5l3v5ipcx1k4q6pfkh026";
|
||||
rev = "a4be468d8991840641c8db5cc6bbbffc3dafd79d";
|
||||
sha256 = "09mn8gysbs54bhicg9s52s87c472h10cmvi76fyljgxrkpbjssw3";
|
||||
};
|
||||
meta.homepage = "https://github.com/smiteshp/nvim-gps/";
|
||||
};
|
||||
|
||||
nvim-highlite = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-highlite";
|
||||
version = "2021-08-21";
|
||||
version = "2021-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Iron-E";
|
||||
repo = "nvim-highlite";
|
||||
rev = "dd827f091554065736105c72e1256d1fc8f4f445";
|
||||
sha256 = "11jndab13dhd6pqzbd385awzhmxvzz68aza09qmfqkjvmcs1gy8c";
|
||||
rev = "671869d981c47ccb2f7370145062a9cd9967d17b";
|
||||
sha256 = "14fs6h79ccb0mp9mcllqz42pkqialvs7gwp83xlpgy0kphgksndf";
|
||||
};
|
||||
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
|
||||
};
|
||||
|
|
@ -3984,12 +3996,12 @@ final: prev:
|
|||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2021-08-20";
|
||||
version = "2021-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "9adbacf29835bf521a99a8d3f0b6f2157b1b9166";
|
||||
sha256 = "0k4b6qsrvlgxr600x9wgkfdraqczx49zqyqfz88xf6pjbx0zyach";
|
||||
rev = "5b0fa84ee35006e06142f98b8a5b28d79cfa5000";
|
||||
sha256 = "0in0r3irawmgxp1prwryw3dpxj7gd6pviv14w8a7hnw1sd2g84l8";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
|
|
@ -5139,12 +5151,12 @@ final: prev:
|
|||
|
||||
sql-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "sql-nvim";
|
||||
version = "2021-08-21";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tami5";
|
||||
repo = "sql.nvim";
|
||||
rev = "eb1f0512c3b781740090877b39bc9332c01edb46";
|
||||
sha256 = "1dykwqv01fcf8k2q8fz7z4zgc9wh4v551b9mwm44n2lqzg35swzg";
|
||||
rev = "a0370391af2998e11c6320ba08a57d5a1827c0ed";
|
||||
sha256 = "13k9rdjwrmrv6vm2rn2b3ga02fcmig2ainllh8dxzpln3c3idwbp";
|
||||
};
|
||||
meta.homepage = "https://github.com/tami5/sql.nvim/";
|
||||
};
|
||||
|
|
@ -5247,12 +5259,12 @@ final: prev:
|
|||
|
||||
symbols-outline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "symbols-outline-nvim";
|
||||
version = "2021-08-21";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "simrat39";
|
||||
repo = "symbols-outline.nvim";
|
||||
rev = "40b7d5cbaa51c031061827c48e6a05748db7e91d";
|
||||
sha256 = "1mk4g1kgg2as3kk010wd9x2f4v60an68mqflpk97ng6a52laj5nw";
|
||||
rev = "6f376ef4ceb88ff7f0d9e3141dbe2a2e0854e785";
|
||||
sha256 = "1882gb76hp4zpwyljrzl26qjwyyvnavhfv529nj5z5x41vyhsks5";
|
||||
};
|
||||
meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/";
|
||||
};
|
||||
|
|
@ -5501,12 +5513,12 @@ final: prev:
|
|||
|
||||
telescope-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-nvim";
|
||||
version = "2021-08-21";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "8381a215e091dc9e1f6ad9ceaeadf35ef3cfed8f";
|
||||
sha256 = "0cn1ynvva8nzjyrp285ficfa74wky0gikii2hysdi0g4ndnh6ypa";
|
||||
rev = "79dc995f820150d5de880c08e814af327ff7e965";
|
||||
sha256 = "0acyzc0k14dvd7j4ihvg84fz9lp1alwbf6qbnq083y6pd37mhj7b";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
|
|
@ -5622,12 +5634,12 @@ final: prev:
|
|||
|
||||
toggleterm-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "toggleterm-nvim";
|
||||
version = "2021-08-22";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "akinsho";
|
||||
repo = "toggleterm.nvim";
|
||||
rev = "5a4429d33cc8f286a0ad30b89084ec5284d6a652";
|
||||
sha256 = "0rflwn9bbnffly5i66n3hxrf9cgbpqphqc2p6bjpxlyydda1vdx3";
|
||||
rev = "317caf587448fc8d42189d2dc27dab076857aeb0";
|
||||
sha256 = "1gl27njvik0dfg9412gwnqi6ar6nqhpfhliyjm5w96pxaa6xlafp";
|
||||
};
|
||||
meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
|
||||
};
|
||||
|
|
@ -6654,12 +6666,12 @@ final: prev:
|
|||
|
||||
vim-dadbod = buildVimPluginFrom2Nix {
|
||||
pname = "vim-dadbod";
|
||||
version = "2021-06-02";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-dadbod";
|
||||
rev = "9e4fdb8ab029c0436728a96e1c92677737c2e784";
|
||||
sha256 = "1rmiza1km214mvlrdaqycv5hk8ki35giab11b9ggwcigbh743h01";
|
||||
rev = "6f8b99868fd5560d6eb47f82ca76ec62e3d5ae78";
|
||||
sha256 = "0n1hvyv9555rgi3qajy3d59v1nqdwcrr0l4nqzc0pr0cg9q7d6g3";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-dadbod/";
|
||||
};
|
||||
|
|
@ -7170,12 +7182,12 @@ final: prev:
|
|||
|
||||
vim-fugitive = buildVimPluginFrom2Nix {
|
||||
pname = "vim-fugitive";
|
||||
version = "2021-08-22";
|
||||
version = "2021-08-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-fugitive";
|
||||
rev = "5d1a276b455dd9a32375a5ac84050adff67062e3";
|
||||
sha256 = "1bm3fwbg9nmdxpvaqrs31g88ij5b5wxip2s4j9v1i0c0w5jplxjn";
|
||||
rev = "8cdb51622fbdbf780edff35ee22d74ad9983698e";
|
||||
sha256 = "18073gnl90n7h8j3rk6shs79455svwa47n5jxyb44m1957hvzfgb";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-fugitive/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -193,6 +193,7 @@ google/vim-jsonnet
|
|||
google/vim-maktaba
|
||||
gorkunov/smartpairs.vim
|
||||
gotcha/vimelette
|
||||
gpanders/editorconfig.nvim
|
||||
gregsexton/gitv
|
||||
gruvbox-community/gruvbox as gruvbox-community
|
||||
gu-fan/riv.vim
|
||||
|
|
|
|||
|
|
@ -917,6 +917,18 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
lokalise.i18n-ally = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "i18n-ally";
|
||||
publisher = "Lokalise";
|
||||
version = "2.7.1";
|
||||
sha256 = "sha256-nHBYRSiPQ5ucWPr9VCUgMrosloLnVj40Fh+CEBvWONE=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
mads-hartmann.bash-ide-vscode = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "mads-hartmann";
|
||||
|
|
|
|||
|
|
@ -77,8 +77,8 @@ in runBuildTests {
|
|||
'false': false
|
||||
float: 3.141
|
||||
list:
|
||||
- null
|
||||
- null
|
||||
- null
|
||||
- null
|
||||
'null': null
|
||||
path: ${./formats.nix}
|
||||
str: foo
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "thanos";
|
||||
version = "0.19.0";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "thanos-io";
|
||||
repo = "thanos";
|
||||
sha256 = "sha256-FryVKOabokw2+RyD94QLVpC9ZGIHPuSXZf5H+eitj80=";
|
||||
sha256 = "sha256-3jEPfYRewuXTk39sfp6MFKu0LYCzj/VEQTJVUUSkbZk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-GBjPMZ6BwUOKywNf1Bc2WeA14qvKQ0R5gWvVxgO/7Lo=";
|
||||
vendorSha256 = "sha256-rXfYlrTm0Av9Sxq+jdxsxIDvJQIo3rcBTydtiXnifTw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config
|
||||
, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_3, libiconv, openssl, python
|
||||
, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python
|
||||
, v4l-utils, which, zlib }:
|
||||
|
||||
let
|
||||
|
|
@ -29,7 +29,7 @@ in stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
buildInputs = [
|
||||
avahi dbus gettext git gnutar gzip bzip2 ffmpeg_3 libiconv openssl python
|
||||
avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python
|
||||
which zlib
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,4 +5,8 @@ patch: [
|
|||
(patch "002" "1gjx9zqcm407am3n2sh44b8dxm48kgm15rzfiijqxr01m0hn3shm")
|
||||
(patch "003" "1cdnpbfc64yhvkjj4d12s9ywp11g195vzfl1cab24sq55wkcrwi2")
|
||||
(patch "004" "11iwhy6v562bv0kk7lwj7f5jj65ma9bblivy0v02h3ggcibbdbls")
|
||||
(patch "005" "19bdyigdr81824nxvqr6a7k0cax60wq7376j6b91afbnwvlvbjyc")
|
||||
(patch "006" "051x8wlwrqk0yr0zg378vh824iklfl5g9pkmcdf62qp8gn9pvqbm")
|
||||
(patch "007" "0fir80pp1gmlpadmqcgkrv4y119pc7xllchjzg05fd7px73viz5c")
|
||||
(patch "008" "1lfjgshk8i9vch92p5wgc9r90j3phw79aa7gbai89w183b2z6b7j")
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell --pure -i bash -p wget -p gnupg -p cacert
|
||||
#!nix-shell --pure -i bash -p wget -p gnupg -p cacert -p nix
|
||||
|
||||
# Update patch set for GNU Bash or Readline.
|
||||
|
||||
if [ $# -ne 2 ]
|
||||
then
|
||||
echo "Usage: $(basename $0) PROJECT VERSION"
|
||||
echo "Usage: $(basename "$0") PROJECT VERSION"
|
||||
echo ""
|
||||
echo "Update the patch set for PROJECT (one of \`bash' or \`readline') for"
|
||||
echo "the given version (e.g., \`4.0'). Produce \`PROJECT-patches.nix'."
|
||||
|
|
@ -14,14 +14,12 @@ fi
|
|||
|
||||
PROJECT="$1"
|
||||
VERSION="$2"
|
||||
VERSION_CONDENSED="$(echo $VERSION | sed -es/\\.//g)"
|
||||
PATCH_LIST="$PROJECT-$VERSION-patches.nix"
|
||||
DIR=$(dirname "$0")
|
||||
VERSION_CONDENSED="$(echo "$VERSION" | sed -es/\\.//g)"
|
||||
PATCH_LIST="$DIR/$PROJECT-$VERSION-patches.nix"
|
||||
|
||||
set -e
|
||||
|
||||
start=1
|
||||
end=100 # must be > 99 for correct padding
|
||||
|
||||
rm -vf "$PATCH_LIST"
|
||||
|
||||
wget "https://tiswww.case.edu/php/chet/gpgkey.asc"
|
||||
|
|
@ -35,18 +33,20 @@ rm gpgkey.asc{,.md5}
|
|||
echo "patch: [" ) \
|
||||
>> "$PATCH_LIST"
|
||||
|
||||
for i in `seq -w $start $end`
|
||||
for i in {001..100}
|
||||
do
|
||||
wget ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i || break
|
||||
wget ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i.sig
|
||||
gpg --verify $PROJECT$VERSION_CONDENSED-$i.sig
|
||||
echo "(patch \"$i\" \"$(nix-hash --flat --type sha256 --base32 $PROJECT$VERSION_CONDENSED-$i)\")" \
|
||||
wget -P "$DIR" "ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i" || break
|
||||
wget -P "$DIR" "ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i.sig"
|
||||
gpg --verify "$DIR/$PROJECT$VERSION_CONDENSED-$i.sig"
|
||||
hash=$(nix-hash --flat --type sha256 --base32 "$DIR/$PROJECT$VERSION_CONDENSED-$i")
|
||||
echo "(patch \"$i\" \"$hash\")" \
|
||||
>> "$PATCH_LIST"
|
||||
|
||||
rm -f $PROJECT$VERSION_CONDENSED-$i{,.sig}
|
||||
rm -f "$DIR/$PROJECT$VERSION_CONDENSED-$i"{,.sig}
|
||||
done
|
||||
|
||||
echo "]" >> "$PATCH_LIST"
|
||||
|
||||
echo "Got $(expr $i - 1) patches."
|
||||
# bash interprets numbers starting with 0 as octals
|
||||
echo "Got $((10#$i - 1)) patches."
|
||||
echo "Patch list has been written to \`$PATCH_LIST'."
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@ with rec {
|
|||
|
||||
gccStdenv.mkDerivation rec {
|
||||
pname = "astc-encoder";
|
||||
version = "3.1";
|
||||
version = "3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ARM-software";
|
||||
repo = "astc-encoder";
|
||||
rev = version;
|
||||
sha256 = "sha256-WWxk8F1MtFv1tWbSs45fmu4k9VCAAOjJP8zBz80zLTo=";
|
||||
sha256 = "sha256-1GVMzM4+viVqurkzJqTL3Yszld5zLmpjygT/z74HMLs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.4.8";
|
||||
version = "0.4.9";
|
||||
pname = "dateutils";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz";
|
||||
sha256 = "0061f36axskm7yq9cp64x5a5phil8d3zgcd668nfmqzk9ji58w1z";
|
||||
sha256 = "1hy96h9imxdbg9y7305mgv4grr6x4qic9xy3vhgh15lvjkcmc0kr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
22
pkgs/tools/misc/dutree/default.nix
Normal file
22
pkgs/tools/misc/dutree/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ fetchFromGitHub, lib, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dutree";
|
||||
version = "0.2.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nachoparker";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1720295nxwr6r5yr6zhk2cw5y2l4w862f5wm9v7jjmf3a840yl8p";
|
||||
};
|
||||
|
||||
cargoSha256 = "0gg1w0xx36aswfm0y53nqwwz7zds25ysmklbrc8v2r91j74bhkzw";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to analyze file system usage written in Rust";
|
||||
homepage = "https://github.com/nachoparker/dutree";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, appimageTools, fetchurl }: let
|
||||
{ lib, appimageTools, fetchurl, nodePackages }: let
|
||||
pname = "flexoptix-app";
|
||||
version = "5.9.0";
|
||||
version = "5.11.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${name}.AppImage";
|
||||
url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage";
|
||||
sha256 = "0gbqaj9b11mxx0knmmh2d5863kaslbb3r6c4h8rjhg8qy4cws7hj";
|
||||
sha256 = "sha256:1hzdb2fbkwpsf0d3ws4z32blk6549jwhf1lrlqmcxhzqfvkr4gin";
|
||||
};
|
||||
|
||||
udevRules = fetchurl {
|
||||
|
|
@ -14,12 +14,20 @@
|
|||
sha256 = "0mr1bhgvavq1ax4206z1vr2y64s3r676w9jjl9ysziklbrsvk5rr";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
};
|
||||
appimageContents = (appimageTools.extract { inherit name src; }).overrideAttrs (oA: {
|
||||
buildCommand = ''
|
||||
${oA.buildCommand}
|
||||
|
||||
in appimageTools.wrapType2 {
|
||||
inherit name src;
|
||||
# Get rid of the autoupdater
|
||||
${nodePackages.asar}/bin/asar extract $out/resources/app.asar app
|
||||
sed -i 's/async isUpdateAvailable.*/async isUpdateAvailable(updateInfo) { return false;/g' app/node_modules/electron-updater/out/AppUpdater.js
|
||||
${nodePackages.asar}/bin/asar pack app $out/resources/app.asar
|
||||
'';
|
||||
});
|
||||
|
||||
in appimageTools.wrapAppImage {
|
||||
inherit name;
|
||||
src = appimageContents;
|
||||
|
||||
multiPkgs = null; # no 32bit needed
|
||||
extraPkgs = { pkgs, ... }@args: [
|
||||
|
|
@ -27,11 +35,14 @@ in appimageTools.wrapType2 {
|
|||
] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args;
|
||||
|
||||
extraInstallCommands = ''
|
||||
# Add desktop convencience stuff
|
||||
mv $out/bin/{${name},${pname}}
|
||||
install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications
|
||||
install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps
|
||||
substituteInPlace $out/share/applications/flexoptix-app.desktop \
|
||||
--replace 'Exec=AppRun' "Exec=$out/bin/${pname}"
|
||||
--replace 'Exec=AppRun' "Exec=$out/bin/${pname} --"
|
||||
|
||||
# Add udev rules
|
||||
mkdir -p $out/lib/udev/rules.d
|
||||
ln -s ${udevRules} $out/lib/udev/rules.d/99-tprogrammer.rules
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mc";
|
||||
version = "4.8.26";
|
||||
version = "4.8.27";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc=";
|
||||
sha256 = "sha256-Mb5ZIl/6mSCBbpqLO+CrIloW0Z5Pr0aJDyW9/6AqT/Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook unzip ]
|
||||
|
|
|
|||
|
|
@ -1,23 +1,54 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake
|
||||
, cli11, nlohmann_json, curl, libarchive, libyamlcpp, libsolv, reproc
|
||||
}:
|
||||
|
||||
let
|
||||
libsolv' = libsolv.overrideAttrs (oldAttrs: {
|
||||
cmakeFlags = oldAttrs.cmakeFlags ++ [
|
||||
"-DENABLE_CONDA=true" # Maybe enable this in the original libsolv package? No idea about the implications.
|
||||
"-DENABLE_CONDA=true"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Patch added by the mamba team
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/mamba-org/boa-forge/f766da0cc18701c4d107a41de22417a65b53cc2d/libsolv/add_strict_repo_prio_rule.patch";
|
||||
sha256 = "19c47i5cpyy88nxskf7k6q6r43i55w61jvnz7fc2r84hpjkcrv7r";
|
||||
})
|
||||
# Patch added by the mamba team
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/mamba-org/boa-forge/f766da0cc18701c4d107a41de22417a65b53cc2d/libsolv/conda_variant_priorization.patch";
|
||||
sha256 = "1iic0yx7h8s662hi2jqx68w5kpyrab4fr017vxd4wyxb6wyk35dd";
|
||||
})
|
||||
# Patch added by the mamba team
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/mamba-org/boa-forge/f766da0cc18701c4d107a41de22417a65b53cc2d/libsolv/memcpy_to_memmove.patch";
|
||||
sha256 = "1c9ir40l6crcxllj5zwhzbrbgibwqaizyykd0vip61gywlfzss64";
|
||||
})
|
||||
];
|
||||
});
|
||||
|
||||
# fails linking with yaml-cpp 0.7.x
|
||||
libyamlcpp' = libyamlcpp.overrideAttrs (oldAttrs: rec {
|
||||
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jbeder";
|
||||
repo = "yaml-cpp";
|
||||
rev = "yaml-cpp-${version}";
|
||||
sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s";
|
||||
};
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "micromamba";
|
||||
version = "0.14.1";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mamba-org";
|
||||
repo = "mamba";
|
||||
rev = version;
|
||||
sha256 = "0a5kmwk44ll4d8b2akjc0vm6ap9jfxclcw4fclvjxr2in3am9256";
|
||||
sha256 = "1zksp4zqj4wn9p9jb1qx1acajaz20k9xnm80yi7bab2d37y18hcw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
@ -27,7 +58,7 @@ stdenv.mkDerivation rec {
|
|||
nlohmann_json
|
||||
curl
|
||||
libarchive
|
||||
libyamlcpp
|
||||
libyamlcpp'
|
||||
libsolv'
|
||||
reproc
|
||||
# python3Packages.pybind11 # Would be necessary if someone wants to build with bindings I guess.
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cosign";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-j1C4OGyVY41bG+rRr6chbii94H4yeRCum52A8XcnP6g=";
|
||||
sha256 = "sha256-FG6LAaz6n2l77Wr7SYmwzL10G5gyHPCPG05hQlsOQBI=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
vendorSha256 = "sha256-9/KrgokCqSWqC4nOgA1e9H0sOx6O/ZFGFEPxiPEKoNI=";
|
||||
vendorSha256 = "sha256-OKQVgF/pg4cigMkckX/dclieHCoD39ltR+DegaUfSDk=";
|
||||
|
||||
excludedPackages = "\\(copasetic\\)";
|
||||
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "step-ca";
|
||||
version = "0.16.0";
|
||||
version = "0.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smallstep";
|
||||
repo = "certificates";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8gesSfyL5ne0JqbB/TvEkQDZziTzJmsnIV+MTOfy3jk=";
|
||||
sha256 = "sha256-JDoiz/BX8zB+qdwlGPUCa30R+pwWWtjEiXHP5LxdPAE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-q5hwgx54ca9SwQfkLB5NKvon9o1Djb1Y5rXPKx3HQDU=";
|
||||
vendorSha256 = "sha256-cFuLW0qkI/l/TvYwQZA2bLlWYjs1hdbQJ5jU7xiuFZI=";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-buildid=" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terrascan";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accurics";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DTwA8nHWKOXeha0TBoEGJuoUedxJVev0R0GnHuaHEMc=";
|
||||
sha256 = "sha256-IF5BDe6XnOR7F/ajYBbMuFpIxUawgd/Oo2AthL5aeWE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-gDhEaJ444d7fITVaEkH5RXMykmZyXjC+mPfaa2vkpIk=";
|
||||
vendorSha256 = "sha256-PZM8OWvjj8681/CWVE896f3vRHnkNeJj2w/aoOFZ9P0=";
|
||||
|
||||
# Tests want to download a vulnerable Terraform project
|
||||
doCheck = false;
|
||||
|
|
|
|||
20
pkgs/tools/text/runiq/default.nix
Normal file
20
pkgs/tools/text/runiq/default.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{ fetchCrate, lib, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "runiq";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "0xhd1z8mykxg9kiq8nw5agy1jxfk414czq62xm1s13ssig3h7jqj";
|
||||
};
|
||||
|
||||
cargoSha256 = "1g4yfz5xq9lqwh0ggyn8kn8bnzrqfmh7kx455md5ranrqqh0x5db";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An efficient way to filter duplicate lines from input, à la uniq";
|
||||
homepage = "https://github.com/whitfin/runiq";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5185,6 +5185,8 @@ with pkgs;
|
|||
|
||||
ghq = callPackage ../applications/version-management/git-and-tools/ghq { };
|
||||
|
||||
gst = callPackage ../applications/version-management/git-and-tools/gst { };
|
||||
|
||||
ghr = callPackage ../applications/version-management/git-and-tools/ghr { };
|
||||
|
||||
gibberish-detector = with python3Packages; toPythonApplication gibberish-detector;
|
||||
|
|
@ -12605,7 +12607,7 @@ with pkgs;
|
|||
};
|
||||
|
||||
beam = callPackage ./beam-packages.nix { };
|
||||
beam_nox = callPackage ./beam-packages.nix { wxSupport = false; };
|
||||
beam_nox = callPackage ./beam-packages.nix { beam = beam_nox; wxSupport = false; };
|
||||
|
||||
inherit (beam.interpreters)
|
||||
erlang erlangR24 erlangR23 erlangR22 erlangR21
|
||||
|
|
@ -23561,6 +23563,8 @@ with pkgs;
|
|||
|
||||
du-dust = callPackage ../tools/misc/dust { };
|
||||
|
||||
dutree = callPackage ../tools/misc/dutree { };
|
||||
|
||||
devede = callPackage ../applications/video/devede { };
|
||||
|
||||
denemo = callPackage ../applications/audio/denemo { };
|
||||
|
|
@ -31581,6 +31585,8 @@ with pkgs;
|
|||
|
||||
run-scaled = callPackage ../tools/X11/run-scaled { };
|
||||
|
||||
runiq = callPackage ../tools/text/runiq { };
|
||||
|
||||
runit = callPackage ../tools/system/runit { };
|
||||
|
||||
refind = callPackage ../tools/bootloaders/refind { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue