Merge master into haskell-updates
This commit is contained in:
commit
3ef2d0b236
3
.github/CODEOWNERS
vendored
3
.github/CODEOWNERS
vendored
|
@ -248,3 +248,6 @@
|
|||
/pkgs/development/compilers/nim @ehmry
|
||||
/pkgs/development/nim-packages @ehmry
|
||||
/pkgs/top-level/nim-packages.nix @ehmry
|
||||
|
||||
# terraform providers
|
||||
/pkgs/applications/networking/cluster/terraform-providers @zowoq
|
||||
|
|
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -3,6 +3,7 @@
|
|||
.*.swp
|
||||
.*.swo
|
||||
.idea/
|
||||
.vscode/
|
||||
outputs/
|
||||
result
|
||||
result-*
|
||||
|
|
|
@ -12851,6 +12851,12 @@
|
|||
githubId = 2242427;
|
||||
name = "Yoann Ono";
|
||||
};
|
||||
yana = {
|
||||
email = "yana@riseup.net";
|
||||
github = "alpakido";
|
||||
githubId = 1643293;
|
||||
name = "Yana Timoshenko";
|
||||
};
|
||||
yarny = {
|
||||
email = "41838844+Yarny0@users.noreply.github.com";
|
||||
github = "Yarny0";
|
||||
|
@ -12870,12 +12876,6 @@
|
|||
githubId = 73759599;
|
||||
name = "Lara A.";
|
||||
};
|
||||
yegortimoshenko = {
|
||||
email = "yegortimoshenko@riseup.net";
|
||||
github = "yegortimoshenko";
|
||||
githubId = 1643293;
|
||||
name = "Yegor Timoshenko";
|
||||
};
|
||||
yesbox = {
|
||||
email = "jesper.geertsen.jonsson@gmail.com";
|
||||
github = "yesbox";
|
||||
|
@ -13434,6 +13434,12 @@
|
|||
github = "zeri42";
|
||||
githubId = 68825133;
|
||||
};
|
||||
zombiezen = {
|
||||
name = "Ross Light";
|
||||
email = "ross@zombiezen.com";
|
||||
github = "zombiezen";
|
||||
githubId = 181535;
|
||||
};
|
||||
zseri = {
|
||||
name = "zseri";
|
||||
email = "zseri.devel@ytrizja.de";
|
||||
|
|
|
@ -169,6 +169,20 @@
|
|||
~100MB for python itself).
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>documentation.man</literal> has been refactored to
|
||||
support choosing a man implementation other than GNU’s
|
||||
<literal>man-db</literal>. For this,
|
||||
<literal>documentation.man.manualPages</literal> has been
|
||||
renamed to
|
||||
<literal>documentation.man.man-db.manualPages</literal>. If
|
||||
you want to use the new alternative man implementation
|
||||
<literal>mandoc</literal>, add
|
||||
<literal>documentation.man = { enable = true; man-db.enable = false; mandoc.enable = true; }</literal>
|
||||
to your configuration.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.05-notable-changes">
|
||||
|
|
|
@ -62,6 +62,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
This has the added benefit to reduce the closure size of `ipython` from ~400MB to ~160MB
|
||||
(including ~100MB for python itself).
|
||||
|
||||
- `documentation.man` has been refactored to support choosing a man implementation other than GNU's `man-db`. For this, `documentation.man.manualPages` has been renamed to `documentation.man.man-db.manualPages`. If you want to use the new alternative man implementation `mandoc`, add `documentation.man = { enable = true; man-db.enable = false; mandoc.enable = true; }` to your configuration.
|
||||
|
||||
## Other Notable Changes {#sec-release-22.05-notable-changes}
|
||||
|
||||
- The option [services.redis.servers](#opt-services.redis.servers) was added
|
||||
|
|
|
@ -74,10 +74,6 @@ let
|
|||
];
|
||||
};
|
||||
|
||||
# list of man outputs currently active intended for use as default values
|
||||
# for man-related options, thus "man" is included unconditionally.
|
||||
activeManOutputs = [ "man" ] ++ lib.optionals cfg.dev.enable [ "devman" ];
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
@ -107,8 +103,8 @@ in
|
|||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to install manual pages and the <command>man</command> command.
|
||||
This also includes "man" outputs.
|
||||
Whether to install manual pages.
|
||||
This also includes <literal>man</literal> outputs.
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -116,27 +112,18 @@ in
|
|||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to generate the manual page index caches using
|
||||
<literal>mandb(8)</literal>. This allows searching for a page or
|
||||
keyword using utilities like <literal>apropos(1)</literal>.
|
||||
'';
|
||||
};
|
||||
|
||||
man.manualPages = mkOption {
|
||||
type = types.path;
|
||||
default = pkgs.buildEnv {
|
||||
name = "man-paths";
|
||||
paths = config.environment.systemPackages;
|
||||
pathsToLink = [ "/share/man" ];
|
||||
extraOutputsToInstall = activeManOutputs;
|
||||
ignoreCollisions = true;
|
||||
};
|
||||
defaultText = literalDocBook "all man pages in <option>config.environment.systemPackages</option>";
|
||||
description = ''
|
||||
The manual pages to generate caches for if <option>generateCaches</option>
|
||||
is enabled. Must be a path to a directory with man pages under
|
||||
<literal>/share/man</literal>; see the source for an example.
|
||||
Advanced users can make this a content-addressed derivation to save a few rebuilds.
|
||||
Whether to generate the manual page index caches.
|
||||
This allows searching for a page or
|
||||
keyword using utilities like
|
||||
<citerefentry>
|
||||
<refentrytitle>apropos</refentrytitle>
|
||||
<manvolnum>1</manvolnum>
|
||||
</citerefentry>
|
||||
and the <literal>-k</literal> option of
|
||||
<citerefentry>
|
||||
<refentrytitle>man</refentrytitle>
|
||||
<manvolnum>1</manvolnum>
|
||||
</citerefentry>.
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -220,30 +207,22 @@ in
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable (mkMerge [
|
||||
|
||||
(mkIf cfg.man.enable {
|
||||
environment.systemPackages = [ pkgs.man-db ];
|
||||
environment.pathsToLink = [ "/share/man" ];
|
||||
environment.extraOutputsToInstall = activeManOutputs;
|
||||
environment.etc."man_db.conf".text =
|
||||
let
|
||||
manualCache = pkgs.runCommandLocal "man-cache" { } ''
|
||||
echo "MANDB_MAP ${cfg.man.manualPages}/share/man $out" > man.conf
|
||||
${pkgs.man-db}/bin/mandb -C man.conf -psc >/dev/null 2>&1
|
||||
{
|
||||
assertions = [
|
||||
{
|
||||
assertion = !(cfg.man.man-db.enable && cfg.man.mandoc.enable);
|
||||
message = ''
|
||||
man-db and mandoc can't be used as the default man page viewer at the same time!
|
||||
'';
|
||||
in
|
||||
''
|
||||
# Manual pages paths for NixOS
|
||||
MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man
|
||||
MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
${optionalString cfg.man.generateCaches ''
|
||||
# Generated manual pages cache for NixOS (immutable)
|
||||
MANDB_MAP /run/current-system/sw/share/man ${manualCache}
|
||||
''}
|
||||
# Manual pages caches for NixOS
|
||||
MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos
|
||||
'';
|
||||
# The actual implementation for this lives in man-db.nix or mandoc.nix,
|
||||
# depending on which backend is active.
|
||||
(mkIf cfg.man.enable {
|
||||
environment.pathsToLink = [ "/share/man" ];
|
||||
environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman";
|
||||
})
|
||||
|
||||
(mkIf cfg.info.enable {
|
||||
|
|
73
nixos/modules/misc/man-db.nix
Normal file
73
nixos/modules/misc/man-db.nix
Normal file
|
@ -0,0 +1,73 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.documentation.man.man-db;
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
documentation.man.man-db = {
|
||||
enable = lib.mkEnableOption "man-db as the default man page viewer" // {
|
||||
default = config.documentation.man.enable;
|
||||
defaultText = lib.literalExpression "config.documentation.man.enable";
|
||||
example = false;
|
||||
};
|
||||
|
||||
manualPages = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
default = pkgs.buildEnv {
|
||||
name = "man-paths";
|
||||
paths = config.environment.systemPackages;
|
||||
pathsToLink = [ "/share/man" ];
|
||||
extraOutputsToInstall = [ "man" ]
|
||||
++ lib.optionals config.documentation.dev.enable [ "devman" ];
|
||||
ignoreCollisions = true;
|
||||
};
|
||||
defaultText = lib.literalDocBook "all man pages in <option>config.environment.systemPackages</option>";
|
||||
description = ''
|
||||
The manual pages to generate caches for if <option>documentation.man.generateCaches</option>
|
||||
is enabled. Must be a path to a directory with man pages under
|
||||
<literal>/share/man</literal>; see the source for an example.
|
||||
Advanced users can make this a content-addressed derivation to save a few rebuilds.
|
||||
'';
|
||||
};
|
||||
|
||||
package = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = pkgs.man-db;
|
||||
defaultText = lib.literalExpression "pkgs.man-db";
|
||||
description = ''
|
||||
The <literal>man-db</literal> derivation to use. Useful to override
|
||||
configuration options used for the package.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModule [ "documentation" "man" "manualPages" ] [ "documentation" "man" "man-db" "manualPages" ])
|
||||
];
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
environment.etc."man_db.conf".text =
|
||||
let
|
||||
manualCache = pkgs.runCommandLocal "man-cache" { } ''
|
||||
echo "MANDB_MAP ${cfg.manualPages}/share/man $out" > man.conf
|
||||
${cfg.package}/bin/mandb -C man.conf -psc >/dev/null 2>&1
|
||||
'';
|
||||
in
|
||||
''
|
||||
# Manual pages paths for NixOS
|
||||
MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man
|
||||
MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man
|
||||
|
||||
${lib.optionalString config.documentation.man.generateCaches ''
|
||||
# Generated manual pages cache for NixOS (immutable)
|
||||
MANDB_MAP /run/current-system/sw/share/man ${manualCache}
|
||||
''}
|
||||
# Manual pages caches for NixOS
|
||||
MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos
|
||||
'';
|
||||
};
|
||||
}
|
61
nixos/modules/misc/mandoc.nix
Normal file
61
nixos/modules/misc/mandoc.nix
Normal file
|
@ -0,0 +1,61 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
makewhatis = "${lib.getBin cfg.package}/bin/makewhatis";
|
||||
|
||||
cfg = config.documentation.man.mandoc;
|
||||
|
||||
in {
|
||||
meta.maintainers = [ lib.maintainers.sternenseemann ];
|
||||
|
||||
options = {
|
||||
documentation.man.mandoc = {
|
||||
enable = lib.mkEnableOption "mandoc as the default man page viewer";
|
||||
|
||||
manPath = lib.mkOption {
|
||||
type = with lib.types; listOf str;
|
||||
default = [ "share/man" ];
|
||||
example = lib.literalExpression "[ \"share/man\" \"share/man/fr\" ]";
|
||||
description = ''
|
||||
Change the manpath, i. e. the directories where
|
||||
<citerefentry><refentrytitle>man</refentrytitle><manvolnum>1</manvolnum></citerefentry>
|
||||
looks for section-specific directories of man pages.
|
||||
You only need to change this setting if you want extra man pages
|
||||
(e. g. in non-english languages). All values must be strings that
|
||||
are a valid path from the target prefix (without including it).
|
||||
The first value given takes priority.
|
||||
'';
|
||||
};
|
||||
|
||||
package = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = pkgs.mandoc;
|
||||
defaultText = lib.literalExpression "pkgs.mandoc";
|
||||
description = ''
|
||||
The <literal>mandoc</literal> derivation to use. Useful to override
|
||||
configuration options used for the package.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment = {
|
||||
systemPackages = [ cfg.package ];
|
||||
|
||||
# tell mandoc about man pages
|
||||
etc."man.conf".text = lib.concatMapStrings (path: ''
|
||||
manpath /run/current-system/sw/${path}
|
||||
'') cfg.manPath;
|
||||
|
||||
# create mandoc.db for whatis(1), apropos(1) and man(1) -k
|
||||
# TODO(@sternenseemman): fix symlinked directories not getting indexed,
|
||||
# see: https://inbox.vuxu.org/mandoc-tech/20210906171231.GF83680@athene.usta.de/T/#e85f773c1781e3fef85562b2794f9cad7b2909a3c
|
||||
extraSetup = lib.mkIf config.documentation.man.generateCaches ''
|
||||
${makewhatis} -T utf8 ${
|
||||
lib.concatMapStringsSep " " (path: "\"$out/${path}\"") cfg.manPath
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
|
@ -108,6 +108,8 @@
|
|||
./misc/lib.nix
|
||||
./misc/label.nix
|
||||
./misc/locate.nix
|
||||
./misc/man-db.nix
|
||||
./misc/mandoc.nix
|
||||
./misc/meta.nix
|
||||
./misc/nixpkgs.nix
|
||||
./misc/passthru.nix
|
||||
|
|
|
@ -244,8 +244,6 @@ in
|
|||
security.apparmor.includes."nixos/security.wrappers" = ''
|
||||
include "${pkgs.apparmorRulesFromClosure { name="security.wrappers"; } [
|
||||
securityWrapper
|
||||
pkgs.stdenv.cc.cc
|
||||
pkgs.stdenv.cc.libc
|
||||
]}"
|
||||
'';
|
||||
|
||||
|
|
|
@ -255,6 +255,7 @@ in
|
|||
magnetico = handleTest ./magnetico.nix {};
|
||||
mailcatcher = handleTest ./mailcatcher.nix {};
|
||||
mailhog = handleTest ./mailhog.nix {};
|
||||
man = handleTest ./man.nix {};
|
||||
mariadb-galera-mariabackup = handleTest ./mysql/mariadb-galera-mariabackup.nix {};
|
||||
mariadb-galera-rsync = handleTest ./mysql/mariadb-galera-rsync.nix {};
|
||||
matomo = handleTest ./matomo.nix {};
|
||||
|
|
100
nixos/tests/man.nix
Normal file
100
nixos/tests/man.nix
Normal file
|
@ -0,0 +1,100 @@
|
|||
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }: let
|
||||
manImplementations = [
|
||||
"mandoc"
|
||||
"man-db"
|
||||
];
|
||||
|
||||
machineNames = builtins.map machineSafe manImplementations;
|
||||
|
||||
makeConfig = useImpl: {
|
||||
# Note: mandoc currently can't index symlinked section directories.
|
||||
# So if a man section comes from one package exclusively (e. g.
|
||||
# 1p from man-pages-posix and 2 from man-pages), it isn't searchable.
|
||||
environment.systemPackages = [
|
||||
pkgs.man-pages
|
||||
pkgs.openssl
|
||||
pkgs.libunwind
|
||||
];
|
||||
|
||||
documentation = {
|
||||
enable = true;
|
||||
nixos.enable = lib.mkForce true;
|
||||
dev.enable = true;
|
||||
man = {
|
||||
enable = true;
|
||||
generateCaches = true;
|
||||
} // lib.listToAttrs (builtins.map (impl: {
|
||||
name = impl;
|
||||
value = {
|
||||
enable = useImpl == impl;
|
||||
};
|
||||
}) manImplementations);
|
||||
};
|
||||
};
|
||||
|
||||
machineSafe = builtins.replaceStrings [ "-" ] [ "_" ];
|
||||
in {
|
||||
name = "man";
|
||||
meta.maintainers = [ lib.maintainers.sternenseemann ];
|
||||
|
||||
nodes = lib.listToAttrs (builtins.map (i: {
|
||||
name = machineSafe i;
|
||||
value = makeConfig i;
|
||||
}) manImplementations);
|
||||
|
||||
testScript = ''
|
||||
import re
|
||||
start_all()
|
||||
|
||||
def match_man_k(page, section, haystack):
|
||||
"""
|
||||
Check if the man page {page}({section}) occurs in
|
||||
the output of `man -k` given as haystack. Note:
|
||||
This is not super reliable, e. g. it can't deal
|
||||
with man pages that are in multiple sections.
|
||||
"""
|
||||
|
||||
for line in haystack.split("\n"):
|
||||
# man -k can look like this:
|
||||
# page(3) - bla
|
||||
# page (3) - bla
|
||||
# pagea, pageb (3, 3P) - foo
|
||||
# pagea, pageb, pagec(3) - bar
|
||||
pages = line.split("(")[0]
|
||||
sections = re.search("\\([a-zA-Z1-9, ]+\\)", line)
|
||||
if sections is None:
|
||||
continue
|
||||
else:
|
||||
sections = sections.group(0)[1:-1]
|
||||
|
||||
if page in pages and f'{section}' in sections:
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
'' + lib.concatMapStrings (machine: ''
|
||||
with subtest("Test direct man page lookups in ${machine}"):
|
||||
# man works
|
||||
${machine}.succeed("man man > /dev/null")
|
||||
# devman works
|
||||
${machine}.succeed("man 3 libunwind > /dev/null")
|
||||
# NixOS configuration man page is installed
|
||||
${machine}.succeed("man configuration.nix > /dev/null")
|
||||
|
||||
with subtest("Test generateCaches via man -k in ${machine}"):
|
||||
expected = [
|
||||
("openssl", "ssl", 3),
|
||||
("unwind", "libunwind", 3),
|
||||
("user", "useradd", 8),
|
||||
("user", "userdel", 8),
|
||||
("mem", "free", 3),
|
||||
("mem", "free", 1),
|
||||
]
|
||||
|
||||
for (keyword, page, section) in expected:
|
||||
matches = ${machine}.succeed(f"man -k {keyword}")
|
||||
if not match_man_k(page, section, matches):
|
||||
raise Exception(f"{page}({section}) missing in matches: {matches}")
|
||||
'') machineNames;
|
||||
})
|
|
@ -43,6 +43,6 @@ mkDerivation rec {
|
|||
homepage = "https://lmms.io";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = with maintainers; [ goibhniu yegortimoshenko ];
|
||||
maintainers = with maintainers; [ goibhniu yana ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Music tracker application, similar to Fasttracker II";
|
||||
homepage = "http://milkytracker.org";
|
||||
homepage = "https://milkytracker.org/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = with maintainers; [];
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ergo";
|
||||
version = "4.0.16";
|
||||
version = "4.0.16.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
|
||||
sha256 = "sha256-cdfpXJtN/JXQNBnCyTIvJLQQhjzDV3+l4WoASII9uuU=";
|
||||
sha256 = "sha256-nAaNT5Rt/oLBA2pSJSinoLKMYJ0VZmuC0zoMYbMSAJQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "featherpad";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tsujan";
|
||||
repo = "FeatherPad";
|
||||
rev = "V${version}";
|
||||
sha256 = "sha256-FeqTPDix2tqTJ3UU6i2e6FkmCO0KMNt4tLtrPjX57fc=";
|
||||
sha256 = "sha256-Sff1oyRYCsiJ7Kl3HxI/bln0M80KlbcNSw6jrEOeWiI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qttools ];
|
||||
|
|
|
@ -32,13 +32,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neovim-unwrapped";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "neovim";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mVVZiDjAsAs4PgC8lHf0Ro1uKJ4OKonoPtF59eUd888=";
|
||||
sha256 = "sha256-0XCW047WopPr3pRTy9rF3Ff6MvNRHT4FletzOERD41A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dcw-gmt";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${version}.tar.gz";
|
||||
sha256 = "sha256-XJCylo9Alc9epEo1TcnY+d0bj+VRTgM4/4W0jgNUeiU=";
|
||||
sha256 = "sha256-KzAPAco1DbF6rdAmCuM7823GthvkFQ5mgpAzzsPWXDw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "16.0.2";
|
||||
version = "16.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
|
||||
sha256 = "980af60ea53fd0c255cfa3faa9407b146658074ea411bc491f53a047352b5b66";
|
||||
sha256 = "b86ff3f77b17e7da66979fe8ea878685c0018273f5d0302f10d3094d502452ee";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightburn";
|
||||
version = "1.0.04";
|
||||
version = "1.0.06";
|
||||
|
||||
nativeBuildInputs = [
|
||||
p7zip
|
||||
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
|
||||
sha256 = "sha256-3uuYxDxlBlu3/4BhII36s+PsLJCmHDIE3fRAz6GO/js=";
|
||||
sha256 = "sha256-2Wlyt9Xw/FNaFkN1Q6utXdGzp42piebESQARhfpvRhM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation {
|
|||
buildInputs = [ zlib ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://pbrt.org";
|
||||
homepage = "https://pbrt.org/";
|
||||
description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.bsd2;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "heimer";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juzzlin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Q1a+sGZTVUjViakBT3E7+AgqMSldAnp7UJcsSS6KZXs=";
|
||||
sha256 = "sha256-F0Pl6Wk+sGfOegy7iljQH63kAMYlRYv7G9nBAAtDEkg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.91.1";
|
||||
version = "0.91.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TPJGRXiZQ7yEttGFpVdiFcyUL5emfjfuoq3k+dQmKCg=";
|
||||
sha256 = "sha256-6bqtw0hUrRBhTwEDURaTjgl3aVVCbfxjoPRfhSd3LK8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ViWbqWjlHd8yosxe+CF1GJ9oK+plOn9s7ruhgsX/v58=";
|
||||
vendorSha256 = "sha256-CO+7WgoTsFCd9vkcALKcJP6Kj3CIWr5FF75/WgbK04g=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -13,12 +13,12 @@
|
|||
let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "koreader";
|
||||
version = "2021.12";
|
||||
version = "2021.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
|
||||
sha256 = "sha256-duOIbYavqmUUkH6RthTYu/SeM8zOeeLm7CIAQwhw6AY=";
|
||||
sha256 = "sha256-Ia0oCSGs6UYcvZVEhNpiOh3D08FgXqjqpgsQJojd3dk=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
@ -14,11 +14,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mkgmap";
|
||||
version = "4835";
|
||||
version = "4836";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
|
||||
sha256 = "u4qwfL8qp+rUIIYuZmVYjEkh0riL8yeQz0t8j5shT34=";
|
||||
sha256 = "nmEl7pN3LW6nqo5IB6GgzcDMHhdAsMySTdANVbybznY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data";
|
||||
homepage = "http://www.mkgmap.org.uk";
|
||||
homepage = "https://www.mkgmap.org.uk/";
|
||||
downloadPage = "https://www.mkgmap.org.uk/download/mkgmap.html";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
|
|
|
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Utility for splitting OpenStreetMap maps into tiles";
|
||||
homepage = "http://www.mkgmap.org.uk";
|
||||
homepage = "https://www.mkgmap.org.uk/";
|
||||
downloadPage = "https://www.mkgmap.org.uk/download/splitter.html";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
|
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nwg-panel";
|
||||
version = "0.5.1";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-panel";
|
||||
rev = "v${version}";
|
||||
sha256 = "0i3g6brw8y17lzq6yzqc91x5w8na8wpqj57zq72zhgdji39n0g0d";
|
||||
sha256 = "0vl9vfgpa1byf9vxn03j58h9zcbjd1y83b0kgv97cxm2mhqz12dg";
|
||||
};
|
||||
|
||||
# No tests
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
From 467156efccc5e36a36bec8c0b64cc5a70f14d5ed Mon Sep 17 00:00:00 2001
|
||||
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
|
||||
From: Yana Timoshenko <yana@riseup.net>
|
||||
Date: Tue, 16 Jan 2018 11:43:46 +0000
|
||||
Subject: [PATCH] Fix Autoconf script
|
||||
|
||||
|
|
|
@ -108,7 +108,7 @@ rec {
|
|||
license = licenses.gpl3Plus;
|
||||
homepage = "http://jonls.dk/redshift";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ yegortimoshenko globin ];
|
||||
maintainers = with maintainers; [ globin yana ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snapmaker-luban";
|
||||
version = "4.1.1";
|
||||
version = "4.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz";
|
||||
sha256 = "sha256-M+e3dNK1Z1Nkswac04TkuYHFX/Y/Cz4Z6P1xGv99kOo=";
|
||||
sha256 = "sha256-gS3MyXD5B9YQ+EXmIPZ+rDUE5H1AjRL64yXQX+5TM2Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tmatrix";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "M4444";
|
||||
repo = "TMatrix";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cvgxmdpdzpl8w4z3sh4g5pbd15rd8s1kcspi9v95yf9rydyy69s";
|
||||
sha256 = "sha256-G3dg0SWfBjCA66TTxkVAcVrFNJOWE9+GJXYKzCUX34w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake installShellFiles ];
|
||||
|
|
|
@ -16,7 +16,7 @@ let
|
|||
version = "20180522.005732";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/yegortimoshenko/bugsnag-qt/archive/${version}.tar.gz";
|
||||
url = "https://github.com/alpakido/bugsnag-qt/archive/${version}.tar.gz";
|
||||
sha256 = "02s6mlggh0i4a856md46dipy6mh47isap82jlwmjr7hfsk2ykgnq";
|
||||
};
|
||||
|
||||
|
@ -42,7 +42,7 @@ let
|
|||
version = "20190125.190943";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/yegortimoshenko/qt-oauth-lib/archive/${version}.tar.gz";
|
||||
url = "https://github.com/alpakido/qt-oauth-lib/archive/${version}.tar.gz";
|
||||
sha256 = "0zmfgvdf6n79mgfvbda7lkdxxlzjmy86436gqi2r5x05vq04sfrj";
|
||||
};
|
||||
|
||||
|
@ -143,7 +143,7 @@ buildEnv {
|
|||
description = "Client for Toggl time tracking service";
|
||||
homepage = "https://github.com/toggl/toggldesktop";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ yegortimoshenko ];
|
||||
maintainers = with maintainers; [ yana ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -18,9 +18,9 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "97.0.4692.56",
|
||||
"sha256": "19i572z02hp7n7j7k5i38jr60jfli5jk5qnydfzxavwx9vjqjwgf",
|
||||
"sha256bin64": "1im2dq2p5cdy6hj6n2lvn2nzwb5mgy57hyskhwhfm1fz5xzjzc3g",
|
||||
"version": "97.0.4692.71",
|
||||
"sha256": "0z7ximvm4a78kxyp4j0i2jzklxazpw6jcqi9jkaf8bvq9ga8kqca",
|
||||
"sha256bin64": "18wr4pgzfcvvdpvvxhpd4as2qnyggq9f8z90ikdz8yj8i71l5wnc",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-11-03",
|
||||
|
|
|
@ -51,11 +51,11 @@ let
|
|||
in stdenv.mkDerivation rec {
|
||||
|
||||
pname = "opera";
|
||||
version = "82.0.4227.23";
|
||||
version = "82.0.4227.43";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||
sha256 = "sha256-jA8fglRLH0aqhjsD65bsieplCLCJXgdBViPGrAu9sSQ=";
|
||||
sha256 = "sha256-DFhf62dqk7qA2k+JgVqGLxF30UPwQwhXD105Qua25X0=";
|
||||
};
|
||||
|
||||
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
{ lib, fetchFromGitHub, buildGoPackage }:
|
||||
buildGoPackage rec {
|
||||
pname = "terraform-provider-ansible";
|
||||
version = "1.0.3";
|
||||
|
||||
goPackagePath = "github.com/nbering/terraform-provider-ansible";
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nbering";
|
||||
repo = "terraform-provider-ansible";
|
||||
rev = "v${version}";
|
||||
sha256 = "0dqi9ym0xvnz3h73cmd1vf6k2qwfhxvj1mcakkpmsd4cpxq4l6pr";
|
||||
};
|
||||
|
||||
# Terraform allow checking the provider versions, but this breaks
|
||||
# if the versions are not provided via file paths.
|
||||
postBuild = "mv go/bin/terraform-provider-ansible{,_v${version}}";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Terraform provider serving as an interop layer for an Ansible dynamic inventory script.";
|
||||
homepage = "https://github.com/nbering/terraform-provider-ansible";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ uskudnik ];
|
||||
};
|
||||
}
|
|
@ -1,11 +0,0 @@
|
|||
[
|
||||
{
|
||||
goPackagePath = "github.com/hashicorp/terraform";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hashicorp/terraform";
|
||||
rev = "v0.12.5";
|
||||
sha256 = "0p064rhaanwx4szs8hv6mdqad8d2bgfd94h2la11j58xbsxc7hap";
|
||||
};
|
||||
}
|
||||
]
|
|
@ -1,29 +0,0 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-provider-cloudfoundry";
|
||||
version = "0.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry-community";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "12mx87dip6vn10zvkf4rgrd27k708lnl149j9xj7bmb8v9m1082v";
|
||||
};
|
||||
|
||||
vendorSha256 = "0kydjnwzj0fylizvk1vg42zyiy17qhz40z3iwa1r5bb20qkrlz93";
|
||||
|
||||
# needs a running cloudfoundry
|
||||
doCheck = false;
|
||||
|
||||
postInstall = "mv $out/bin/terraform-provider-cloudfoundry{,_v${version}}";
|
||||
|
||||
passthru = { provider-source-address = "registry.terraform.io/cloudfoundry-community/cloudfoundry"; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cloudfoundry-community/terraform-provider-cloudfoundry";
|
||||
description = "Terraform provider for cloudfoundry";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ ris ];
|
||||
};
|
||||
}
|
|
@ -13,11 +13,13 @@ let
|
|||
pname = data.repo;
|
||||
version = data.version;
|
||||
subPackages = [ "." ];
|
||||
doCheck = false;
|
||||
src = fetchFromGitHub {
|
||||
inherit (data) owner repo rev sha256;
|
||||
};
|
||||
vendorSha256 = data.vendorSha256 or null;
|
||||
deleteVendor = data.deleteVendor or false;
|
||||
proxyVendor = data.proxyVendor or false;
|
||||
|
||||
# Terraform allow checking the provider versions, but this breaks
|
||||
# if the versions are not provided via file paths.
|
||||
|
@ -31,6 +33,7 @@ let
|
|||
version = data.version;
|
||||
goPackagePath = "github.com/${data.owner}/${data.repo}";
|
||||
subPackages = [ "." ];
|
||||
doCheck = false;
|
||||
src = fetchFromGitHub {
|
||||
inherit (data) owner repo rev sha256;
|
||||
};
|
||||
|
@ -51,16 +54,10 @@ let
|
|||
# These are the providers that don't fall in line with the default model
|
||||
special-providers = {
|
||||
# Packages that don't fit the default model
|
||||
ansible = callPackage ./ansible { };
|
||||
cloudfoundry = callPackage ./cloudfoundry { };
|
||||
gandi = callPackage ./gandi { };
|
||||
hcloud = callPackage ./hcloud { };
|
||||
libvirt = callPackage ./libvirt { };
|
||||
linuxbox = callPackage ./linuxbox { };
|
||||
lxd = callPackage ./lxd { };
|
||||
teleport = callPackage ./teleport { };
|
||||
vpsadmin = callPackage ./vpsadmin { };
|
||||
vercel = callPackage ./vercel { };
|
||||
} // (lib.optionalAttrs (config.allowAliases or false) {
|
||||
kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details";
|
||||
});
|
||||
|
|
|
@ -1,32 +0,0 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-provider-hcloud";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hetznercloud";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "04fa3qr65hg1ylq2933ark5q1za6k0a4ky36a6vrw2dcgpr4f9zs";
|
||||
};
|
||||
|
||||
vendorSha256 = "15gcnwylxkgjriqscd4lagmwfssagq0ksrlb2svidw9aahmr7hw0";
|
||||
|
||||
# Spends an awful time in other test folders, apparently tries to reach
|
||||
# opencensus and fails.
|
||||
checkPhase = ''
|
||||
pushd hcloud
|
||||
go test -v
|
||||
popd
|
||||
'';
|
||||
|
||||
postInstall = "mv $out/bin/terraform-provider-hcloud{,_v${version}}";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cloudfoundry-community/terraform-provider-cloudfoundry";
|
||||
description = "Terraform provider for cloudfoundry";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ ris ];
|
||||
};
|
||||
}
|
|
@ -1,26 +0,0 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-provider-linuxbox";
|
||||
version = "0.3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numtide";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1sxb2iv4dl0rw3v1r7k5dfkyh14nmp19cprqafhb7ncarmvawq39";
|
||||
};
|
||||
|
||||
vendorSha256 = "16hp0pv1qpvr34ac1syjci39csvyj3c748inllypjwx76q6rwp7k";
|
||||
|
||||
postInstall = "mv $out/bin/terraform-provider-linuxbox{,_v${version}}";
|
||||
|
||||
passthru.provider-source-address = "registry.terraform.io/numtide/linuxbox";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/numtide/terraform-provider-linuxbox";
|
||||
description = "Basic building block for Seed DevOps";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ zimbatm ];
|
||||
};
|
||||
}
|
|
@ -1,27 +0,0 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-provider-lxd";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sl1pm4t";
|
||||
repo = "terraform-provider-lxd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fl9sYoyrVV6LvnIrnyAXy18QLLazQajjcLO1JWsqAR4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ervfG/BAaF4M+BXsp0eCDM6nPWQOS3pthClhArsUoYc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postBuild = "mv ../go/bin/terraform-provider-lxd{,_v${version}}";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sl1pm4t/terraform-provider-lxd";
|
||||
description = "Terraform provider for lxd";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ gila ];
|
||||
};
|
||||
}
|
|
@ -10,38 +10,47 @@
|
|||
"owner": "vancluever",
|
||||
"provider-source-address": "registry.terraform.io/vancluever/acme",
|
||||
"repo": "terraform-provider-acme",
|
||||
"rev": "v2.7.0",
|
||||
"sha256": "0dyzsfazhxjjfkykykz823n0fk2fbl53nwxpv7wvl1zzmg72lk37",
|
||||
"vendorSha256": "1sw83jxa3kjjqrjv3z1hczlszskc7lk0i4lrnvdnxa6s642i7brl",
|
||||
"version": "2.7.0"
|
||||
"rev": "v2.7.1",
|
||||
"sha256": "0gnq8jm31v0q2a4v310cjrrdc7y17c9vi326c6x9cs3lgjvn27m2",
|
||||
"vendorSha256": "1wssw8x8zlrgx51ij0ghhwsbyzfl2r1qy4aqv03v705xipil8yn3",
|
||||
"version": "2.7.1"
|
||||
},
|
||||
"aiven": {
|
||||
"owner": "aiven",
|
||||
"provider-source-address": "registry.terraform.io/aiven/aiven",
|
||||
"repo": "terraform-provider-aiven",
|
||||
"rev": "v2.3.2",
|
||||
"sha256": "14ivvb1ql06gxfi6ffg1kg9k9xadds6fgzj9wp2hh3an2rf7v9ym",
|
||||
"vendorSha256": "0akqbhjz309znzjqm633nk2zbf925l6027n88bb7mgbv1zjxqw9j",
|
||||
"version": "2.3.2"
|
||||
"rev": "v2.4.0",
|
||||
"sha256": "0m43d2iaa9kywzvlgcnsya1ma9k570j9q8cq9l6ldpc8565fqq0i",
|
||||
"vendorSha256": "1lpfnpg4sivy8vilkxamdn1hyn6k61lxsfcq67afxsq8pcy6q44v",
|
||||
"version": "2.4.0"
|
||||
},
|
||||
"akamai": {
|
||||
"owner": "akamai",
|
||||
"provider-source-address": "registry.terraform.io/akamai/akamai",
|
||||
"repo": "terraform-provider-akamai",
|
||||
"rev": "v1.8.0",
|
||||
"sha256": "0jpw16bap4q75dzchimfqgqqkkn3ckw19q9rjfb8zbkvini5ybw1",
|
||||
"vendorSha256": "sha256-03Q0/YrivaG2fMgIjW6mxWOIdFZ7FKYB8C6DZIGr+/w=",
|
||||
"version": "1.8.0"
|
||||
"rev": "v1.9.1",
|
||||
"sha256": "17a3ml4h1b1480z9dzppig20jx9mgldnmpz8cn2x8qgzbpiqz3hs",
|
||||
"vendorSha256": "0l50hy4cy360g6adbhhbl4x8hagma9zfb3yyzk6vbslal9m4kd6j",
|
||||
"version": "1.9.1"
|
||||
},
|
||||
"alicloud": {
|
||||
"deleteVendor": true,
|
||||
"owner": "aliyun",
|
||||
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.144.0",
|
||||
"sha256": "14nphpz15p83n6fsvvrnaz96nb87wvb10ri21hlhlsm2579zcbqd",
|
||||
"vendorSha256": "1k28fcfm7437i7gfbcbrigk2i50c1mix7z1rb2g617prih84wa6y",
|
||||
"version": "1.144.0"
|
||||
"rev": "v1.149.0",
|
||||
"sha256": "0v9jhpvz33hzq09i8bxp1dif9jdypb5g2xy3d2g1mw4lgqrdpjix",
|
||||
"vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg",
|
||||
"version": "1.149.0"
|
||||
},
|
||||
"ansible": {
|
||||
"owner": "nbering",
|
||||
"provider-source-address": "registry.terraform.io/nbering/ansible",
|
||||
"repo": "terraform-provider-ansible",
|
||||
"rev": "v1.0.4",
|
||||
"sha256": "1djjcrcm9218rfn51kpzp3cbb5qbkfwpjqm9h9rhadibbvjmly6y",
|
||||
"vendorSha256": "1kc47n1janmiwwjphvxpily3dwyy1axxh36aj3sb2kpawi4pq1rq",
|
||||
"version": "1.0.4"
|
||||
},
|
||||
"archive": {
|
||||
"owner": "hashicorp",
|
||||
|
@ -84,28 +93,28 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v3.66.0",
|
||||
"sha256": "1s9bdpadg34wbr0qgiafn86xnaryfdfa5vdbvz6i24dps082gv6y",
|
||||
"vendorSha256": "1cycfd3vc9980ijfwldgyvx3v003khrcm3qg18928s7k16xaql0b",
|
||||
"version": "3.66.0"
|
||||
"rev": "v3.70.0",
|
||||
"sha256": "0133f1ngwa7x8w9zicfwmkj14rav9cvwk7qf7hdz0cfmyl4pj4x2",
|
||||
"vendorSha256": "03k8xijzfawbdzc1wavw9k2z2zyffi1ysnqls412nzdyvxyl8xw4",
|
||||
"version": "3.70.0"
|
||||
},
|
||||
"azuread": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azuread",
|
||||
"repo": "terraform-provider-azuread",
|
||||
"rev": "v2.10.0",
|
||||
"sha256": "1q70kighdgsq1jwwfhcjx6458242lvkczlzjl0mf5j5y7k5g3m42",
|
||||
"rev": "v2.13.0",
|
||||
"sha256": "13337m20yxamdjpiw4kfi2ik4i5ivvr1fryygixpsj34lr21zxgk",
|
||||
"vendorSha256": null,
|
||||
"version": "2.10.0"
|
||||
"version": "2.13.0"
|
||||
},
|
||||
"azurerm": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v2.86.0",
|
||||
"sha256": "0p508qvqh0bg3x80i62i4p3q4nzgq0il651vrcg4c13lwynk2wcn",
|
||||
"rev": "v2.90.0",
|
||||
"sha256": "04bll0ygjgrqq18va97xi42p55fvlbgdc24m2i9amjhjbly5m7wn",
|
||||
"vendorSha256": null,
|
||||
"version": "2.86.0"
|
||||
"version": "2.90.0"
|
||||
},
|
||||
"azurestack": {
|
||||
"owner": "hashicorp",
|
||||
|
@ -183,10 +192,19 @@
|
|||
"owner": "cloudflare",
|
||||
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
|
||||
"repo": "terraform-provider-cloudflare",
|
||||
"rev": "v3.4.0",
|
||||
"sha256": "1w37wkpb785jfqq91piclcsrhy3idpbmwb90n5y7rkgmm37ij7ij",
|
||||
"vendorSha256": "004pb5xnvisq3j113i6qfvnh1j06nkpkgzav3wb08k0bl19b6jks",
|
||||
"version": "3.4.0"
|
||||
"rev": "v3.6.0",
|
||||
"sha256": "1adpzk9vjllr18dq8kggxfabm3ax59m55ls98mkqh8lmgq96bh7d",
|
||||
"vendorSha256": "0qby6fa1x5fapgcy5i35dwwlkb2ggws9sxcssshzssy0fzpb3k87",
|
||||
"version": "3.6.0"
|
||||
},
|
||||
"cloudfoundry": {
|
||||
"owner": "cloudfoundry-community",
|
||||
"provider-source-address": "registry.terraform.io/cloudfoundry-community/cloudfoundry",
|
||||
"repo": "terraform-provider-cloudfoundry",
|
||||
"rev": "v0.15.0",
|
||||
"sha256": "0kg9aivxlbkqgrwv0j02hfsaky5q4f0bmqihn589dsdk7jds66i7",
|
||||
"vendorSha256": "19jnaazhdqagfx5wkpvrf0amf7d22kg6hzk0nsg888d0l4x93hna",
|
||||
"version": "0.15.0"
|
||||
},
|
||||
"cloudinit": {
|
||||
"owner": "hashicorp",
|
||||
|
@ -254,19 +272,19 @@
|
|||
"owner": "DataDog",
|
||||
"provider-source-address": "registry.terraform.io/DataDog/datadog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v3.6.0",
|
||||
"sha256": "00j40m720m2kh0pn4953n8zis78g02ah9yjkcavcjkpxy4p899ma",
|
||||
"vendorSha256": "1i5ph7p4pj5ph9rkynii50n3npjprrcsmd15i430wpyjxvsjnw8c",
|
||||
"version": "3.6.0"
|
||||
"rev": "v3.7.0",
|
||||
"sha256": "0fynbn0zbplslbvqz0jij4gm8q6ydg697x7nh5rzw89dy26l2f8g",
|
||||
"vendorSha256": "0ngvbc9h3csl811g40q707flf4dl1hal95hpkxsvz7p71s3371q8",
|
||||
"version": "3.7.0"
|
||||
},
|
||||
"dhall": {
|
||||
"owner": "awakesecurity",
|
||||
"provider-source-address": "registry.terraform.io/awakesecurity/dhall",
|
||||
"repo": "terraform-provider-dhall",
|
||||
"rev": "v0.0.1",
|
||||
"sha256": "1cymabpa03a5avf0j6jj2mpnc62ap9b82zmpsgzwdjrb3mf954fa",
|
||||
"vendorSha256": "0m11cpis171j9aicw0c66y4m1ckg41gjknj86qvblh57ai96gc1n",
|
||||
"version": "0.0.1"
|
||||
"rev": "v0.0.2",
|
||||
"sha256": "1fw83ic5wwhl5yk1asy8p4cxsdwclw639j7ki1xgpi284h6gmh5a",
|
||||
"vendorSha256": "1wqbblqpb1lpbsn4k9yh43g19iw13q825l5i9wvy4w0w4nzz70p4",
|
||||
"version": "0.0.2"
|
||||
},
|
||||
"digitalocean": {
|
||||
"owner": "digitalocean",
|
||||
|
@ -341,19 +359,19 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/external",
|
||||
"repo": "terraform-provider-external",
|
||||
"rev": "v2.1.0",
|
||||
"sha256": "0xc3mj0d4yrr1952c5ywrx19ny1k2475grka9v2w7szdy6p2rkk5",
|
||||
"vendorSha256": null,
|
||||
"version": "2.1.0"
|
||||
"rev": "v2.1.1",
|
||||
"sha256": "1f92cg2fjwy2n5380fx9j6j2bnsnkcy18kq0bjbkwkh8kmshqjn8",
|
||||
"vendorSha256": "031knr4axrcwisbhzs39faykzc1jgm9hx4rhqk46wim950gifl7g",
|
||||
"version": "2.1.1"
|
||||
},
|
||||
"fastly": {
|
||||
"owner": "fastly",
|
||||
"provider-source-address": "registry.terraform.io/fastly/fastly",
|
||||
"repo": "terraform-provider-fastly",
|
||||
"rev": "v0.38.0",
|
||||
"sha256": "1pfwpx83f5v12r9h2a89z8xvqpmwzsadzxx6wh0d1csdkdrr9z1n",
|
||||
"rev": "v0.39.0",
|
||||
"sha256": "0sjjcz2z7qr1dmm6zzyi382cas4k5vdg0q7yxlpcqxqqrql636k8",
|
||||
"vendorSha256": null,
|
||||
"version": "0.38.0"
|
||||
"version": "0.39.0"
|
||||
},
|
||||
"flexibleengine": {
|
||||
"owner": "terraform-providers",
|
||||
|
@ -397,11 +415,12 @@
|
|||
"google": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/google",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v3.76.0",
|
||||
"sha256": "1j3q07v4r0a3mlkmpqw8nav5z09fwyms9xmlyk6k6xkkzr520xcp",
|
||||
"vendorSha256": "1ffxfracj4545fzh6p6b0wal0j07807qc2q83qzchbalqvi7yhky",
|
||||
"version": "3.76.0"
|
||||
"rev": "v4.5.0",
|
||||
"sha256": "173aqwrzqdb3y57wiq1dbgb74ksr063qqq1k178n4wrab4s1h3px",
|
||||
"vendorSha256": "0f18fh0qi1v1hkq3j8nrc8x2rah7vk6njjgdakxr1g1xxv8f0nhx",
|
||||
"version": "4.5.0"
|
||||
},
|
||||
"google-beta": {
|
||||
"owner": "hashicorp",
|
||||
|
@ -416,10 +435,10 @@
|
|||
"owner": "grafana",
|
||||
"provider-source-address": "registry.terraform.io/grafana/grafana",
|
||||
"repo": "terraform-provider-grafana",
|
||||
"rev": "v1.14.0",
|
||||
"sha256": "1d8w2a86m1q79f41ypgwg4i4w5269br1yvh437xiypvabajn7yjl",
|
||||
"vendorSha256": "0gk0hk4f060hbl89ay1r91ayp5mwnc236x5jxvw4sgi2cq7mmns2",
|
||||
"version": "1.14.0"
|
||||
"rev": "v1.17.0",
|
||||
"sha256": "10mj1dvz7q3w250hvi3k4rj2x0mn592gw2xcy1j98x5ll6kx4ynd",
|
||||
"vendorSha256": "1bhygkkgd3j971cg6wha57cyh4ggbkaihw6sn6p9jvdi1k1f63lw",
|
||||
"version": "1.17.0"
|
||||
},
|
||||
"gridscale": {
|
||||
"owner": "terraform-providers",
|
||||
|
@ -428,6 +447,15 @@
|
|||
"sha256": "00l3cwvyyjk0n3j535qfj3bsf1s5l07786gnxycj0f8vz3a06bcq",
|
||||
"version": "1.6.0"
|
||||
},
|
||||
"hcloud": {
|
||||
"owner": "hetznercloud",
|
||||
"provider-source-address": "registry.terraform.io/hetznercloud/hcloud",
|
||||
"repo": "terraform-provider-hcloud",
|
||||
"rev": "v1.32.2",
|
||||
"sha256": "0rr65bxd0w5r0zqgj975rzxw7j3wrav4dw9gl3ispfhkb9v1302f",
|
||||
"vendorSha256": "0g8cbkg5kcddd1x3p6d8mb6mqwsayqby0mrrifkw5icf7rlaa0sl",
|
||||
"version": "1.32.2"
|
||||
},
|
||||
"hedvig": {
|
||||
"owner": "terraform-providers",
|
||||
"repo": "terraform-provider-hedvig",
|
||||
|
@ -487,10 +515,10 @@
|
|||
"owner": "IBM-Cloud",
|
||||
"provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
|
||||
"repo": "terraform-provider-ibm",
|
||||
"rev": "v1.36.0",
|
||||
"sha256": "09lhxh1cmg1k939gaksaqx11j06f971s1091wk03vivgfzrjy3hn",
|
||||
"vendorSha256": "sha256-IjCLN/7EKenJbbHfBnRJh1LT3Ym/R2yEu+7zCnJ8Giw=",
|
||||
"version": "1.36.0"
|
||||
"rev": "v1.37.1",
|
||||
"sha256": "1m9038ylv44xhgws0jrqdynj7kd97x9jgk1npqblbfv86fccwqxc",
|
||||
"vendorSha256": "1a8zy023j3mcy3bswyrmllkgv61wiyxa1f7bfj8mxx3701rsb4ji",
|
||||
"version": "1.37.1"
|
||||
},
|
||||
"icinga2": {
|
||||
"owner": "terraform-providers",
|
||||
|
@ -607,6 +635,15 @@
|
|||
"sha256": "17hnm7wivd75psap2qdmlnmmlf964s7jf4jrfgsm6njx32wwwfpp",
|
||||
"version": "1.12.3"
|
||||
},
|
||||
"linuxbox": {
|
||||
"owner": "numtide",
|
||||
"provider-source-address": "registry.terraform.io/numtide/linuxbox",
|
||||
"repo": "terraform-provider-linuxbox",
|
||||
"rev": "v0.4.2",
|
||||
"sha256": "1ghlp0nnc67m5rsx6aixqxjd5vhpbi88gcfyv3710dvqxchdgscy",
|
||||
"vendorSha256": "01d556pfaa2ycww5kgd1f3shp2i2r48kgwnls39lhplp5qmnkz4g",
|
||||
"version": "0.4.2"
|
||||
},
|
||||
"local": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/local",
|
||||
|
@ -630,6 +667,15 @@
|
|||
"sha256": "00d8qx95cxaif636dyh935nv9nn6lmb1ybxy7n4myy9g80y50ap1",
|
||||
"version": "1.3.0"
|
||||
},
|
||||
"lxd": {
|
||||
"owner": "terraform-lxd",
|
||||
"provider-source-address": "registry.terraform.io/terraform-lxd/lxd",
|
||||
"repo": "terraform-provider-lxd",
|
||||
"rev": "v1.6.0",
|
||||
"sha256": "07h159mjbddkf3ishhdknqn10pyb2wh9yavjps5mwmdbiii6qpvy",
|
||||
"vendorSha256": "11x12jxh4q99hinpljqfchysgkhch93sgv0mz065ws20y0dxzfvs",
|
||||
"version": "1.6.0"
|
||||
},
|
||||
"mailgun": {
|
||||
"owner": "terraform-providers",
|
||||
"repo": "terraform-provider-mailgun",
|
||||
|
@ -648,10 +694,10 @@
|
|||
"owner": "equinix",
|
||||
"provider-source-address": "registry.terraform.io/equinix/metal",
|
||||
"repo": "terraform-provider-metal",
|
||||
"rev": "v3.2.0",
|
||||
"sha256": "07qdgxvdk564psb4v5d8saaak2037y04b3cj2p09m18fbam8cpry",
|
||||
"rev": "v3.2.1",
|
||||
"sha256": "0j07rras4m6i668lkvvn3rq5l67qfzk9bmpijsfk3my0zsgv8nvw",
|
||||
"vendorSha256": null,
|
||||
"version": "3.2.0"
|
||||
"version": "3.2.1"
|
||||
},
|
||||
"metalcloud": {
|
||||
"owner": "terraform-providers",
|
||||
|
@ -747,10 +793,10 @@
|
|||
"owner": "terraform-providers",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/oci",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.53.0",
|
||||
"sha256": "0vbi8k6mvcwvmjrs7walw1gfam77simvcr89gmh84jagvz0mngbw",
|
||||
"rev": "v4.57.0",
|
||||
"sha256": "123k24pa5232j9yxhgn6ng36s46y3iv4xsqay9ry53g4pw6zcx9y",
|
||||
"vendorSha256": null,
|
||||
"version": "4.53.0"
|
||||
"version": "4.57.0"
|
||||
},
|
||||
"okta": {
|
||||
"owner": "terraform-providers",
|
||||
|
@ -791,10 +837,10 @@
|
|||
"owner": "terraform-provider-openstack",
|
||||
"provider-source-address": "registry.terraform.io/terraform-provider-openstack/openstack",
|
||||
"repo": "terraform-provider-openstack",
|
||||
"rev": "v1.45.0",
|
||||
"sha256": "0r769ckswcz6q3qmdxkvhqkq77x9qlv3359lvaplmkilk7zhpvcj",
|
||||
"vendorSha256": "1wcls4kc19wy2nkwzrc1zc2lrlazfqr6dmfvzv9andldvd8swspg",
|
||||
"version": "1.45.0"
|
||||
"rev": "v1.46.0",
|
||||
"sha256": "1kkqfr0i33kw0qj3dp5knxm14p1ndy72n4chd36dhkydp4rm688f",
|
||||
"vendorSha256": "1f77z6p8423gh8x7zbhn3pkd8a1nxd5pabc1043d66pbw9rxchax",
|
||||
"version": "1.46.0"
|
||||
},
|
||||
"opentelekomcloud": {
|
||||
"owner": "terraform-providers",
|
||||
|
@ -902,12 +948,12 @@
|
|||
},
|
||||
"rancher2": {
|
||||
"owner": "rancher",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/rancher2",
|
||||
"provider-source-address": "registry.terraform.io/rancher/rancher2",
|
||||
"repo": "terraform-provider-rancher2",
|
||||
"rev": "v1.13.0",
|
||||
"sha256": "0xczv9qsviryiw95yd6cl1nnb0daxs971fm733gfvwm36jvmyr89",
|
||||
"vendorSha256": "0apy6qbmshfj4pzz9nqdhyk6h7l9qwrccz30q8ljl928pj49q04c",
|
||||
"version": "1.13.0"
|
||||
"rev": "v1.22.1",
|
||||
"sha256": "0sx24riks78ywxsrhvc18w3wppz676zv1bjmzvm7r4q94miplxgl",
|
||||
"vendorSha256": "0qdd1sl9r6rpp9jmxy3r5a064f8agjmlkrn241p4sd7j5cncxdk3",
|
||||
"version": "1.22.1"
|
||||
},
|
||||
"random": {
|
||||
"owner": "hashicorp",
|
||||
|
@ -947,11 +993,13 @@
|
|||
"version": "1.15.0"
|
||||
},
|
||||
"secret": {
|
||||
"owner": "tweag",
|
||||
"owner": "numtide",
|
||||
"provider-source-address": "registry.terraform.io/numtide/secret",
|
||||
"repo": "terraform-provider-secret",
|
||||
"rev": "v1.1.1",
|
||||
"sha256": "1pr0amzgv1i1lxniqlx8spdb73q522l7pm8a4m25hwy1kwby37sd",
|
||||
"version": "1.1.1"
|
||||
"rev": "v1.2.0",
|
||||
"sha256": "1211vvcd00llajza3chw25h0sl43wl116ni4r251k00m6kb5nfwq",
|
||||
"vendorSha256": null,
|
||||
"version": "1.2.0"
|
||||
},
|
||||
"segment": {
|
||||
"owner": "ajbosco",
|
||||
|
@ -1010,9 +1058,10 @@
|
|||
"owner": "carlpett",
|
||||
"provider-source-address": "registry.terraform.io/carlpett/sops",
|
||||
"repo": "terraform-provider-sops",
|
||||
"rev": "v0.5.1",
|
||||
"sha256": "1x32w1qw46rwa8bjhkfn6ybr1dkbdqk0prlm0bnwn3gvvj0hc7kh",
|
||||
"version": "0.5.1"
|
||||
"rev": "v0.6.3",
|
||||
"sha256": "1db67jcgpg279hq4vfk1xhql0msn9fy95m8fdi1cxv54y7zcxwf9",
|
||||
"vendorSha256": "1haw17k6xg3n6hbx3pj8ysyhq35k3lis1qq65qnyskl62y1ia54h",
|
||||
"version": "0.6.3"
|
||||
},
|
||||
"spotinst": {
|
||||
"owner": "terraform-providers",
|
||||
|
@ -1148,6 +1197,15 @@
|
|||
"sha256": "06nk5c7lxs8fc04sz97lc3yk1zk1b9phkzw6fj9fnmpgaak87bj9",
|
||||
"version": "0.9.2"
|
||||
},
|
||||
"vercel": {
|
||||
"owner": "ondrejsika",
|
||||
"provider-source-address": "registry.terraform.io/ondrejsika/vercel",
|
||||
"repo": "terraform-provider-vercel",
|
||||
"rev": "v2.1.0",
|
||||
"sha256": "06lskp3mmax7g0lchq6jaxavycj7snkhip9madzqkr552qvz5cgw",
|
||||
"vendorSha256": "0s0kf1v2217q9hfmc7r2yybcfk33k566dfvs2jiq63kyjnadhb0k",
|
||||
"version": "2.1.0"
|
||||
},
|
||||
"vra7": {
|
||||
"owner": "terraform-providers",
|
||||
"repo": "terraform-provider-vra7",
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-provider-vercel";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ondrejsika";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "06lskp3mmax7g0lchq6jaxavycj7snkhip9madzqkr552qvz5cgw";
|
||||
};
|
||||
|
||||
vendorSha256 = "0s0kf1v2217q9hfmc7r2yybcfk33k566dfvs2jiq63kyjnadhb0k";
|
||||
|
||||
postInstall = "mv $out/bin/terraform-provider-vercel{,_v${version}}";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ondrejsika/terraform-provider-vercel";
|
||||
description = "Terraform provider for Vercel";
|
||||
maintainers = with maintainers; [ mmahut ];
|
||||
};
|
||||
}
|
|
@ -65,6 +65,7 @@ let
|
|||
timstott
|
||||
zimbatm
|
||||
maxeaubrey
|
||||
zowoq
|
||||
];
|
||||
};
|
||||
} // attrs');
|
||||
|
|
|
@ -5,13 +5,13 @@ buildGoModule rec {
|
|||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.23.3";
|
||||
version = "0.23.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:1612yrlsajl1j95zh057k82nzz492a9p1cgamph4m84zpm0v67jc";
|
||||
sha256 = "sha256-SWofXsbkuirPvqgU639W8IQklafLKbThoZUzOzfYwdQ=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
|
@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/Temptin/SkypeExport";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ yegortimoshenko ];
|
||||
maintainers = with maintainers; [ yana ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@ let
|
|||
|
||||
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
|
||||
# source of the latter disappears much faster.
|
||||
version = "8.79.0.92";
|
||||
version = "8.79.0.95";
|
||||
|
||||
rpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
|
@ -69,7 +69,7 @@ let
|
|||
"https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
|
||||
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
|
||||
];
|
||||
sha256 = "sha256-wGt0zNBmJf5NJGGOopWNUoBoy8sr4jWp8UKLd8AudnM=";
|
||||
sha256 = "sha256-a6ZtgA0cMAuNVQWAeiIDJ2noPhXjV8KPE8ibkGR7Dns=";
|
||||
}
|
||||
else
|
||||
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
|
|
@ -1,13 +1,16 @@
|
|||
{ fetchFromGitHub, automake, autoconf, which, pkg-config, libtool, lib, stdenv }:
|
||||
{ fetchFromGitHub, automake, autoconf, which, pkg-config, libtool, lib, stdenv, gnutls, asciidoc, doxygen
|
||||
, withTLS ? true
|
||||
, withDocs ? true
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcoap";
|
||||
version = "4.2.1";
|
||||
version = "4.3.0";
|
||||
src = fetchFromGitHub {
|
||||
repo = "libcoap";
|
||||
owner = "obgm";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1jkvha52lic13f13hnppizkl80bb2rciayb5hxici0gj6spphgha";
|
||||
sha256 = "1l031ys833gch600g9g3lvbsr4nysx6glbbj4lwvx3ywl0jr6l9k";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
automake
|
||||
|
@ -15,16 +18,15 @@ stdenv.mkDerivation rec {
|
|||
which
|
||||
libtool
|
||||
pkg-config
|
||||
];
|
||||
] ++ lib.optional withTLS gnutls ++ lib.optionals withDocs [ doxygen asciidoc ] ;
|
||||
preConfigure = "./autogen.sh";
|
||||
configureFlags = [
|
||||
"--disable-documentation"
|
||||
"--disable-shared"
|
||||
];
|
||||
configureFlags = [ "--disable-shared" ]
|
||||
++ lib.optional (!withDocs) "--disable-documentation"
|
||||
++ lib.optional withTLS "--enable-dtls";
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/obgm/libcoap";
|
||||
description = "A CoAP (RFC 7252) implementation in C";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.kmein ];
|
||||
};
|
||||
|
|
|
@ -27,11 +27,11 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutt";
|
||||
version = "2.1.4";
|
||||
version = "2.1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
||||
sha256 = "0yfvnjqw9l99kdcr995by3mx5vwad6b530x93yb8ipr3xa1bcq9k";
|
||||
sha256 = "1q1bq5qfv67s6ynbqga19ifaprgavhdbgg154kb9ffingvj0k8wj";
|
||||
};
|
||||
|
||||
patches = optional smimeSupport (fetchpatch {
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "teamviewer";
|
||||
version = "15.24.5";
|
||||
version = "15.25.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb";
|
||||
sha256 = "sha256-u4azVjwD5xTc0vWe8tDEx44rBdYFZljZPVQ0yilqeR0=";
|
||||
sha256 = "sha256-LtITPS0bLy85dv/zdOo8JcsEZ0ZgtVmM+CcggaYJxXA=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
@ -17,14 +17,14 @@ let
|
|||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "14.32.2";
|
||||
version = "14.32.6";
|
||||
pname = "jmol";
|
||||
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
sha256 = "sha256-JETS1mxlDyWPC8ngtmYujmfWIdrW9HzkqpX/VZpIMBE=";
|
||||
sha256 = "sha256-b9E/IJfqeA8rBSQogb/ZVBMW3y9bc2dBj/BIl0HWFR8=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
77
pkgs/applications/science/machine-learning/streamlit/default.nix
Normal file → Executable file
77
pkgs/applications/science/machine-learning/streamlit/default.nix
Normal file → Executable file
|
@ -1,23 +1,79 @@
|
|||
{ lib, buildPythonApplication, fetchPypi
|
||||
, altair, astor, base58, blinker, boto3, botocore, click, enum-compat
|
||||
, future, pillow, protobuf, requests, toml, tornado_5, tzlocal, validators, watchdog
|
||||
, jinja2, setuptools
|
||||
{
|
||||
# Nix
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
fetchPypi,
|
||||
|
||||
# Build inputs
|
||||
altair,
|
||||
astor,
|
||||
base58,
|
||||
blinker,
|
||||
boto3,
|
||||
botocore,
|
||||
click,
|
||||
cachetools,
|
||||
enum-compat,
|
||||
future,
|
||||
GitPython,
|
||||
jinja2,
|
||||
pillow,
|
||||
pyarrow,
|
||||
pydeck,
|
||||
pympler,
|
||||
protobuf,
|
||||
requests,
|
||||
setuptools,
|
||||
toml,
|
||||
tornado,
|
||||
tzlocal,
|
||||
validators,
|
||||
watchdog,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
let
|
||||
click_7 = click.overridePythonAttrs(old: rec {
|
||||
version = "7.1.2";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
|
||||
};
|
||||
});
|
||||
in buildPythonApplication rec {
|
||||
pname = "streamlit";
|
||||
version = "0.50.2";
|
||||
version = "1.2.0";
|
||||
format = "wheel"; # the only distribution available
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
sha256 = "1wymv7qckafs0p2jdjlxjaf1xrhm3iyd185jkldanbb0na5n3ndz";
|
||||
sha256 = "1dzb68a8n8wvjppcmqdaqnh925b2dg6rywv51ac9q09zjxb6z11n";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
altair astor base58 blinker boto3 botocore click enum-compat
|
||||
future pillow protobuf requests toml tornado_5 tzlocal validators watchdog
|
||||
jinja2 setuptools
|
||||
altair
|
||||
astor
|
||||
base58
|
||||
blinker
|
||||
boto3
|
||||
botocore
|
||||
cachetools
|
||||
click_7
|
||||
enum-compat
|
||||
future
|
||||
GitPython
|
||||
jinja2
|
||||
pillow
|
||||
protobuf
|
||||
pyarrow
|
||||
pydeck
|
||||
pympler
|
||||
requests
|
||||
setuptools
|
||||
toml
|
||||
tornado
|
||||
tzlocal
|
||||
validators
|
||||
watchdog
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
@ -30,5 +86,4 @@ buildPythonApplication rec {
|
|||
maintainers = with maintainers; [ yrashk ];
|
||||
license = licenses.asl20;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -3,14 +3,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "calc";
|
||||
version = "2.14.0.8";
|
||||
version = "2.14.0.13";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
|
||||
"http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
|
||||
];
|
||||
sha256 = "sha256-rWosRO7qfgbvylOE8Qf/rudWRAenR0181JKKU7Gig4Y=";
|
||||
sha256 = "sha256-naNBismaWnzLjlUy49Rz9OfkhUcFdbnWxs917ogxTjk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ mkDerivation, lib, fetchgit, cmake, qtbase, qttools }:
|
||||
{ mkDerivation, lib, fetchFromBitbucket, cmake, qtbase, qttools }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "speedcrunch";
|
||||
version = "0.12.0";
|
||||
version = "unstable-2021-10-09";
|
||||
|
||||
src = fetchgit {
|
||||
# the tagging is not standard, so you probably need to check this when updating
|
||||
rev = "refs/tags/release-${version}";
|
||||
url = "https://bitbucket.org/heldercorreia/speedcrunch";
|
||||
sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk";
|
||||
src = fetchFromBitbucket {
|
||||
owner = "heldercorreia";
|
||||
repo = pname;
|
||||
rev = "74756f3438149c01e9edc3259b0f411fa319a22f";
|
||||
sha256 = "sha256-XxQv+A5SfYXFIRK7yacxGHHne1Q93pwCGeHhchIKizU=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qttools ];
|
||||
|
@ -29,7 +29,7 @@ mkDerivation rec {
|
|||
precisions, unlimited variable storage, intelligent automatic completion
|
||||
full keyboard-friendly and more than 15 built-in math function.
|
||||
'';
|
||||
maintainers = with maintainers; [ gebner ];
|
||||
maintainers = with maintainers; [ gebner j0hax ];
|
||||
inherit (qtbase.meta) platforms;
|
||||
# works with qt 5.6 and qt 5.8
|
||||
broken = builtins.compareVersions qtbase.version "5.7.0" == 0;
|
||||
|
|
|
@ -0,0 +1,55 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, git
|
||||
, pandoc
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gg-scm";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gg-scm";
|
||||
repo = "gg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kLmu4h/EBbSFHrffvusKq38X3/ID9bOlLMvEUtnFGhk=";
|
||||
};
|
||||
patches = [ ./skip-broken-revert-tests.patch ];
|
||||
subPackages = [ "cmd/gg" ];
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X" "main.versionInfo=${version}"
|
||||
"-X" "main.buildCommit=a0b348c9cef33fa46899f5e55e3316f382a09f6a+"
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-+ZmNXB+I6vPRbACwEkfl/vVmqoZy67Zn9SBrham5zRk=";
|
||||
|
||||
nativeBuildInputs = [ git pandoc installShellFiles makeWrapper ];
|
||||
buildInputs = [ git ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/gg --suffix PATH : ${git}/bin
|
||||
pandoc --standalone --to man misc/gg.1.md -o misc/gg.1
|
||||
installManPage misc/gg.1
|
||||
installShellCompletion --cmd gg \
|
||||
--bash misc/gg.bash \
|
||||
--zsh misc/_gg.zsh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
mainProgram = "gg";
|
||||
description = "Git with less typing";
|
||||
longDescription = ''
|
||||
gg is an alternative command-line interface for Git heavily inspired by Mercurial.
|
||||
It's designed for less typing in common workflows,
|
||||
making Git easier to use for both novices and advanced users alike.
|
||||
'';
|
||||
homepage = "https://gg-scm.io/";
|
||||
changelog = "https://github.com/gg-scm/gg/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ zombiezen ];
|
||||
};
|
||||
}
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/cmd/gg/revert_test.go b/cmd/gg/revert_test.go
|
||||
index 9420e9b..ff6ca93 100644
|
||||
--- a/cmd/gg/revert_test.go
|
||||
+++ b/cmd/gg/revert_test.go
|
||||
@@ -592,6 +592,7 @@ func TestRevert_LocalRename(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestRevert_UnknownFile(t *testing.T) {
|
||||
+ t.Skip("Broken in 1.1.0")
|
||||
t.Parallel()
|
||||
t.Run("EmptyRepo", func(t *testing.T) {
|
||||
t.Parallel()
|
|
@ -2,11 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p4";
|
||||
version = "2020.1.2007551";
|
||||
version = "2021.2.2201121";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdist2.perforce.com/perforce/r20.1/bin.linux26x86_64/helix-core-server.tgz";
|
||||
sha256 = "0ly9b838zrpp6841fzapizdd3xmria55bwfrh2j29qwxiwzqj80y";
|
||||
# actually https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz but upstream deletes releases
|
||||
url = "http://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz";
|
||||
sha256 = "sha256-cmIMVek4lwVYJQbW8ziABftPZ0iIoAoSpR7cKuN4I7M=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
@ -16,8 +17,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp p4 p4broker p4d p4p $out/bin
|
||||
install -D --target $out/bin p4 p4broker p4d p4p
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
buildKodiBinaryAddon rec {
|
||||
pname = "inputstream-rtmp";
|
||||
namespace = "inputstream.rtmp";
|
||||
version = "19.0.0";
|
||||
version = "19.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "inputstream.rtmp";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-76yGttcLJJ5XJKsFJ3GnEuPs9+9J0Tr8Znm45676OI8=";
|
||||
sha256 = "sha256-BNc9HJ4Yq1WTxTr7AUHBB9yDz8oefy2EtFRwVYVGcaY=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [ openssl rtmpdump zlib ];
|
||||
|
|
|
@ -22,13 +22,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qmplay2";
|
||||
version = "21.12.07";
|
||||
version = "21.12.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zaps166";
|
||||
repo = "QMPlay2";
|
||||
rev = version;
|
||||
sha256 = "sha256-iFT88CTz7L7tnNmpe/HaeTrHiE8l0Jk+r0c6O7wJ7N8=";
|
||||
sha256 = "sha256-SHReKh+M1rgSIiweYFgVvwMeKWeQD52S4KxEiTsyHrI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -6,16 +6,16 @@ in
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "leftwm";
|
||||
version = "0.2.9";
|
||||
version = "0.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leftwm";
|
||||
repo = "leftwm";
|
||||
rev = version;
|
||||
sha256 = "sha256:0w4afhrp2cxz0nmpvalyaxz1dpywajjj2wschw8dpkvgxqs64gd5";
|
||||
sha256 = "sha256-WGss/XmryULq8Ly5MFmEqsL+9r4fnrvBEtetngJ05NY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256:0r0smpv50gim2naaa0qf6yhvqvsa2f40rkgiryi686y69m5ii7mv";
|
||||
cargoSha256 = "sha256-9qvXzsAu4H2TAcArajrGqXwKF3BBDvmZbny7hiVO9Yo=";
|
||||
|
||||
buildInputs = rpathLibs;
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
appear as they should when starting applications.
|
||||
- Chainable Keygrabber, usability for everyone.
|
||||
'';
|
||||
homepage = "http://www.pekwm.org";
|
||||
homepage = "https://www.pekwm.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
|||
meta = with lib; {
|
||||
description = "Setup mount/user namespace for FHS emulation";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ yegortimoshenko ];
|
||||
maintainers = with maintainers; [ yana ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -510,8 +510,7 @@ rec {
|
|||
tarball must contain an RPM specfile. */
|
||||
|
||||
buildRPM = attrs: runInLinuxImage (stdenv.mkDerivation ({
|
||||
prePhases = [ pkgs.prepareImagePhase pkgs.sysInfoPhase ];
|
||||
dontUnpack = true;
|
||||
prePhases = [ "prepareImagePhase" "sysInfoPhase" ];
|
||||
dontConfigure = true;
|
||||
|
||||
outDir = "rpms/${attrs.diskImage.name}";
|
||||
|
@ -536,9 +535,7 @@ rec {
|
|||
buildPhase = ''
|
||||
eval "$preBuild"
|
||||
|
||||
# Hacky: RPM looks for <basename>.spec inside the tarball, so
|
||||
# strip off the hash.
|
||||
srcName="$(stripHash "$src")"
|
||||
srcName="$(rpmspec --srpm -q --qf '%{source}' *.spec)"
|
||||
cp "$src" "$srcName" # `ln' doesn't work always work: RPM requires that the file is owned by root
|
||||
|
||||
export HOME=/tmp/home
|
||||
|
|
|
@ -9,20 +9,23 @@ with vmTools;
|
|||
|
||||
buildHelloInVM = runInLinuxVM hello;
|
||||
|
||||
buildPanInVM = runInLinuxVM pan;
|
||||
buildPcmanrmInVM = runInLinuxVM (pcmanfm.overrideAttrs (old: {
|
||||
# goes out-of-memory with many cores
|
||||
enableParallelBuilding = false;
|
||||
}));
|
||||
|
||||
|
||||
testRPMImage = makeImageTestScript diskImages.fedora16x86_64;
|
||||
testRPMImage = makeImageTestScript diskImages.fedora27x86_64;
|
||||
|
||||
|
||||
buildPatchelfRPM = buildRPM {
|
||||
name = "patchelf-rpm";
|
||||
src = patchelf.src;
|
||||
diskImage = diskImages.fedora16x86_64;
|
||||
diskImage = diskImages.fedora27x86_64;
|
||||
diskImageFormat = "qcow2";
|
||||
};
|
||||
|
||||
|
||||
testUbuntuImage = makeImageTestScript diskImages.ubuntu810i386;
|
||||
testUbuntuImage = makeImageTestScript diskImages.ubuntu1804i386;
|
||||
|
||||
|
||||
buildInDebian = runInLinuxImage (stdenv.mkDerivation {
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, fetchzip }:
|
||||
let
|
||||
version = "2110.31";
|
||||
version = "2111.01";
|
||||
in
|
||||
fetchzip {
|
||||
name = "cascadia-code-${version}";
|
||||
|
||||
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip";
|
||||
|
||||
sha256 = "sha256-SyPQtmudfogBwASTApl1hSpOPf2PLTSOzhJAJzrQ3Mg=";
|
||||
sha256 = "sha256-kUVTQ/oMZztNf22sDbQBpQW0luSc5nr5sxWU5etLDec=";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, fetchurl, libarchive }:
|
||||
|
||||
let
|
||||
version = "0.35.2";
|
||||
version = "0.35.5";
|
||||
in fetchurl {
|
||||
name = "sarasa-gothic-${version}";
|
||||
|
||||
# Use the 'ttc' files here for a smaller closure size.
|
||||
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
|
||||
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
|
||||
sha256 = "sha256-ts6GM09Z7hYHVx/JGxVPze5X1sZ/22TTdxHBGiYMn5I=";
|
||||
sha256 = "sha256-t9BYV9a/rmEr8nLqcdxg4Z5pWsCefvwI47eSwub41u0=";
|
||||
|
||||
recursiveHash = true;
|
||||
downloadToTemp = true;
|
||||
|
|
77
pkgs/desktops/gnome/apps/gnome-text-editor/default.nix
Normal file
77
pkgs/desktops/gnome/apps/gnome-text-editor/default.nix
Normal file
|
@ -0,0 +1,77 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, meson
|
||||
, fetchurl
|
||||
, python3
|
||||
, pkg-config
|
||||
, gtk4
|
||||
, glib
|
||||
, gtksourceview5
|
||||
, gsettings-desktop-schemas
|
||||
, wrapGAppsHook4
|
||||
, ninja
|
||||
, gnome
|
||||
, enchant
|
||||
, icu
|
||||
, itstool
|
||||
, libadwaita
|
||||
, libxml2
|
||||
, pcre
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-text-editor";
|
||||
version = "41.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-YZ7FINbgkF1DEWcCTkPc4Nv2o0Xy1IaTUB1w3HYm+GE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
itstool
|
||||
libxml2 # for xmllint
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
enchant
|
||||
icu
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
gtk4
|
||||
gtksourceview5
|
||||
libadwaita
|
||||
pcre
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/postinstall.py
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
substituteInPlace build-aux/meson/postinstall.py \
|
||||
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gnome-text-editor";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-text-editor";
|
||||
description = "A Text Editor for GNOME";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
haskellPackages.mkDerivation rec {
|
||||
pname = "carp";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carp-lang";
|
||||
repo = "Carp";
|
||||
rev = "v${version}";
|
||||
sha256 = "08ryk30ii24qsdpdq7bqi406ynv9nr8zy2pcv9n70ar8fxfw0859";
|
||||
sha256 = "sha256-o7NLd7jC1BvcoVzbD18LvHg/SqOnfn9yELUrpg2uZtY=";
|
||||
};
|
||||
|
||||
buildTools = [ makeWrapper ];
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "fasm-bin";
|
||||
|
||||
version = "1.73.28";
|
||||
version = "1.73.29";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://flatassembler.net/fasm-${version}.tgz";
|
||||
sha256 = "sha256-ntHrtIX9EXQRGpTrdzEFojSRE5jgUJD15xSr9iyAkpI=";
|
||||
sha256 = "sha256-Yyj02DRo9wTkJ01ukOwElHr1ZyZFPOMTibwyAkqYISs=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-jsonnet";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "go-jsonnet";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rprs8l15nbrx4dw4pdg81c5l22zhj80pl4zwqgsm4113wyyvc98";
|
||||
sha256 = "sha256-o/IjXskGaMhvQmTsAS745anGBMI2bwHf/EOEp57H8LU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0nsm4gsbbn8myz4yfi6m7qc3iizhdambsr18iks0clkdn3mi2jn1";
|
||||
vendorSha256 = "sha256-fZBhlZrLcC4xj5uvb862lBOczGnJa9CceS3D8lUhBQo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://microscheme.org";
|
||||
homepage = "https://ryansuchocki.github.io/microscheme/";
|
||||
description = "A Scheme subset for Atmel microcontrollers";
|
||||
longDescription = ''
|
||||
Microscheme is a Scheme subset/variant designed for Atmel
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kona";
|
||||
version = "20201009";
|
||||
version = "20211225";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevinlawler";
|
||||
repo = "kona";
|
||||
rev = "Win64-${version}";
|
||||
sha256 = "0v252zds61y01cf29hxznz1zc1724vxmzy059k9jiri4r73k679v";
|
||||
sha256 = "sha256-m3a9conyKN0qHSSAG8zAb3kx8ir+7dqgxm1XGjCQcfk=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cgal";
|
||||
version = "5.3";
|
||||
version = "5.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CGAL";
|
||||
repo = "releases";
|
||||
rev = "CGAL-${version}";
|
||||
sha256 = "sha256-ogY47Ggtj9k2U5pop1DNFkTusgQi2nNLc5OGN45SBCk=";
|
||||
sha256 = "sha256-atILY/d2b99v0Kk226KwJ/qEcJnWBhtge52wkz6Bgcg=";
|
||||
};
|
||||
|
||||
# note: optional component libCGAL_ImageIO would need zlib and opengl;
|
||||
|
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-activemq";
|
||||
version = "5.16.2";
|
||||
version = "5.16.3";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "sha256-IS/soe5Lx1C+/UWnNcv+8AwMmu5FHvURbpkTMMGrEFs=";
|
||||
sha256 = "sha256-GEbaKYXsZCU+zEGlTxR3cx60dQ/oQKndn9/uiOXJQlI=";
|
||||
url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
|
||||
};
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bctoolbox";
|
||||
version = "5.0.55";
|
||||
version = "5.0.58";
|
||||
|
||||
nativeBuildInputs = [ cmake bcunit ];
|
||||
buildInputs = [ mbedtls ];
|
||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-fZ+8XBTZ6/wNd8odzg20dAXtbjRudI6Nw0hKC9bopGo=";
|
||||
sha256 = "sha256-N7XxGTZkMSL+zyKHteVeRoZ63ZdT5Pq60xi9v6QURxA=";
|
||||
};
|
||||
|
||||
# Do not build static libraries
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "entt";
|
||||
version = "3.8.1";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skypjack";
|
||||
repo = "entt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vg2tpGyZZM8c97Qko88JMP5YNPZx5kI5qRkkRclvZtA=";
|
||||
sha256 = "sha256-7UeL8D+A0pH3TKNO5B8A1nhD7uDWeirHnHaI/YKVwyo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/skypjack/entt";
|
||||
description = "A header-only, tiny and easy to use library for game programming and much more written in modern C++";
|
||||
maintainers = with maintainers; [ twey ];
|
||||
platforms = platforms.all;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.3.5";
|
||||
version = "3.3.6";
|
||||
pname = "glfw";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glfw";
|
||||
repo = "GLFW";
|
||||
rev = version;
|
||||
sha256 = "sha256-1KkzYclOLGqiV1/8BsJ3e+pXMQ6a+sjLwZ7mjSuxxbA=";
|
||||
sha256 = "sha256-mYcnucIRudLLySShKSDzsQfuoM2/0guKpeLSGuAWEkQ=";
|
||||
};
|
||||
|
||||
# Fix freezing on Wayland (https://github.com/glfw/glfw/pull/1711)
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imgui";
|
||||
version = "1.85";
|
||||
version = "1.86";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocornut";
|
||||
repo = "imgui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HQsGlsvmf3ikqhGnJHf/d6SRCY/QDeW7XUTwXQH/JYE=";
|
||||
sha256 = "sha256-NuyWrtD+/bRkMlsvU0gNkQhDJVlSPPWhBELN/AtYRwk=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Smart card emulation library";
|
||||
homepage = "https://gitlab.freedesktop.org/spice/libcacard";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ yegortimoshenko ];
|
||||
maintainers = with maintainers; [ yana ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Inotify shim for macOS and BSD";
|
||||
homepage = "https://github.com/libinotify-kqueue/libinotify-kqueue";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ yegortimoshenko ];
|
||||
maintainers = with maintainers; [ yana ];
|
||||
platforms = with platforms; darwin ++ freebsd ++ netbsd ++ openbsd;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects";
|
||||
homepage = "https://github.com/EasyRPG/liblcf";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ yegortimoshenko ];
|
||||
maintainers = with maintainers; [ yana ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libplctag";
|
||||
version = "2.4.7";
|
||||
version = "2.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libplctag";
|
||||
repo = "libplctag";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DLx9VBmyn5L30i6qPK4LD+3cOo7zG2YLOui6+krU9So=";
|
||||
sha256 = "sha256-GVYG+ioqGo0k6ClrJu2mijtuBBFc9l6dNexNDNyh5+8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, doxygen
|
||||
, pkg-config
|
||||
, python3
|
||||
, python3Packages
|
||||
, wafHook
|
||||
, boost
|
||||
, boost175
|
||||
, openssl
|
||||
, sqlite
|
||||
}:
|
||||
|
@ -18,19 +19,28 @@ stdenv.mkDerivation rec {
|
|||
owner = "named-data";
|
||||
repo = "ndn-cxx";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "1lcaqc79n3d9sip7knddblba17sz18b0w7nlxmj3fz3lb3z9qd51";
|
||||
sha256 = "sha256-oTSc/lh0fDdk7dQeDhYKX5+gFl2t2Xlu1KkNmw7DitE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ];
|
||||
|
||||
buildInputs = [ boost openssl sqlite ];
|
||||
buildInputs = [ boost175 openssl sqlite ];
|
||||
|
||||
wafConfigureFlags = [
|
||||
"--with-openssl=${openssl.dev}"
|
||||
"--boost-includes=${boost.dev}/include"
|
||||
"--boost-libs=${boost.out}/lib"
|
||||
"--boost-includes=${boost175.dev}/include"
|
||||
"--boost-libs=${boost175.out}/lib"
|
||||
# "--with-tests" # disabled since upstream tests fail (Net/TestFaceUri/ParseDev Bug #3896)
|
||||
];
|
||||
|
||||
|
||||
doCheck = false; # disabled since upstream tests fail (Net/TestFaceUri/ParseDev Bug #3896)
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
LD_PRELOAD=build/ndn-cxx.so build/unit-tests
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://named-data.net/";
|
||||
description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
|
||||
|
@ -49,6 +59,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ sjmackenzie ];
|
||||
maintainers = with maintainers; [ sjmackenzie bertof ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
FSTs have key applications in speech recognition and synthesis, machine translation, optical character recognition,
|
||||
pattern matching, string processing, machine learning, information extraction and retrieval among others
|
||||
'';
|
||||
homepage = "http://www.openfst.org/twiki/bin/view/FST/WebHome";
|
||||
homepage = "https://www.openfst.org/twiki/bin/view/FST/WebHome";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.dfordivam ];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Library to make and modify n-gram language models encoded as weighted finite-state transducers";
|
||||
homepage = "http://www.openfst.org/twiki/bin/view/GRM/NGramLibrary";
|
||||
homepage = "https://www.openfst.org/twiki/bin/view/GRM/NGramLibrary";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ adolfogc yegortimoshenko ];
|
||||
maintainers = with maintainers; [ adolfogc yana ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -18,11 +18,11 @@ assert petsc-withp4est -> p4est.mpiSupport;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "petsc";
|
||||
version = "3.16.1";
|
||||
version = "3.16.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
|
||||
sha256 = "sha256-kJz3vOe2oN2yWAoayVAqoBYx7EEFxxZZTBgE8O4eoGo=";
|
||||
sha256 = "sha256-erJXrhUNSDesjThyodIGmXliV4eF7CQnY5zqxG0TG7w=";
|
||||
};
|
||||
|
||||
mpiSupport = !withp4est || p4est.mpiSupport;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sentry-native";
|
||||
version = "0.4.12";
|
||||
version = "0.4.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-native";
|
||||
rev = version;
|
||||
sha256 = "sha256-ut864o4LHmuHYJszFz7LFoIiSvf6a0S42xmV51CVBQ0=";
|
||||
sha256 = "sha256-btgv/GwwQhT/DtWhjM/g081UYLT7E76ZhqXZdMiIWsk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tdlib";
|
||||
version = "1.7.12";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdlib";
|
||||
repo = "td";
|
||||
# https://github.com/tdlib/td/issues/1790
|
||||
rev = "a69030239c53951db8a1b0af6408f24d63f5dcb7";
|
||||
sha256 = "tqytmjij79YzvBP1abbA/Oavx28mvEGESn39b3HYAMg=";
|
||||
rev = "b3ab664a18f8611f4dfcd3054717504271eeaa7a";
|
||||
sha256 = "OBgzFBi+lIBbKnHDm5D/F3Xi4s1x4geb+1OoBP3F+qY=";
|
||||
};
|
||||
|
||||
buildInputs = [ gperf openssl readline zlib ];
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uid_wrapper";
|
||||
version = "1.2.8";
|
||||
version = "1.2.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://samba/cwrap/uid_wrapper-${version}.tar.gz";
|
||||
sha256 = "0swm9d8l69dw7nbrw6xh7rdy7cfrqflw3hxshicsrhd9v03iwvqf";
|
||||
sha256 = "sha256-fowCQHKCX+hrq0ZZHPS5CeOZz5j1SCL55SdC9CAEcIQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://github.com/erfanoabdi/imgpatchtools";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ yegortimoshenko ];
|
||||
maintainers = with maintainers; [ yana ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
|
||||
let
|
||||
pname = "php-cs-fixer";
|
||||
version = "3.3.2";
|
||||
version = "3.4.0";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
|
||||
sha256 = "sha256-iny2/L+RbwHUtCO3hQtEAbxocnUBG29DcyJnmk/EYT8=";
|
||||
sha256 = "sha256-UlZ3L5JaFN988WaHeZZRdl9yif29zFO0LMiFDGkMFuQ=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohue";
|
||||
version = "3.0.10";
|
||||
version = "3.0.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-LwtE9F5ic0aZ9/q3dSWn20O27yW/QD/Yi1NPdFmiP10=";
|
||||
sha256 = "sha256-McC5DX3Cti9eGpPniywNY2DvbAqHSFwhek85TJN/zn0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
37
pkgs/development/python-modules/brother-ql/default.nix
Normal file
37
pkgs/development/python-modules/brother-ql/default.nix
Normal file
|
@ -0,0 +1,37 @@
|
|||
{ stdenv
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, future
|
||||
, packbits
|
||||
, pillow
|
||||
, pyusb
|
||||
, pytest
|
||||
, mock
|
||||
, click
|
||||
, attrs
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "brother-ql";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "brother_ql";
|
||||
inherit version;
|
||||
sha256 = "sha256-H1xXoDnwEsnCBDl/RwAB9267dINCHr3phdDLPGFOhmA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future packbits pillow pyusb click attrs ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python package for the raster language protocol of the Brother QL series label printers";
|
||||
longDescription = ''
|
||||
Python package for the raster language protocol of the Brother QL series label printers
|
||||
(QL-500, QL-550, QL-570, QL-700, QL-710W, QL-720NW, QL-800, QL-820NWB, QL-1050 and more)
|
||||
'';
|
||||
homepage = "https://github.com/pklaus/brother_ql";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ grahamc ];
|
||||
};
|
||||
}
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cvxpy";
|
||||
version = "1.1.17";
|
||||
version = "1.1.18";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-M5fTuJ13Dqnw/DWbHJs6/t5qDTvqHP8g4mU7E0Uc24o=";
|
||||
sha256 = "sha256-W67+Hy7Wk3dJspNYbGzk9C7TDniQIj92Ycyyu333C+8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -12,12 +12,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "deemix";
|
||||
version = "3.6.3";
|
||||
version = "3.6.4";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-mzQ5bqVBMkfBQmedO8+qh7r1OwWQxg1oMHGaYWBlBWo=";
|
||||
sha256 = "268617b3ff9346ae51a063cbdb820c1f591cbadc1cf2fafd201dc671e721c1dd";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
41
pkgs/development/python-modules/deepdish/default.nix
Normal file
41
pkgs/development/python-modules/deepdish/default.nix
Normal file
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, numpy
|
||||
, scipy
|
||||
, tables
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deepdish";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1wqzwh3y0mjdyba5kfbvlamn561d3afz50zi712c7klkysz3mzva";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
tables
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"deepdish"
|
||||
];
|
||||
|
||||
# checkInputs = [
|
||||
# pandas
|
||||
# ];
|
||||
|
||||
# The tests are broken: `ModuleNotFoundError: No module named 'deepdish.six.conf'`
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Flexible HDF5 saving/loading and other data science tools from the University of Chicago.";
|
||||
homepage = "https://github.com/uchicago-cs/deepdish";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ndl ];
|
||||
};
|
||||
}
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "defcon";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "140f51da51e9630a9fa11dfd34376c4e29785fdb0bddc2e371df5b36bec17b76";
|
||||
sha256 = "a009862a0bc3f41f2b1a1b1f80d6aeedb3a17ed77d598da09f5a1bd93e970b3c";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fontParts";
|
||||
version = "0.9.11";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "558a5f681fcf7ca0bb5a1c68917b5d9b61c77d517833a01ea1667773d13f4012";
|
||||
sha256 = "794ada47e19ba41ef39b59719be312b127672bcb56bb7208dd3234d2bb3e8218";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-nest-sdm";
|
||||
version = "0.4.9";
|
||||
version = "1.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "allenporter";
|
||||
repo = "python-google-nest-sdm";
|
||||
rev = version;
|
||||
sha256 = "sha256-Y0p1Hu3hcJQzbHmwMaIC8l5W4GXuuX8LBLCOvQ1N0So=";
|
||||
sha256 = "sha256-gg5JAkTUuch6HcRLl1Xm/LAoC32EcayG1w3Fk7GrZD8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue