Merge staging-next into staging
This commit is contained in:
commit
e436cc21a6
|
@ -123,7 +123,11 @@ rec {
|
|||
{ x = "a"; y = "b"; }
|
||||
=> { x = "a"; xa = "a"; y = "b"; yb = "b"; }
|
||||
*/
|
||||
concatMapAttrs = f: flip pipe [ (mapAttrs f) attrValues (foldl' mergeAttrs { }) ];
|
||||
concatMapAttrs = f: v:
|
||||
foldl' mergeAttrs { }
|
||||
(attrValues
|
||||
(mapAttrs f v)
|
||||
);
|
||||
|
||||
|
||||
/* Update or set specific paths of an attribute set.
|
||||
|
|
|
@ -292,6 +292,7 @@ with lib.maintainers; {
|
|||
members = [
|
||||
imincik
|
||||
sikmir
|
||||
nh2
|
||||
];
|
||||
scope = "Maintain geospatial packages.";
|
||||
shortName = "Geospatial";
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
|
||||
- Create the first release note entry in this section!
|
||||
|
||||
- [acme-dns](https://github.com/joohoi/acme-dns), a limited DNS server to handle ACME DNS challenges easily and securely. Available as [services.acme-dns](#opt-services.acme-dns.enable).
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- [river](https://github.com/riverwm/river), A dynamic tiling wayland compositor. Available as [programs.river](#opt-programs.river.enable).
|
||||
|
|
|
@ -808,6 +808,7 @@
|
|||
./services/network-filesystems/xtreemfs.nix
|
||||
./services/network-filesystems/yandex-disk.nix
|
||||
./services/networking/3proxy.nix
|
||||
./services/networking/acme-dns.nix
|
||||
./services/networking/adguardhome.nix
|
||||
./services/networking/alice-lg.nix
|
||||
./services/networking/amuled.nix
|
||||
|
|
154
nixos/modules/services/networking/acme-dns.nix
Normal file
154
nixos/modules/services/networking/acme-dns.nix
Normal file
|
@ -0,0 +1,154 @@
|
|||
{ lib
|
||||
, config
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.acme-dns;
|
||||
format = pkgs.formats.toml { };
|
||||
inherit (lib)
|
||||
literalExpression
|
||||
mdDoc
|
||||
mkEnableOption
|
||||
mkOption
|
||||
mkPackageOptionMD
|
||||
types
|
||||
;
|
||||
domain = "acme-dns.example.com";
|
||||
in
|
||||
{
|
||||
options.services.acme-dns = {
|
||||
enable = mkEnableOption (mdDoc "acme-dns");
|
||||
|
||||
package = mkPackageOptionMD pkgs "acme-dns" { };
|
||||
|
||||
settings = mkOption {
|
||||
description = mdDoc ''
|
||||
Free-form settings written directly to the `acme-dns.cfg` file.
|
||||
Refer to <https://github.com/joohoi/acme-dns/blob/master/README.md#configuration> for supported values.
|
||||
'';
|
||||
|
||||
default = { };
|
||||
|
||||
type = types.submodule {
|
||||
freeformType = format.type;
|
||||
options = {
|
||||
general = {
|
||||
listen = mkOption {
|
||||
type = types.str;
|
||||
description = mdDoc "IP+port combination to bind and serve the DNS server on.";
|
||||
default = "[::]:53";
|
||||
example = "127.0.0.1:53";
|
||||
};
|
||||
|
||||
protocol = mkOption {
|
||||
type = types.enum [ "both" "both4" "both6" "udp" "udp4" "udp6" "tcp" "tcp4" "tcp6" ];
|
||||
description = mdDoc "Protocols to serve DNS responses on.";
|
||||
default = "both";
|
||||
};
|
||||
|
||||
domain = mkOption {
|
||||
type = types.str;
|
||||
description = mdDoc "Domain name to serve the requests off of.";
|
||||
example = domain;
|
||||
};
|
||||
|
||||
nsname = mkOption {
|
||||
type = types.str;
|
||||
description = mdDoc "Zone name server.";
|
||||
example = domain;
|
||||
};
|
||||
|
||||
nsadmin = mkOption {
|
||||
type = types.str;
|
||||
description = mdDoc "Zone admin email address for `SOA`.";
|
||||
example = "admin.example.com";
|
||||
};
|
||||
|
||||
records = mkOption {
|
||||
type = types.listOf types.str;
|
||||
description = mdDoc "Predefined DNS records served in addition to the `_acme-challenge` TXT records.";
|
||||
example = literalExpression ''
|
||||
[
|
||||
# replace with your acme-dns server's public IPv4
|
||||
"${domain}. A 198.51.100.1"
|
||||
# replace with your acme-dns server's public IPv6
|
||||
"${domain}. AAAA 2001:db8::1"
|
||||
# ${domain} should resolve any *.${domain} records
|
||||
"${domain}. NS ${domain}."
|
||||
]
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
database = {
|
||||
engine = mkOption {
|
||||
type = types.enum [ "sqlite3" "postgres" ];
|
||||
description = mdDoc "Database engine to use.";
|
||||
default = "sqlite3";
|
||||
};
|
||||
connection = mkOption {
|
||||
type = types.str;
|
||||
description = mdDoc "Database connection string.";
|
||||
example = "postgres://user:password@localhost/acmedns";
|
||||
default = "/var/lib/acme-dns/acme-dns.db";
|
||||
};
|
||||
};
|
||||
|
||||
api = {
|
||||
ip = mkOption {
|
||||
type = types.str;
|
||||
description = mdDoc "IP to bind the HTTP API on.";
|
||||
default = "[::]";
|
||||
example = "127.0.0.1";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
description = mdDoc "Listen port for the HTTP API.";
|
||||
default = 8080;
|
||||
# acme-dns expects this value to be a string
|
||||
apply = toString;
|
||||
};
|
||||
|
||||
disable_registration = mkOption {
|
||||
type = types.bool;
|
||||
description = mdDoc "Whether to disable the HTTP registration endpoint.";
|
||||
default = false;
|
||||
example = true;
|
||||
};
|
||||
|
||||
tls = mkOption {
|
||||
type = types.enum [ "letsencrypt" "letsencryptstaging" "cert" "none" ];
|
||||
description = mdDoc "TLS backend to use.";
|
||||
default = "none";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
logconfig = {
|
||||
loglevel = mkOption {
|
||||
type = types.enum [ "error" "warning" "info" "debug" ];
|
||||
description = mdDoc "Level to log on.";
|
||||
default = "info";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.packages = [ cfg.package ];
|
||||
systemd.services.acme-dns = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = [ "" "${lib.getExe cfg.package} -c ${format.generate "acme-dns.toml" cfg.settings}" ];
|
||||
StateDirectory = "acme-dns";
|
||||
WorkingDirectory = "%S/acme-dns";
|
||||
DynamicUser = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
50
nixos/tests/acme-dns.nix
Normal file
50
nixos/tests/acme-dns.nix
Normal file
|
@ -0,0 +1,50 @@
|
|||
import ./make-test-python.nix ({ ... }: {
|
||||
name = "acme-dns";
|
||||
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
services.acme-dns = {
|
||||
enable = true;
|
||||
settings = {
|
||||
general = rec {
|
||||
domain = "acme-dns.home.arpa";
|
||||
nsname = domain;
|
||||
nsadmin = "admin.home.arpa";
|
||||
records = [
|
||||
"${domain}. A 127.0.0.1"
|
||||
"${domain}. AAAA ::1"
|
||||
"${domain}. NS ${domain}."
|
||||
];
|
||||
};
|
||||
logconfig.loglevel = "debug";
|
||||
};
|
||||
};
|
||||
environment.systemPackages = with pkgs; [ curl bind ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
import json
|
||||
|
||||
machine.wait_for_unit("acme-dns.service")
|
||||
machine.wait_for_open_port(53) # dns
|
||||
machine.wait_for_open_port(8080) # http api
|
||||
|
||||
result = machine.succeed("curl --fail -X POST http://localhost:8080/register")
|
||||
print(result)
|
||||
|
||||
registration = json.loads(result)
|
||||
|
||||
machine.succeed(f'dig -t TXT @localhost {registration["fulldomain"]} | grep "SOA" | grep "admin.home.arpa"')
|
||||
|
||||
# acme-dns exspects a TXT value string length of exactly 43 chars
|
||||
txt = "___dummy_validation_token_for_txt_record___"
|
||||
|
||||
machine.succeed(
|
||||
"curl --fail -X POST http://localhost:8080/update "
|
||||
+ f' -H "X-Api-User: {registration["username"]}"'
|
||||
+ f' -H "X-Api-Key: {registration["password"]}"'
|
||||
+ f' -d \'{{"subdomain":"{registration["subdomain"]}", "txt":"{txt}"}}\'''
|
||||
)
|
||||
|
||||
assert txt in machine.succeed(f'dig -t TXT +short @localhost {registration["fulldomain"]}')
|
||||
'';
|
||||
})
|
|
@ -95,6 +95,7 @@ in {
|
|||
_3proxy = runTest ./3proxy.nix;
|
||||
aaaaxy = runTest ./aaaaxy.nix;
|
||||
acme = runTest ./acme.nix;
|
||||
acme-dns = handleTest ./acme-dns.nix {};
|
||||
adguardhome = runTest ./adguardhome.nix;
|
||||
aesmd = runTestOn ["x86_64-linux"] ./aesmd.nix;
|
||||
agate = runTest ./web-servers/agate.nix;
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -223,6 +223,17 @@
|
|||
};
|
||||
meta.homepage = "https://github.com/addcninblue/tree-sitter-cooklang";
|
||||
};
|
||||
corn = buildGrammar {
|
||||
language = "corn";
|
||||
version = "0.0.0+rev=6a6b0f4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jakestanger";
|
||||
repo = "tree-sitter-corn";
|
||||
rev = "6a6b0f4b1d564392c1b6a8ebcc27d94185f72ede";
|
||||
hash = "sha256-7sBdw8AsRvWo8iSALt9slO0HLVoLTPrU7Tt46mMPLoc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/jakestanger/tree-sitter-corn";
|
||||
};
|
||||
cpon = buildGrammar {
|
||||
language = "cpon";
|
||||
version = "0.0.0+rev=f4b3cbc";
|
||||
|
@ -601,12 +612,12 @@
|
|||
};
|
||||
gleam = buildGrammar {
|
||||
language = "gleam";
|
||||
version = "0.0.0+rev=ae79782";
|
||||
version = "0.0.0+rev=2d5d6b0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleam-lang";
|
||||
repo = "tree-sitter-gleam";
|
||||
rev = "ae79782c00656945db69641378e688cdb78d52c1";
|
||||
hash = "sha256-8zxNOQnYvCHdkeyQwBGKL8fkRRinB3GUogPuw2X5n4I=";
|
||||
rev = "2d5d6b001ba12bf1c7ac94679d69ac2bed3151dc";
|
||||
hash = "sha256-9NHjBGvWLxenbD4dDBdWOOT7fVDIvyigilyd/SDtQtE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
|
||||
};
|
||||
|
@ -1244,12 +1255,12 @@
|
|||
};
|
||||
ocamllex = buildGrammar {
|
||||
language = "ocamllex";
|
||||
version = "0.0.0+rev=ac1d595";
|
||||
version = "0.0.0+rev=6211855";
|
||||
src = fetchFromGitHub {
|
||||
owner = "atom-ocaml";
|
||||
repo = "tree-sitter-ocamllex";
|
||||
rev = "ac1d5957e719d49bd6acd27439b79843e4daf8ed";
|
||||
hash = "sha256-XRxAnl+9F6AYPyd6BGNQOo+KjRs2el78ziyo7NeD1IE=";
|
||||
rev = "62118551bd9501b8253598b835cb4bef04b31e3d";
|
||||
hash = "sha256-oHniBpZj325U93vt4lgHPLqLxZj9YyKMwBdVQV59tZ8=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/atom-ocaml/tree-sitter-ocamllex";
|
||||
|
@ -1311,12 +1322,12 @@
|
|||
};
|
||||
php = buildGrammar {
|
||||
language = "php";
|
||||
version = "0.0.0+rev=ff6a35b";
|
||||
version = "0.0.0+rev=a17c0ca";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-php";
|
||||
rev = "ff6a35badb0fe373575196bd728a8a53e9be70bd";
|
||||
hash = "sha256-mjpomE8jFusmBjXkFFCnliQ2oKhGYK5DRuIO8GPfb+c=";
|
||||
rev = "a17c0caaf133f7bb37b3531dadcfd0879bea23f1";
|
||||
hash = "sha256-gXJYJ5tkhjh6KgdLfaKcg5EkaiZmY4hAe2MkW68z98M=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
|
||||
};
|
||||
|
@ -1597,12 +1608,12 @@
|
|||
};
|
||||
scala = buildGrammar {
|
||||
language = "scala";
|
||||
version = "0.0.0+rev=17a19b0";
|
||||
version = "0.0.0+rev=dacd7bd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-scala";
|
||||
rev = "17a19b0f0505eec059b82e1b2fd8928f5f6f0b02";
|
||||
hash = "sha256-YvFjzxBQQmL0+Lw8olMiomu6sDiqdTTPuiygHwB3Kww=";
|
||||
rev = "dacd7bdbe27ba79fb7f3959d220f97820dc71dcc";
|
||||
hash = "sha256-ceJY9EsLqoOh9xrcKMtwrnC3rmMaLfZFK3uCYKRR+qk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
|
||||
};
|
||||
|
|
|
@ -746,6 +746,18 @@ self: super: {
|
|||
vimCommandCheck = "MinimapToggle";
|
||||
});
|
||||
|
||||
minsnip-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "minsnip.nvim";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "minsnip.nvim";
|
||||
rev = "6ae2f3247b3a2acde540ccef2e843fdfcdfebcee";
|
||||
sha256 = "1db5az5civ2bnqg7v3g937mn150ys52258c3glpvdvyyasxb4iih";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/";
|
||||
};
|
||||
|
||||
ncm2 = super.ncm2.overrideAttrs (old: {
|
||||
dependencies = with self; [ nvim-yarp ];
|
||||
});
|
||||
|
@ -900,7 +912,7 @@ self: super: {
|
|||
pname = "sg-nvim-rust";
|
||||
inherit (old) version src;
|
||||
|
||||
cargoHash = "sha256-gnQNQlW/c1vzyR+HbYn7rpxZ1C6WXFcqpylIOTUMZ6g=";
|
||||
cargoHash = "sha256-9iXKVlhoyyRXCP4Bx9rCHljETdE9UD9PNWqPYDurQnI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
@ -436,7 +436,6 @@ https://github.com/chikamichi/mediawiki.vim/,HEAD,
|
|||
https://github.com/savq/melange-nvim/,,
|
||||
https://github.com/echasnovski/mini.nvim/,,
|
||||
https://github.com/wfxr/minimap.vim/,,
|
||||
https://github.com/jose-elias-alvarez/minsnip.nvim/,,
|
||||
https://github.com/jghauser/mkdir.nvim/,main,
|
||||
https://github.com/SidOfc/mkdx/,,
|
||||
https://github.com/tomasr/molokai/,,
|
||||
|
@ -997,6 +996,7 @@ https://github.com/artur-shaik/vim-javacomplete2/,,
|
|||
https://github.com/pangloss/vim-javascript/,,
|
||||
https://github.com/jelera/vim-javascript-syntax/,,
|
||||
https://github.com/lepture/vim-jinja/,,
|
||||
https://github.com/seirl/vim-jinja-languages/,HEAD,
|
||||
https://github.com/maksimr/vim-jsbeautify/,,
|
||||
https://github.com/heavenshell/vim-jsdoc/,,
|
||||
https://github.com/elzr/vim-json/,,
|
||||
|
@ -1039,6 +1039,7 @@ https://github.com/samoshkin/vim-mergetool/,,
|
|||
https://github.com/idanarye/vim-merginal/,,
|
||||
https://github.com/david-a-wheeler/vim-metamath/,,
|
||||
https://github.com/xolox/vim-misc/,,
|
||||
https://github.com/delroth/vim-molokai-delroth/,HEAD,
|
||||
https://github.com/crusoexia/vim-monokai/,,
|
||||
https://github.com/phanviet/vim-monokai-pro/,,
|
||||
https://github.com/patstockwell/vim-monokai-tasty/,HEAD,
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "spicetify-cli";
|
||||
version = "2.18.1";
|
||||
version = "2.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spicetify";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BZuvuvbFCZ6VaztlZhlUZhJ7vf4W49mVHiORhH8oH2Y=";
|
||||
sha256 = "sha256-ax1e4M+BReVjudcmR1fatMzH/zTNCPG4BWoSNJPQFts=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-g0SuXDzYjg0mGzeDuB2tQnVnDmTiL5vw0r9QWSgIs3Q=";
|
||||
|
|
|
@ -24,14 +24,14 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "tellico";
|
||||
version = "3.4.6";
|
||||
version = "3.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "office";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aHA4DYuxh4vzXL82HRGMPfqS0DGqq/FLMEuhsr4eLko=";
|
||||
hash = "sha256-uMq/iqPAbjR85wkgqUS1pk2BL/eatNFpyKcagjN5rJ4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "4.0.1";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1JSFhuH/YdWFckFxaky11R8eXl2xzYe5VCk0XGXwCp8=";
|
||||
sha256 = "sha256-v7ED66CQ1DHfsrOXFJDlH80xL/U9ROn7fpGxPOm2WY4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oO/EMaVkcc054C6VOPjh6r4UhHifq2rQKtrYSg5frFQ=";
|
||||
vendorHash = "sha256-4tYtqsi8b7jfd3rxr7HY6XXRVROne6mN0hLVkPZdmCs=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
@ -48,11 +48,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-boxes";
|
||||
version = "44.1";
|
||||
version = "44.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "OJcGDWlvf6LZEudywnYdvlNDOrXxnr+kvE6Jc4X6ulM=";
|
||||
sha256 = "ndOJwUnQwPpXRW7DY9UaiCVflFVY+530KJTOeO+F34k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -31,13 +31,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eog";
|
||||
version = "44.1";
|
||||
version = "44.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-4slj8jL+WhCR3MGL7CWnMOkbAq9uRmYB76VeUAzXTKs=";
|
||||
sha256 = "sha256-Ro9Tn2tn7kYYgXDyREgMwxHdHv5Hhv4VVL/+JqZccsQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -65,11 +65,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-control-center";
|
||||
version = "44.1";
|
||||
version = "44.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-er02UBjihnne9gpezTBJ2w+4XebaSaltrdIfuo2wAuc=";
|
||||
sha256 = "sha256-BiPX0hz+lw0u80QgYjVFpZRbmJLmQfmgEc7Owhr9oQw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -23,11 +23,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sushi";
|
||||
version = "43.0";
|
||||
version = "44.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "V4SFJhSasceE+5L7yTTDUU/lIqumSdXZ/t7H4bFHUns=";
|
||||
sha256 = "bAAv4K6hkCe6RIta7JTVzXU8l1L5lu4DMVJChzjqQ+k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "24.3.4.11";
|
||||
sha256 = "sha256-1A73UOCPJnCRCAXTEPc3VTHsDJIWQjlPJXkuwQBV0r4=";
|
||||
version = "24.3.4.12";
|
||||
sha256 = "sha256-XrQvpIHCxXbcaP9cvX1nwl9LumZeVzlgRJwq2Dj0VoY=";
|
||||
}
|
||||
|
|
|
@ -10,10 +10,10 @@ Only if environment variable NIXOS_USERS_PURE is set.
|
|||
2 files changed, 45 insertions(+)
|
||||
|
||||
diff --git a/src/daemon.c b/src/daemon.c
|
||||
index e62e124..87459b2 100644
|
||||
index 861430f..aefaf2d 100644
|
||||
--- a/src/daemon.c
|
||||
+++ b/src/daemon.c
|
||||
@@ -931,6 +931,11 @@ daemon_create_user (AccountsAccounts *accounts,
|
||||
@@ -1378,6 +1378,11 @@ daemon_create_user (AccountsAccounts *accounts,
|
||||
const gchar *real_name,
|
||||
gint account_type)
|
||||
{
|
||||
|
@ -22,10 +22,10 @@ index e62e124..87459b2 100644
|
|||
+ return;
|
||||
+ }
|
||||
+
|
||||
Daemon *daemon = (Daemon*)accounts;
|
||||
Daemon *daemon = (Daemon *) accounts;
|
||||
CreateUserData *data;
|
||||
|
||||
@@ -1138,6 +1143,11 @@ daemon_delete_user (AccountsAccounts *accounts,
|
||||
@@ -1581,6 +1586,11 @@ daemon_delete_user (AccountsAccounts *accounts,
|
||||
gint64 uid,
|
||||
gboolean remove_files)
|
||||
{
|
||||
|
@ -34,14 +34,14 @@ index e62e124..87459b2 100644
|
|||
+ return;
|
||||
+ }
|
||||
+
|
||||
Daemon *daemon = (Daemon*)accounts;
|
||||
Daemon *daemon = (Daemon *) accounts;
|
||||
DeleteUserData *data;
|
||||
|
||||
diff --git a/src/user.c b/src/user.c
|
||||
index 0fb1a17..dbdebaf 100644
|
||||
index 28170db..df947a1 100644
|
||||
--- a/src/user.c
|
||||
+++ b/src/user.c
|
||||
@@ -904,6 +904,11 @@ user_set_real_name (AccountsUser *auser,
|
||||
@@ -1216,6 +1216,11 @@ user_set_real_name (AccountsUser *auser,
|
||||
GDBusMethodInvocation *context,
|
||||
const gchar *real_name)
|
||||
{
|
||||
|
@ -50,10 +50,10 @@ index 0fb1a17..dbdebaf 100644
|
|||
+ return;
|
||||
+ }
|
||||
+
|
||||
User *user = (User*)auser;
|
||||
User *user = (User *) auser;
|
||||
int uid;
|
||||
const gchar *action_id;
|
||||
@@ -981,6 +986,11 @@ user_set_user_name (AccountsUser *auser,
|
||||
@@ -1293,6 +1298,11 @@ user_set_user_name (AccountsUser *auser,
|
||||
GDBusMethodInvocation *context,
|
||||
const gchar *user_name)
|
||||
{
|
||||
|
@ -62,10 +62,10 @@ index 0fb1a17..dbdebaf 100644
|
|||
+ return;
|
||||
+ }
|
||||
+
|
||||
User *user = (User*)auser;
|
||||
User *user = (User *) auser;
|
||||
|
||||
daemon_local_check_auth (user->daemon,
|
||||
user,
|
||||
@@ -1263,6 +1273,11 @@ user_set_home_directory (AccountsUser *auser,
|
||||
@@ -1945,6 +1955,11 @@ user_set_home_directory (AccountsUser *auser,
|
||||
GDBusMethodInvocation *context,
|
||||
const gchar *home_dir)
|
||||
{
|
||||
|
@ -74,10 +74,10 @@ index 0fb1a17..dbdebaf 100644
|
|||
+ return;
|
||||
+ }
|
||||
+
|
||||
User *user = (User*)auser;
|
||||
User *user = (User *) auser;
|
||||
|
||||
daemon_local_check_auth (user->daemon,
|
||||
user,
|
||||
@@ -1322,6 +1337,11 @@ user_set_shell (AccountsUser *auser,
|
||||
@@ -2000,6 +2015,11 @@ user_set_shell (AccountsUser *auser,
|
||||
GDBusMethodInvocation *context,
|
||||
const gchar *shell)
|
||||
{
|
||||
|
@ -86,10 +86,10 @@ index 0fb1a17..dbdebaf 100644
|
|||
+ return;
|
||||
+ }
|
||||
+
|
||||
User *user = (User*)auser;
|
||||
User *user = (User *) auser;
|
||||
|
||||
daemon_local_check_auth (user->daemon,
|
||||
user,
|
||||
@@ -1602,6 +1622,11 @@ user_set_locked (AccountsUser *auser,
|
||||
@@ -2249,6 +2269,11 @@ user_set_locked (AccountsUser *auser,
|
||||
GDBusMethodInvocation *context,
|
||||
gboolean locked)
|
||||
{
|
||||
|
@ -98,10 +98,10 @@ index 0fb1a17..dbdebaf 100644
|
|||
+ return;
|
||||
+ }
|
||||
+
|
||||
User *user = (User*)auser;
|
||||
User *user = (User *) auser;
|
||||
|
||||
daemon_local_check_auth (user->daemon,
|
||||
user,
|
||||
@@ -1814,6 +1839,11 @@ user_set_password_mode (AccountsUser *auser,
|
||||
@@ -2457,6 +2482,11 @@ user_set_password_mode (AccountsUser *auser,
|
||||
GDBusMethodInvocation *context,
|
||||
gint mode)
|
||||
{
|
||||
|
@ -110,10 +110,10 @@ index 0fb1a17..dbdebaf 100644
|
|||
+ return;
|
||||
+ }
|
||||
+
|
||||
User *user = (User*)auser;
|
||||
User *user = (User *) auser;
|
||||
const gchar *action_id;
|
||||
|
||||
@@ -1905,6 +1935,11 @@ user_set_password (AccountsUser *auser,
|
||||
gint uid;
|
||||
@@ -2550,6 +2580,11 @@ user_set_password (AccountsUser *auser,
|
||||
const gchar *password,
|
||||
const gchar *hint)
|
||||
{
|
||||
|
@ -122,9 +122,6 @@ index 0fb1a17..dbdebaf 100644
|
|||
+ return;
|
||||
+ }
|
||||
+
|
||||
User *user = (User*)auser;
|
||||
User *user = (User *) auser;
|
||||
gchar **data;
|
||||
|
||||
--
|
||||
2.9.3
|
||||
|
||||
const gchar *action_id;
|
||||
|
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "accountsservice";
|
||||
version = "22.08.8";
|
||||
version = "23.13.9";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
|
||||
sha256 = "kJmXp2kZ/n3BOKmgHOpwvWItWpMtvJ+xMBARMCOno5E=";
|
||||
sha256 = "rdpM3q4k+gmS598///nv+nCQvjrCM6Pt/fadWpybkk8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -46,6 +46,10 @@ stdenv.mkDerivation rec {
|
|||
# Do not ignore third-party (e.g Pantheon) extensions not matching FHS path scheme.
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/72396
|
||||
./drop-prefix-check-extensions.patch
|
||||
|
||||
# Detect DM type from config file.
|
||||
# `readlink display-manager.service` won't return any of the candidates.
|
||||
./get-dm-type-from-config.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/src/extensions.c b/src/extensions.c
|
||||
index 038dcb2..830465d 100644
|
||||
index 354f476..8d020a6 100644
|
||||
--- a/src/extensions.c
|
||||
+++ b/src/extensions.c
|
||||
@@ -121,16 +121,7 @@ daemon_read_extension_directory (GHashTable *ifaces,
|
||||
@@ -122,15 +122,7 @@ daemon_read_extension_directory (GHashTable *ifaces,
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@ -10,8 +10,7 @@ index 038dcb2..830465d 100644
|
|||
- const gchar * const prefix = "../../dbus-1/interfaces/";
|
||||
- if (g_str_has_prefix (symlink, prefix) && g_str_equal (symlink + strlen (prefix), name)) {
|
||||
- daemon_read_extension_file (ifaces, filename);
|
||||
- }
|
||||
- else {
|
||||
- } else {
|
||||
- g_warning ("Found accounts service vendor extension symlink %s, but it must be exactly "
|
||||
- "equal to '../../dbus-1/interfaces/%s' for forwards-compatibility reasons.",
|
||||
- filename, name);
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/src/daemon.c b/src/daemon.c
|
||||
index c8b6320..2b74949 100644
|
||||
index aa9d050..861430f 100644
|
||||
--- a/src/daemon.c
|
||||
+++ b/src/daemon.c
|
||||
@@ -1102,7 +1102,7 @@ daemon_create_user_authorized_cb (Daemon *daemon,
|
||||
@@ -1319,7 +1319,7 @@ daemon_create_user_authorized_cb (Daemon *daemon,
|
||||
|
||||
sys_log (context, "create user '%s'", cd->user_name);
|
||||
|
||||
|
@ -11,7 +11,7 @@ index c8b6320..2b74949 100644
|
|||
argv[1] = "-m";
|
||||
argv[2] = "-c";
|
||||
argv[3] = cd->real_name;
|
||||
@@ -1335,7 +1335,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon,
|
||||
@@ -1552,7 +1552,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon,
|
||||
}
|
||||
free (resolved_homedir);
|
||||
|
||||
|
@ -21,10 +21,10 @@ index c8b6320..2b74949 100644
|
|||
argv[1] = "-f";
|
||||
argv[2] = "-r";
|
||||
diff --git a/src/user.c b/src/user.c
|
||||
index 189b2c5..5358c02 100644
|
||||
index 917d427..28170db 100644
|
||||
--- a/src/user.c
|
||||
+++ b/src/user.c
|
||||
@@ -1145,7 +1145,7 @@ user_change_real_name_authorized_cb (Daemon *daemon,
|
||||
@@ -1193,7 +1193,7 @@ user_change_real_name_authorized_cb (Daemon *daemon,
|
||||
new_gecos = g_strdup (name);
|
||||
}
|
||||
|
||||
|
@ -33,7 +33,7 @@ index 189b2c5..5358c02 100644
|
|||
argv[1] = "-c";
|
||||
argv[2] = new_gecos;
|
||||
argv[3] = "--";
|
||||
@@ -1218,7 +1218,7 @@ user_change_user_name_authorized_cb (Daemon *daemon,
|
||||
@@ -1267,7 +1267,7 @@ user_change_user_name_authorized_cb (Daemon *daemon,
|
||||
accounts_user_get_uid (ACCOUNTS_USER (user)),
|
||||
name);
|
||||
|
||||
|
@ -42,7 +42,25 @@ index 189b2c5..5358c02 100644
|
|||
argv[1] = "-l";
|
||||
argv[2] = name;
|
||||
argv[3] = "--";
|
||||
@@ -1627,7 +1627,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon,
|
||||
@@ -1718,7 +1718,7 @@ user_set_password_expiration_policy_authorized_cb (Daemon *daemon
|
||||
accounts_user_get_uid (ACCOUNTS_USER (user)));
|
||||
|
||||
g_object_freeze_notify (G_OBJECT (user));
|
||||
- argv[0] = "/usr/bin/chage";
|
||||
+ argv[0] = "@shadow@/bin/chage";
|
||||
argv[1] = "-m";
|
||||
argv[2] = pwd_expiration->min_days_between_changes;
|
||||
argv[3] = "-M";
|
||||
@@ -1806,7 +1806,7 @@ user_set_user_expiration_policy_authorized_cb (Daemon *daemon,
|
||||
} else {
|
||||
expiration_time = g_strdup ("-1");
|
||||
}
|
||||
- argv[0] = "/usr/bin/chage";
|
||||
+ argv[0] = "@shadow@/bin/chage";
|
||||
argv[1] = "-E";
|
||||
argv[2] = expiration_time;
|
||||
argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
|
||||
@@ -1919,7 +1919,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon,
|
||||
accounts_user_get_uid (ACCOUNTS_USER (user)),
|
||||
home_dir);
|
||||
|
||||
|
@ -51,7 +69,7 @@ index 189b2c5..5358c02 100644
|
|||
argv[1] = "-m";
|
||||
argv[2] = "-d";
|
||||
argv[3] = home_dir;
|
||||
@@ -1683,7 +1683,7 @@ user_change_shell_authorized_cb (Daemon *daemon,
|
||||
@@ -1977,7 +1977,7 @@ user_change_shell_authorized_cb (Daemon *daemon,
|
||||
accounts_user_get_uid (ACCOUNTS_USER (user)),
|
||||
shell);
|
||||
|
||||
|
@ -60,7 +78,7 @@ index 189b2c5..5358c02 100644
|
|||
argv[1] = "-s";
|
||||
argv[2] = shell;
|
||||
argv[3] = "--";
|
||||
@@ -1824,7 +1824,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon,
|
||||
@@ -2120,7 +2120,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon,
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -69,7 +87,7 @@ index 189b2c5..5358c02 100644
|
|||
argv[1] = filename;
|
||||
argv[2] = NULL;
|
||||
|
||||
@@ -1904,7 +1904,7 @@ user_change_locked_authorized_cb (Daemon *daemon,
|
||||
@@ -2201,7 +2201,7 @@ user_change_locked_authorized_cb (Daemon *daemon,
|
||||
locked ? "locking" : "unlocking",
|
||||
accounts_user_get_user_name (ACCOUNTS_USER (user)),
|
||||
accounts_user_get_uid (ACCOUNTS_USER (user)));
|
||||
|
@ -78,7 +96,7 @@ index 189b2c5..5358c02 100644
|
|||
argv[1] = locked ? "-L" : "-U";
|
||||
argv[2] = "--";
|
||||
argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
|
||||
@@ -2026,7 +2026,7 @@ user_change_account_type_authorized_cb (Daemon *daemon,
|
||||
@@ -2328,7 +2328,7 @@ user_change_account_type_authorized_cb (Daemon *daemon,
|
||||
|
||||
g_free (groups);
|
||||
|
||||
|
@ -87,16 +105,16 @@ index 189b2c5..5358c02 100644
|
|||
argv[1] = "-G";
|
||||
argv[2] = str->str;
|
||||
argv[3] = "--";
|
||||
@@ -2093,7 +2093,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
|
||||
@@ -2396,7 +2396,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
|
||||
|
||||
if (mode == PASSWORD_MODE_SET_AT_LOGIN ||
|
||||
mode == PASSWORD_MODE_NONE) {
|
||||
|
||||
- argv[0] = "/usr/bin/passwd";
|
||||
+ argv[0] = "/run/wrappers/bin/passwd";
|
||||
argv[1] = "-d";
|
||||
argv[2] = "--";
|
||||
argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
|
||||
@@ -2105,7 +2105,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
|
||||
@@ -2408,7 +2408,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
|
||||
}
|
||||
|
||||
if (mode == PASSWORD_MODE_SET_AT_LOGIN) {
|
||||
|
@ -105,21 +123,21 @@ index 189b2c5..5358c02 100644
|
|||
argv[1] = "-d";
|
||||
argv[2] = "0";
|
||||
argv[3] = "--";
|
||||
@@ -2126,7 +2126,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
|
||||
@@ -2428,7 +2428,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
|
||||
*/
|
||||
accounts_user_set_locked (ACCOUNTS_USER (user), FALSE);
|
||||
}
|
||||
else if (accounts_user_get_locked (ACCOUNTS_USER (user))) {
|
||||
} else if (accounts_user_get_locked (ACCOUNTS_USER (user))) {
|
||||
- argv[0] = "/usr/sbin/usermod";
|
||||
+ argv[0] = "@shadow@/bin/usermod";
|
||||
argv[1] = "-U";
|
||||
argv[2] = "--";
|
||||
argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
|
||||
@@ -2203,7 +2203,7 @@ user_change_password_authorized_cb (Daemon *daemon,
|
||||
@@ -2505,7 +2505,7 @@ user_change_password_authorized_cb (Daemon *daemon,
|
||||
|
||||
g_object_freeze_notify (G_OBJECT (user));
|
||||
g_autoptr (GError) error = NULL;
|
||||
g_autoptr (GSubprocess) process = NULL;
|
||||
- const char *argv[] = { "/usr/sbin/chpasswd", "-e", NULL };
|
||||
+ const char *argv[] = { "@shadow@/bin/chpasswd", "-e", NULL };
|
||||
|
||||
- argv[0] = "/usr/sbin/usermod";
|
||||
+ argv[0] = "@shadow@/bin/usermod";
|
||||
argv[1] = "-p";
|
||||
argv[2] = strings[0];
|
||||
argv[3] = "--";
|
||||
sys_log (context,
|
||||
"set password and hint of user '%s' (%" G_GUINT64_FORMAT ")",
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/src/daemon.c b/src/daemon.c
|
||||
index aefaf2d..7c004d0 100644
|
||||
--- a/src/daemon.c
|
||||
+++ b/src/daemon.c
|
||||
@@ -193,9 +193,9 @@ get_current_system_dm_type (void)
|
||||
basename = g_file_get_basename (file);
|
||||
g_object_unref (file);
|
||||
|
||||
- if (g_strcmp0 (basename, "lightdm.service") == 0)
|
||||
+ if (g_file_test (PATH_LIGHTDM_CONF, G_FILE_TEST_EXISTS))
|
||||
return DISPLAY_MANAGER_TYPE_LIGHTDM;
|
||||
- else if (g_strcmp0 (basename, "gdm.service") == 0)
|
||||
+ else if (g_file_test (PATH_GDM_CUSTOM, G_FILE_TEST_EXISTS))
|
||||
return DISPLAY_MANAGER_TYPE_GDM;
|
||||
}
|
|
@ -2,7 +2,7 @@ diff --git a/meson_post_install.py b/meson_post_install.py
|
|||
index d8c3dd1..620f714 100644
|
||||
--- a/meson_post_install.py
|
||||
+++ b/meson_post_install.py
|
||||
@@ -9,9 +9,9 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1])
|
||||
@@ -9,9 +9,9 @@
|
||||
# FIXME: meson will not track the creation of these directories
|
||||
# https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39
|
||||
dst_dirs = [
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "tclx";
|
||||
version = "8.6.1";
|
||||
version = "8.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flightaware";
|
||||
repo = "tclx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HdbuU0IR8q/0g2fIs1xtug4oox/D24C8E2VbEJC5B1A=";
|
||||
hash = "sha256-ZYJcaVBM5DQWBFYAcW6fx+ENMWJwHzTOUKYPkLsd6o8=";
|
||||
};
|
||||
|
||||
# required in order for tclx to properly detect tclx.tcl at runtime
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gaphas";
|
||||
version = "3.10.3";
|
||||
version = "3.11.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-I+/DsXppY//KOZgydDR4/Ks5qEsL4hLIiH+GaaFZHpA=";
|
||||
hash = "sha256-TqrrGu+jk6WNXUnXJao71JHEu7Is27UeHAG29/Jpqb8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-monitoring";
|
||||
version = "2.14.2";
|
||||
version = "2.15.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5v2hMJeeLo11mrcNZCe1lISBlIyW9f1KQjcLqWoRlZs=";
|
||||
hash = "sha256-w6BCbs0lpw2lOyqQedcXMSKahJak7a6NN4Xsy7+CjVs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -28,7 +28,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "analysis"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
|
@ -44,6 +44,7 @@ dependencies = [
|
|||
"sml-namespace",
|
||||
"sml-statics",
|
||||
"sml-statics-types",
|
||||
"sml-symbol-kind",
|
||||
"sml-syntax",
|
||||
"str-util",
|
||||
"text-pos",
|
||||
|
@ -107,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
|||
|
||||
[[package]]
|
||||
name = "chain-map"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"str-util",
|
||||
|
@ -120,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e
|
|||
|
||||
[[package]]
|
||||
name = "cm-syntax"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"lex-util",
|
||||
"paths",
|
||||
|
@ -139,7 +140,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "config"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"serde",
|
||||
|
@ -384,7 +385,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "input"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"cm-syntax",
|
||||
"config",
|
||||
|
@ -443,7 +444,7 @@ checksum = "1dabfe0d01e15fde0eba33b9de62475c59e681a47ce4ffe0534af2577a3f8524"
|
|||
|
||||
[[package]]
|
||||
name = "lang-srv"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"anyhow",
|
||||
|
@ -471,7 +472,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
|||
|
||||
[[package]]
|
||||
name = "lex-util"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
|
@ -546,7 +547,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "millet-cli"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"config",
|
||||
|
@ -561,7 +562,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "millet-ls"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"env_logger",
|
||||
|
@ -590,7 +591,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "mlb-hir"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"paths",
|
||||
|
@ -601,7 +602,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "mlb-statics"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
|
@ -625,7 +626,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "mlb-syntax"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"lex-util",
|
||||
"paths",
|
||||
|
@ -697,7 +698,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "panic-hook"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"better-panic",
|
||||
]
|
||||
|
@ -891,7 +892,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "slash-var-path"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"str-util",
|
||||
|
@ -899,14 +900,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-comment"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"sml-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-dynamics"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"fmt-util",
|
||||
|
@ -917,7 +918,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-dynamics-tests"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"config",
|
||||
"sml-dynamics",
|
||||
|
@ -932,7 +933,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-file-syntax"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"config",
|
||||
"elapsed",
|
||||
|
@ -946,7 +947,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-fixity"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"once_cell",
|
||||
|
@ -955,7 +956,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-hir"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"la-arena",
|
||||
"sml-lab",
|
||||
|
@ -966,7 +967,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-hir-lower"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
|
@ -980,14 +981,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-lab"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-lex"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"diagnostic",
|
||||
"lex-util",
|
||||
|
@ -1001,7 +1002,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#7ae671a607a143fd8529e34019
|
|||
|
||||
[[package]]
|
||||
name = "sml-naive-fmt"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"sml-comment",
|
||||
|
@ -1010,11 +1011,11 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-namespace"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
|
||||
[[package]]
|
||||
name = "sml-parse"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"diagnostic",
|
||||
"event-parse",
|
||||
|
@ -1026,14 +1027,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-path"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-scon"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"num-bigint",
|
||||
"num-traits",
|
||||
|
@ -1042,7 +1043,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-statics"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"chain-map",
|
||||
"config",
|
||||
|
@ -1057,13 +1058,14 @@ dependencies = [
|
|||
"sml-namespace",
|
||||
"sml-path",
|
||||
"sml-statics-types",
|
||||
"sml-symbol-kind",
|
||||
"str-util",
|
||||
"uniq",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-statics-types"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"chain-map",
|
||||
"code-h2-md-map",
|
||||
|
@ -1078,9 +1080,17 @@ dependencies = [
|
|||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-symbol-kind"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"sml-namespace",
|
||||
"sml-statics-types",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-syntax"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"char-name",
|
||||
"code-h2-md-map",
|
||||
|
@ -1093,7 +1103,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sml-ty-var-scope"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"sml-hir",
|
||||
|
@ -1161,7 +1171,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "tests"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"cm-syntax",
|
||||
|
@ -1495,7 +1505,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "xtask"
|
||||
version = "0.9.8"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"flate2",
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "millet";
|
||||
version = "0.9.8";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azdavis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-04XP5Mw41KRCB1n1iqSxBXXCiVLO8UN05SoaVqMnwjU=";
|
||||
hash = "sha256-QAXvkSGC7IydFXcWdrVf9QlMBlJVFDLNgfXu+P6yWlE=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
56
pkgs/development/tools/loganalyzer/default.nix
Normal file
56
pkgs/development/tools/loganalyzer/default.nix
Normal file
|
@ -0,0 +1,56 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "loganalyzer";
|
||||
version = "23.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pbek";
|
||||
repo = "loganalyzer";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-k9hOGI/TmiftwhSHQEh3ZVV8kkMSs1yKejqHelFSQJ4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
qmake LogAnalyzer.pro CONFIG+=release PREFIX=/
|
||||
make
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installFlags = [ "INSTALL_ROOT=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
ln -s $out/bin/LogAnalyzer $out/bin/loganalyzer
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool that helps you to analyze your log files by reducing the content with patterns you define";
|
||||
homepage = "https://github.com/pbek/loganalyzer";
|
||||
changelog = "https://github.com/pbek/loganalyzer/blob/develop/CHANGELOG.md";
|
||||
downloadPage = "https://github.com/pbek/loganalyzer/releases/tag/v${version}";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ pbek ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
43
pkgs/development/tools/misc/typical/default.nix
Normal file
43
pkgs/development/tools/misc/typical/default.nix
Normal file
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typical";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stepchowfun";
|
||||
repo = "typical";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MkMcJY0J3wvJE01VpphS84zNWv62hbed5ZypvLzrnpo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-msRfZYvDnb/WeKZhCIabUB2k/AzSYVU1OYdwZNbANbM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export NO_COLOR=true
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd typical \
|
||||
--bash <($out/bin/typical shell-completion bash) \
|
||||
--fish <($out/bin/typical shell-completion fish) \
|
||||
--zsh <($out/bin/typical shell-completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Data interchange with algebraic data types";
|
||||
homepage = "https://github.com/stepchowfun/typical";
|
||||
changelog = "https://github.com/stepchowfun/typical/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
|
@ -3,35 +3,17 @@
|
|||
, zed, logs, lwt, react, lwt_react
|
||||
}:
|
||||
|
||||
let
|
||||
switch =
|
||||
if lib.versionAtLeast ocaml.version "4.08"
|
||||
then
|
||||
{
|
||||
version = "2.10.0";
|
||||
sha256 = "sha256-R10WovnqYcYCrDJnPuIQx2zHaPchSYfXDAaVMsJ4LQA=";
|
||||
duneVersion = "3";
|
||||
propagatedBuildInputs = [ findlib lambda-term zed logs ];
|
||||
}
|
||||
else
|
||||
{
|
||||
version = "2.9.2";
|
||||
sha256 = "sha256-kvFBCe69TRQIWvZV47SH7ISus9k8afGRw5WLKzKqw08=";
|
||||
duneVersion = "2";
|
||||
propagatedBuildInputs = [ lambda-term ];
|
||||
};
|
||||
in
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "utop";
|
||||
|
||||
inherit (switch) version duneVersion propagatedBuildInputs;
|
||||
version = "2.12.1";
|
||||
propagatedBuildInputs = [ findlib lambda-term zed logs ];
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz";
|
||||
sha256 = switch.sha256;
|
||||
sha256 = "sha256-Z6S3pUE4RY5Q7keRUVSQuzkikewWgM+sRLgcR+8bIlM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper cppo ];
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "okteto";
|
||||
version = "2.15.4";
|
||||
version = "2.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = version;
|
||||
hash = "sha256-sTlbub315MePIUjXKrdBUTplcOk10yIz0N8RejOf2FQ=";
|
||||
hash = "sha256-ehalSPD9yEWL9mm5qjUXWlPIbdEO8StLL2mOZPnB5do=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dZ6gzW5R5na5qcHFQqQvKfYb0Bu0kVvVMOaRdtTgkhE=";
|
||||
vendorHash = "sha256-bEAUkTl5O5i2R4oglOWSgWG7OKzOrZo5YDe5TzNlZ3E=";
|
||||
|
||||
postPatch = ''
|
||||
# Disable some tests that need file system & network access.
|
||||
|
|
|
@ -16,35 +16,32 @@
|
|||
, coreutils
|
||||
, atk
|
||||
, pkg-config
|
||||
, gnome2
|
||||
, libxml2
|
||||
, runtimeShell
|
||||
, proot
|
||||
, libredirect
|
||||
, ghostscript
|
||||
, pkgs
|
||||
, pkgsi686Linux
|
||||
, zlib
|
||||
}:
|
||||
|
||||
let
|
||||
i686_NIX_GCC = pkgsi686Linux.callPackage ({ gcc }: gcc) { };
|
||||
ld32 =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
|
||||
else if stdenv.hostPlatform.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
|
||||
else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.hostPlatform.system}";
|
||||
system =
|
||||
if stdenv.targetPlatform.system == "x86_64-linux" then "intel"
|
||||
else if stdenv.targetPlatform.system == "aarch64-linux" then "arm"
|
||||
else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.targetPlatform.system}";
|
||||
ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
|
||||
libs = pkgs: lib.makeLibraryPath buildInputs;
|
||||
|
||||
version = "5.40";
|
||||
dl = "6/0100009236/10";
|
||||
version = "5.70";
|
||||
dl = "8/0100007658/33";
|
||||
|
||||
versionNoDots = builtins.replaceStrings [ "." ] [ "" ] version;
|
||||
src_canon = fetchurl {
|
||||
url = "http://gdlp01.c-wss.com/gds/${dl}/linux-UFRII-drv-v${versionNoDots}-usen-20.tar.gz";
|
||||
sha256 = "sha256:069z6ijmql62mcdyxnzc9mf0dxa6z1107cd0ab4i1adk8kr3d75k";
|
||||
url = "http://gdlp01.c-wss.com/gds/${dl}/linux-UFRII-drv-v${versionNoDots}-m17n-11.tar.gz";
|
||||
hash = "sha256-d5VHlPpUPAr3RWVdQRdn42YLuVekOw1IaMFLVt1Iu7o=";
|
||||
};
|
||||
|
||||
buildInputs = [ cups zlib jbigkit glib gtk3 gnome2.libglade libxml2 gdk-pixbuf pango cairo atk ];
|
||||
buildInputs = [ cups zlib jbigkit glib gtk3 libxml2 gdk-pixbuf pango cairo atk ];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "canon-cups-ufr2";
|
||||
|
@ -54,10 +51,11 @@ stdenv.mkDerivation rec {
|
|||
postUnpack = ''
|
||||
(
|
||||
cd $sourceRoot
|
||||
tar -xzf Sources/cnrdrvcups-lb-${version}-1.tar.gz
|
||||
tar -xf Sources/cnrdrvcups-lb-${version}-1.11.tar.xz
|
||||
sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh
|
||||
sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh
|
||||
sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh
|
||||
sed -ie "s@/usr@$out@" cnrdrvcups-common-${version}/{{backend,rasterfilter}/Makefile.am,rasterfilter/cnrasterproc.h}
|
||||
sed -ie "s@etc/cngplp@$out/etc/cngplp@" cnrdrvcups-common-${version}/cngplp/Makefile.am
|
||||
sed -ie "s@usr/share/cngplp@$out/usr/share/cngplp@" cnrdrvcups-common-${version}/cngplp/src/Makefile.am
|
||||
patchShebangs cnrdrvcups-common-${version}
|
||||
|
@ -67,6 +65,7 @@ stdenv.mkDerivation rec {
|
|||
sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-lb-${version}/allgen.sh
|
||||
sed -ie '/^cd \.\.\/cngplp/,/^cd files/{/^cd files/!{d}}' cnrdrvcups-lb-${version}/allgen.sh
|
||||
sed -ie "s@cd \.\./pdftocpca@cd pdftocpca@" cnrdrvcups-lb-${version}/allgen.sh
|
||||
sed -ie "s@/usr@$out@" cnrdrvcups-lb-${version}/pdftocpca/Makefile.am
|
||||
sed -i "/CNGPLPDIR/d" cnrdrvcups-lb-${version}/Makefile
|
||||
patchShebangs cnrdrvcups-lb-${version}
|
||||
)
|
||||
|
@ -86,8 +85,8 @@ stdenv.mkDerivation rec {
|
|||
)
|
||||
(
|
||||
cd cnrdrvcups-common-${version}/Rule
|
||||
mkdir -p $out/share/usb
|
||||
install -m 644 *.usb-quirks $out/share/usb
|
||||
mkdir -p $out/share/cups/usb
|
||||
install -m 644 *.usb-quirks $out/share/cups/usb
|
||||
)
|
||||
(
|
||||
cd cnrdrvcups-lb-${version}
|
||||
|
@ -97,73 +96,56 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p $out/share/cups/model
|
||||
install -m 644 ppd/*.ppd $out/share/cups/model/
|
||||
)
|
||||
|
||||
(
|
||||
cd lib
|
||||
mkdir -p $out/lib32
|
||||
install -m 755 libs32/intel/libColorGearCufr2.so.2.0.0 $out/lib32
|
||||
install -m 755 libs32/intel/libcaepcmufr2.so.1.0 $out/lib32
|
||||
install -m 755 libs32/intel/libcaiocnpkbidir.so.1.0.0 $out/lib32
|
||||
install -m 755 libs32/intel/libcaiousb.so.1.0.0 $out/lib32
|
||||
install -m 755 libs32/intel/libcaiowrapufr2.so.1.0.0 $out/lib32
|
||||
install -m 755 libs32/intel/libcanon_slimufr2.so.1.0.0 $out/lib32
|
||||
install -m 755 libs32/intel/libcanonufr2r.so.1.0.0 $out/lib32
|
||||
install -m 755 libs32/intel/libcnaccm.so.1.0 $out/lib32
|
||||
install -m 755 libs32/intel/libcnlbcmr.so.1.0 $out/lib32
|
||||
install -m 755 libs32/intel/libcnncapcmr.so.1.0 $out/lib32
|
||||
install -m 755 libs32/intel/libufr2filterr.so.1.0.0 $out/lib32
|
||||
|
||||
mkdir -p $out/lib
|
||||
install -m 755 libs64/intel/libColorGearCufr2.so.2.0.0 $out/lib
|
||||
install -m 755 libs64/intel/libcaepcmufr2.so.1.0 $out/lib
|
||||
install -m 755 libs64/intel/libcaiocnpkbidir.so.1.0.0 $out/lib
|
||||
install -m 755 libs64/intel/libcaiousb.so.1.0.0 $out/lib
|
||||
install -m 755 libs64/intel/libcaiowrapufr2.so.1.0.0 $out/lib
|
||||
install -m 755 libs64/intel/libcanon_slimufr2.so.1.0.0 $out/lib
|
||||
install -m 755 libs64/intel/libcanonufr2r.so.1.0.0 $out/lib
|
||||
install -m 755 libs64/intel/libcnaccm.so.1.0 $out/lib
|
||||
install -m 755 libs64/intel/libcnlbcmr.so.1.0 $out/lib
|
||||
install -m 755 libs64/intel/libcnncapcmr.so.1.0 $out/lib
|
||||
install -m 755 libs64/intel/libufr2filterr.so.1.0.0 $out/lib
|
||||
install -m 755 libs64/${system}/libColorGearCufr2.so.2.0.0 $out/lib
|
||||
install -m 755 libs64/${system}/libcaepcmufr2.so.1.0 $out/lib
|
||||
install -m 755 libs64/${system}/libcaiocnpkbidir.so.1.0.0 $out/lib
|
||||
install -m 755 libs64/${system}/libcaiousb.so.1.0.0 $out/lib
|
||||
install -m 755 libs64/${system}/libcaiowrapufr2.so.1.0.0 $out/lib
|
||||
install -m 755 libs64/${system}/libcanon_slimufr2.so.1.0.0 $out/lib
|
||||
install -m 755 libs64/${system}/libcanonufr2r.so.1.0.0 $out/lib
|
||||
install -m 755 libs64/${system}/libcnaccm.so.1.0 $out/lib
|
||||
install -m 755 libs64/${system}/libcnlbcmr.so.1.0 $out/lib
|
||||
install -m 755 libs64/${system}/libcnncapcmr.so.1.0 $out/lib
|
||||
install -m 755 libs64/${system}/libufr2filterr.so.1.0.0 $out/lib
|
||||
|
||||
install -m 755 libs64/intel/cnpdfdrv $out/bin
|
||||
install -m 755 libs64/intel/cnpkbidir $out/bin
|
||||
install -m 755 libs64/intel/cnpkmoduleufr2r $out/bin
|
||||
install -m 755 libs64/intel/cnrsdrvufr2 $out/bin
|
||||
install -m 755 libs64/intel/cnsetuputil2 $out/bin/cnsetuputil2
|
||||
install -m 755 libs64/${system}/cnpdfdrv $out/bin
|
||||
install -m 755 libs64/${system}/cnpkbidir $out/bin
|
||||
install -m 755 libs64/${system}/cnpkmoduleufr2r $out/bin
|
||||
install -m 755 libs64/${system}/cnrsdrvufr2 $out/bin
|
||||
install -m 755 libs64/${system}/cnsetuputil2 $out/bin/cnsetuputil2
|
||||
|
||||
mkdir -p $out/share/cnpkbidir
|
||||
install -m 644 libs64/intel/cnpkbidir_info* $out/share/cnpkbidir
|
||||
install -m 644 libs64/${system}/cnpkbidir_info* $out/share/cnpkbidir
|
||||
|
||||
mkdir -p $out/share/ufr2filter
|
||||
install -m 644 libs64/intel/ThLB* $out/share/ufr2filter
|
||||
)
|
||||
|
||||
(
|
||||
cd $out/lib32
|
||||
ln -sf libcaepcmufr2.so.1.0 libcaepcmufr2.so
|
||||
ln -sf libcaepcmufr2.so.1.0 libcaepcmufr2.so.1
|
||||
ln -sf libcaiowrapufr2.so.1.0.0 libcaiowrapufr2.so
|
||||
ln -sf libcaiowrapufr2.so.1.0.0 libcaiowrapufr2.so.1
|
||||
ln -sf libcanon_slimufr2.so.1.0.0 libcanon_slimufr2.so
|
||||
ln -sf libcanon_slimufr2.so.1.0.0 libcanon_slimufr2.so.1
|
||||
ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so
|
||||
ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so.1
|
||||
|
||||
patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${pkgsi686Linux.stdenv.cc.libc}/lib:${pkgsi686Linux.libxml2.out}/lib:$out/lib32" libcanonufr2r.so.1.0.0
|
||||
patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${pkgsi686Linux.stdenv.cc.libc}/lib" libcaepcmufr2.so.1.0
|
||||
patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${pkgsi686Linux.stdenv.cc.libc}/lib" libColorGearCufr2.so.2.0.0
|
||||
install -m 644 libs64/${system}/ThLB* $out/share/ufr2filter
|
||||
)
|
||||
|
||||
(
|
||||
cd $out/lib
|
||||
|
||||
ln -sf libColorGearCufr2.so.2.0.0 libColorGearCufr2.so
|
||||
ln -sf libColorGearCufr2.so.2.0.0 libColorGearCufr2.so.2
|
||||
ln -sf libcaepcmufr2.so.1.0 libcaepcmufr2.so
|
||||
ln -sf libcaepcmufr2.so.1.0 libcaepcmufr2.so.1
|
||||
ln -sf libcaiocnpkbidir.so.1.0.0 libcaiocnpkbidir.so
|
||||
ln -sf libcaiocnpkbidir.so.1.0.0 libcaiocnpkbidir.so.1
|
||||
ln -sf libcaiowrapufr2.so.1.0.0 libcaiowrapufr2.so
|
||||
ln -sf libcaiowrapufr2.so.1.0.0 libcaiowrapufr2.so.1
|
||||
ln -sf libcanon_slimufr2.so.1.0.0 libcanon_slimufr2.so
|
||||
ln -sf libcanon_slimufr2.so.1.0.0 libcanon_slimufr2.so.1
|
||||
ln -sf libcanonufr2r.so.1.0.0 libcanonufr2r.so
|
||||
ln -sf libcanonufr2r.so.1.0.0 libcanonufr2r.so.1
|
||||
ln -sf libcnlbcmr.so.1.0 libcnlbcmr.so
|
||||
ln -sf libcnlbcmr.so.1.0 libcnlbcmr.so.1
|
||||
ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so
|
||||
ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so.1
|
||||
ln -sf libuictlufr2r.so.1.0.0 libuictlufr2r.so
|
||||
ln -sf libuictlufr2r.so.1.0.0 libuictlufr2r.so.1
|
||||
|
||||
patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" libcanonufr2r.so.1.0.0
|
||||
patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" libcaepcmufr2.so.1.0
|
||||
|
@ -172,15 +154,17 @@ stdenv.mkDerivation rec {
|
|||
|
||||
(
|
||||
cd $out/bin
|
||||
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2
|
||||
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" cnpdfdrv
|
||||
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir
|
||||
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnrsdrvufr2
|
||||
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2 cnpdfdrv
|
||||
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir cnrsdrvufr2 cnpkmoduleufr2r cnjbigufr2
|
||||
|
||||
mv cnsetuputil2 cnsetuputil2.wrapped
|
||||
echo "#!${runtimeShell} -e" > cnsetuputil2
|
||||
echo "exec ${proot}/bin/proot -b $out/usr/share/cnsetuputil2:/usr/share/cnsetuputil2 -b ${coreutils}/bin/ls:/bin/ls -b ${cups}/share:/usr/share/cups $out/bin/cnsetuputil2.wrapped" > cnsetuputil2
|
||||
chmod +x cnsetuputil2
|
||||
wrapProgram $out/bin/cnrsdrvufr2 \
|
||||
--prefix LD_LIBRARY_PATH ":" "$out/lib" \
|
||||
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
|
||||
--set NIX_REDIRECTS /usr/bin/cnpkmoduleufr2r=$out/bin/cnpkmoduleufr2r:/usr/bin/cnjbigufr2=$out/bin/cnjbigufr2
|
||||
|
||||
wrapProgram $out/bin/cnsetuputil2 \
|
||||
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
|
||||
--set NIX_REDIRECTS /usr/share/cnsetuputil2=$out/usr/share/cnsetuputil2
|
||||
)
|
||||
|
||||
(
|
||||
|
@ -210,8 +194,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://www.canon.com/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [
|
||||
# please consider maintaining if you are updating this package
|
||||
];
|
||||
maintainers = with maintainers; [ lluchs ];
|
||||
};
|
||||
}
|
||||
|
|
34
pkgs/servers/dns/acme-dns/default.nix
Normal file
34
pkgs/servers/dns/acme-dns/default.nix
Normal file
|
@ -0,0 +1,34 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "acme-dns";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joohoi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qQwvhouqzkChWeu65epgoeMNqZyAD18T+xqEMgdMbhA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-q/P+cH2OihvPxPj2XWeLsTBHzQQABp0zjnof+Ys/qKo=";
|
||||
|
||||
postInstall = ''
|
||||
install -D -m0444 -t $out/lib/systemd/system ./acme-dns.service
|
||||
substituteInPlace $out/lib/systemd/system/acme-dns.service --replace "/usr/local/bin/acme-dns" "$out/bin/acme-dns"
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) acme-dns; };
|
||||
|
||||
meta = {
|
||||
description = "Limited DNS server to handle ACME DNS challenges easily and securely";
|
||||
homepage = "https://github.com/joohoi/acme-dns";
|
||||
changelog = "https://github.com/joohoi/acme-dns/releases/tag/${src.rev}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ emilylange ];
|
||||
};
|
||||
}
|
|
@ -1,12 +1,12 @@
|
|||
{ fetchFromGitHub, buildGoModule, jq, buildNpmPackage, lib, makeWrapper }:
|
||||
|
||||
let
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "usememos";
|
||||
repo = "memos";
|
||||
rev = "v${version}";
|
||||
sha256 = "7rMs1jFyGlCfc7LVZvsQ9tuBLsWP/S9DXYcEPZ86tKw=";
|
||||
sha256 = "VUY81ir7cPtuHodJhkSz3bmnoIeQH20kbg+duDcjfwM=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
|
@ -15,7 +15,7 @@ let
|
|||
|
||||
src = "${src}/web";
|
||||
|
||||
npmDepsHash = "sha256-vgO5HWbV/oR1GenK9q5a1bhlTSJqtF4HBcQTZ3DqZq8=";
|
||||
npmDepsHash = "sha256-36UcHE98dsGvYQWLIc/xgP8Q0IyJ7la0Qoo3lZqUcmw=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
|
32
pkgs/servers/memos/package-lock.json
generated
32
pkgs/servers/memos/package-lock.json
generated
|
@ -33,7 +33,6 @@
|
|||
"zustand": "^4.3.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@playwright/test": "^1.32.2",
|
||||
"@types/lodash-es": "^4.17.5",
|
||||
"@types/node": "^18.0.3",
|
||||
"@types/qs": "^6.9.7",
|
||||
|
@ -1099,25 +1098,6 @@
|
|||
"node": ">= 8"
|
||||
}
|
||||
},
|
||||
"node_modules/@playwright/test": {
|
||||
"version": "1.32.3",
|
||||
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.32.3.tgz",
|
||||
"integrity": "sha512-BvWNvK0RfBriindxhLVabi8BRe3X0J9EVjKlcmhxjg4giWBD/xleLcg2dz7Tx0agu28rczjNIPQWznwzDwVsZQ==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@types/node": "*",
|
||||
"playwright-core": "1.32.3"
|
||||
},
|
||||
"bin": {
|
||||
"playwright": "cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"fsevents": "2.3.2"
|
||||
}
|
||||
},
|
||||
"node_modules/@popperjs/core": {
|
||||
"version": "2.11.7",
|
||||
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz",
|
||||
|
@ -4564,18 +4544,6 @@
|
|||
"node": ">= 6"
|
||||
}
|
||||
},
|
||||
"node_modules/playwright-core": {
|
||||
"version": "1.32.3",
|
||||
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.32.3.tgz",
|
||||
"integrity": "sha512-SB+cdrnu74ZIn5Ogh/8278ngEh9NEEV0vR4sJFmK04h2iZpybfbqBY0bX6+BLYWVdV12JLLI+JEFtSnYgR+mWg==",
|
||||
"dev": true,
|
||||
"bin": {
|
||||
"playwright": "cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14"
|
||||
}
|
||||
},
|
||||
"node_modules/postcss": {
|
||||
"version": "8.4.22",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.22.tgz",
|
||||
|
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "exportarr";
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onedr0p";
|
||||
repo = "exportarr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-99ap7B5EfMhuSGmT/JNI+CTPv7lTdjxibC0ndYWyNoA=";
|
||||
hash = "sha256-7ev6twbavAhSZWJZCwjpbEz2STRYifLrPCFyel+Ml5A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2Eb8FhbRu5M5u8HGa2bgAvZZkwHycBu8UiNKHG5/fFw=";
|
||||
vendorHash = "sha256-3JObDCeRjhws6U4DRky7BVEleCmxadLmPnTp8PX6S7A=";
|
||||
|
||||
subPackages = [ "cmd/exportarr" ];
|
||||
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "copilot-cli";
|
||||
version = "1.27.0";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Py45QkivjwVNQqKX5/j4YUO+gpVYfXI7elD9YSlrmak=";
|
||||
sha256 = "sha256-KrgPHdYR0kYwyNhO2EwIO00Xnjy0MmrzHb5LDmbrgB0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ali7zvLLLB5kQCU9r2o/dO0g5CQxv/kVVz3iJ56fqYY=";
|
||||
vendorHash = "sha256-1YOx7tqPJwCZlJSAG9o+STKRAIR72dptvTOpa9rRt3A=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lego";
|
||||
version = "4.11.0";
|
||||
version = "4.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-acme";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RotsWr/wUPAAzW9PrUH3DGx2J5beyD+s/PpAUH12gNI=";
|
||||
sha256 = "sha256-uWs8P3oQS6DFuLmuj+Med0vEBjTv2jNbEkDB/cqyY7g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6dfwAsCxEYksZXqSWYurAD44YfH4h5p5P1aYZENjHSs=";
|
||||
vendorHash = "sha256-Pwtvv/qVX91yWx49IYdveVCySoVxekvHomfAzOdFj7w=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -341,6 +341,12 @@ stdenv.mkDerivation rec {
|
|||
url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1514678888595ef41a968a0c69b7ff769edd1e9c";
|
||||
sha256 = "sha256-tgAEoAtaNKJjscjMFkXXiVn59Pa4c+NiQ3iVW6CMrpo=";
|
||||
})
|
||||
|
||||
# fix incompatibility with e2fsprogs 1.47+
|
||||
(fetchpatch {
|
||||
url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763";
|
||||
sha256 = "sha256-pejn1bJkC7XnT2ODaxeERHUrMOONoBV6w0wF2Z2ZKWI=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = if kbdcompSupport then ''
|
||||
|
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "notify";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PZSt4mhon0JbFxeq5tOXb+xWKOoxT6rjRS1E3Jf2V3c=";
|
||||
sha256 = "sha256-CXzxrY8G7Zh5xafuiIY9SsPkrYoSkMt15v2KLZBs0Jo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-MoGaIs2WmJk+E8pTljrahuaJ1VwYBhGBf1XGYVYOVt4=";
|
||||
vendorSha256 = "sha256-tjaVEmOd/MJnDcS/mhvw95ZZ8giaUDTdDTyAMbjTckM=";
|
||||
|
||||
modRoot = ".";
|
||||
subPackages = [
|
||||
|
|
45
pkgs/tools/nix/gridlock/default.nix
Normal file
45
pkgs/tools/nix/gridlock/default.nix
Normal file
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "gridlock";
|
||||
version = "unstable-2023-03-03";
|
||||
|
||||
outputs = [ "out" "nyarr" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lf-";
|
||||
repo = "gridlock";
|
||||
rev = "15261abdb179e1d7e752772bf9db132b3ee343ea";
|
||||
hash = "sha256-rnPAEJH3TebBH6lqgVo7B+nNiArDIkGDnIZWcteFNEw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EPs5vJ2RkVXKxrTRtbT/1FbvCT0KJtNuW2WKIUq7G0U=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput bin/nyarr $nyarr
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nix compatible lockfile manager, without Nix";
|
||||
homepage = "https://github.com/lf-/gridlock";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
|
@ -587,6 +587,9 @@ with pkgs;
|
|||
|
||||
gpick = callPackage ../tools/misc/gpick { };
|
||||
|
||||
gridlock = callPackage ../tools/nix/gridlock { };
|
||||
inherit (gridlock) nyarr;
|
||||
|
||||
hwatch = callPackage ../tools/misc/hwatch { };
|
||||
|
||||
hobbes = callPackage ../development/tools/hobbes { stdenv = gcc10StdenvCompat; };
|
||||
|
@ -1303,6 +1306,8 @@ with pkgs;
|
|||
|
||||
accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { };
|
||||
|
||||
acme-dns = callPackage ../servers/dns/acme-dns/default.nix { };
|
||||
|
||||
acme-sh = callPackage ../tools/admin/acme-sh { };
|
||||
|
||||
acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { };
|
||||
|
@ -9304,6 +9309,8 @@ with pkgs;
|
|||
|
||||
lockfileProgs = callPackage ../tools/misc/lockfile-progs { };
|
||||
|
||||
loganalyzer = libsForQt5.callPackage ../development/tools/loganalyzer { };
|
||||
|
||||
logstash7 = callPackage ../tools/misc/logstash/7.x.nix {
|
||||
# https://www.elastic.co/support/matrix#logstash-and-jvm
|
||||
jre = jdk11_headless;
|
||||
|
@ -19485,6 +19492,8 @@ with pkgs;
|
|||
|
||||
tweak = callPackage ../applications/editors/tweak { };
|
||||
|
||||
typical = callPackage ../development/tools/misc/typical { };
|
||||
|
||||
uddup = callPackage ../tools/security/uddup { };
|
||||
|
||||
udis86 = callPackage ../development/tools/udis86 { };
|
||||
|
|
Loading…
Reference in a new issue