From 116ae00e73d78e723b813b8872553c68cbcb1dac Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Wed, 15 Dec 2021 20:27:18 +0100 Subject: [PATCH 01/20] nixos/step-ca: create a step-ca user This allows you to create the certificate files owned by that user so the service can read them. --- nixos/modules/services/security/step-ca.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/security/step-ca.nix b/nixos/modules/services/security/step-ca.nix index 27b2ceed1a43..bfb29fbc6c15 100644 --- a/nixos/modules/services/security/step-ca.nix +++ b/nixos/modules/services/security/step-ca.nix @@ -108,6 +108,9 @@ in ConditionFileNotEmpty = ""; # override upstream }; serviceConfig = { + User = "step-ca"; + Group = "step-ca"; + UMask = "0077"; Environment = "HOME=%S/step-ca"; WorkingDirectory = ""; # override upstream ReadWriteDirectories = ""; # override upstream @@ -129,6 +132,14 @@ in }; }; + users.users.step-ca = { + home = "/var/lib/step-ca"; + group = "step-ca"; + isSystemUser = true; + }; + + users.groups.step-ca = {}; + networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; }; From 382289027f92ff3973f14d983a55b183c9b1c0bd Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Aug 2021 21:18:40 +0200 Subject: [PATCH 02/20] lib/types: Fix emptyValue of listOf and nonEmptyListOf An empty list is [], not {}! Also, non-empty lists shouldn't have a default of an empty list! --- lib/types.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index f2f9b2bca985..3fa9d881a650 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -390,7 +390,7 @@ rec { ).optionalValue ) def.value ) defs))); - emptyValue = { value = {}; }; + emptyValue = { value = []; }; getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]); getSubModules = elemType.getSubModules; substSubModules = m: listOf (elemType.substSubModules m); @@ -402,7 +402,7 @@ rec { let list = addCheck (types.listOf elemType) (l: l != []); in list // { description = "non-empty " + list.description; - # Note: emptyValue is left as is, because another module may define an element. + emptyValue = { }; # no .value attr, meaning unset }; attrsOf = elemType: mkOptionType rec { From b333395be54397a62e6befe2bc91664f53306b41 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 15 Oct 2021 16:48:38 +0200 Subject: [PATCH 03/20] lib/tests: Add tests for emptyValue --- lib/tests/modules.sh | 9 ++++++++ lib/tests/modules/emptyValues.nix | 36 +++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 lib/tests/modules/emptyValues.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 590937da5b8f..88d152d39352 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -284,6 +284,15 @@ checkConfigOutput '^"a b"$' config.resultFoo ./declare-variants.nix ./define-var checkConfigOutput '^"a y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix checkConfigOutput '^"a b c"$' config.resultFooFoo ./declare-variants.nix ./define-variant.nix +## emptyValue's +checkConfigOutput "[ ]" config.list.a ./emptyValues.nix +checkConfigOutput "{ }" config.attrs.a ./emptyValues.nix +checkConfigOutput "null" config.null.a ./emptyValues.nix +checkConfigOutput "{ }" config.submodule.a ./emptyValues.nix +# These types don't have empty values +checkConfigError 'The option .int.a. is used but not defined' config.int.a ./emptyValues.nix +checkConfigError 'The option .nonEmptyList.a. is used but not defined' config.nonEmptyList.a ./emptyValues.nix + cat < Date: Sun, 20 Feb 2022 18:24:10 +0000 Subject: [PATCH 04/20] mycorrhiza: 1.8.1 -> 1.8.2 --- pkgs/servers/mycorrhiza/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mycorrhiza/default.nix b/pkgs/servers/mycorrhiza/default.nix index 16e15a8dd2ae..65c6d8ae77a4 100644 --- a/pkgs/servers/mycorrhiza/default.nix +++ b/pkgs/servers/mycorrhiza/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "mycorrhiza"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "bouncepaw"; repo = "mycorrhiza"; rev = "v${version}"; - sha256 = "sha256-81Ok/0cDkFqKEAwWtpxM3InMfu0R9rZJzQ41AhWuVuo="; + sha256 = "sha256-+8cW7xNr4gzNHQ/hBpASoe9g7W/QFQhtO/dZ9umgJec="; }; - vendorSha256 = "sha256-9FMxj3AkbKyUMZWj1S0myoKem4mupOHPIfxNHjYk8mU="; + vendorSha256 = "sha256-foAjMPvNJnjpxRAXEgNeYuvDAoBdMwiQc9BiNxifzUc="; subPackages = [ "." ]; From 0480c113a1040323080b27be739e22be6c7ecdda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 02:44:09 +0000 Subject: [PATCH 05/20] buildbot: 3.4.0 -> 3.4.1 --- pkgs/development/python-modules/buildbot/default.nix | 4 ++-- pkgs/development/python-modules/buildbot/pkg.nix | 2 +- pkgs/development/python-modules/buildbot/plugins.nix | 10 +++++----- pkgs/development/python-modules/buildbot/worker.nix | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index a6ae6e87036b..2836ee24c34a 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -31,11 +31,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.4.0"; + version = "3.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-14w1sF1aOpfUW76uhAIUpdrjAEhQkEWcRGg9Osc+qFk="; + sha256 = "sha256-GmKMqejHjtEiEtlZffze7PGNjVwUKB/ZcvUgJ4DoeDQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index a1d2fa59cb5d..a35506c89b8d 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-NAc85JomnxS052SjCu8+UQ/hik2gbq1u7/gc21Nj67Q="; + sha256 = "sha256-A2a5rEL5MN9jlu5vVnUIKx9ma2H6wuJAWjkqLpQgcfc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 797395205a04..5b64f4c51ab9 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-65ZbCiNtxH3YjAcdhv5cwSUNrLT65jlQh/2oL8342Tw="; + sha256 = "sha256-Hly1dwUbWblHoP+ufjxyz4boXby8kxeFSHLMHcCpc1o="; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-2wu6rE5tgjPXxlcIND8s+DAmX9CF29M3ElonV0L8WOs="; + sha256 = "sha256-QuV808Wg9epCgjehuUaMKCLLTLfFJVWBdKPy8sZfBYg="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-Vu4CouTuVyxpmx5C4fthQJPdFBAtN1jliQjy4pLYAzc="; + sha256 = "sha256-p8PRQaWrPb63RrF4FtTX65qM3HdzI4Gl4tR0zTOBFEI="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-BDzI4VBbNGCKRxv6294IIVkDXZV0KHauvUYDjIVovvE="; + sha256 = "sha256-cNYptEp98padbyoY1DmZbpaED7O5pfck9oMjst4RHnI="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-hkcxwZWFJOLHMIRJfzzMTEoH6oc2UblJEKFjYthFfDc="; + sha256 = "sha256-o747SIyqJom4ucZ7hmODcP0VC7i+ydgvi+oMxn/vupc="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 0c7e2f33716f..97a3eec770bd 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SFZ0Q51hrBb7eBMGzvVOhc/ogFCIO/Mo7U9652WJ2GU="; + sha256 = "sha256-9wdUvp00vuP7peJ+Oo4guHLfIz0YWHwp6q/zlKOOoXg="; }; propagatedBuildInputs = [ twisted future ]; From a01f82c9435120fed4fc7d6fbaff43b783fd5605 Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Mon, 21 Feb 2022 13:29:43 +0000 Subject: [PATCH 06/20] btcpayserver: 1.4.4 -> 1.4.6 --- .../blockchains/btcpayserver/default.nix | 4 +- .../blockchains/btcpayserver/deps.nix | 47 +++++++++---------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 39203e60c78d..8500bbc993f7 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -3,13 +3,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.4.4"; + version = "1.4.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-PW5a1Bw21skpboWDtlZHGWtFwfImznD7nYI92RT7GGQ="; + sha256 = "sha256-G6/juGBdiOc8Gh9pKFQlBfUDJzDFMd9gMtILeoF8SMk="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 659207b5c54b..57602e2231c2 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -31,18 +31,18 @@ }) (fetchNuGet { pname = "BTCPayServer.Lightning.All"; - version = "1.2.19"; - sha256 = "0g8wm7idxb3pksqn3kkv62k27r7rzxdjdg3drhfsfrlvi0fm2w9j"; + version = "1.3.2"; + sha256 = "0xcfba8n9zf5m1nb48ilggp03kpki4nv4kx7k7a5w1gxgm6k6j9z"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; - version = "1.2.9"; - sha256 = "0vplw03l0rldqrw98ybm1d8fcglj9zwhxw6j8blhh27x1wdp0x0c"; + version = "1.3.1"; + sha256 = "1xakwnb839dl0qnhqprsnfq8png31iyb0fsngljis5jc8yvb4353"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; - version = "1.2.10"; - sha256 = "12i5glirw23mw15hvnn6jr7wxv2jlg8x88s6izz5f1y81bxcmkk7"; + version = "1.3.1"; + sha256 = "0a79p6i3xiq6svv08c4hhihkvqa2ac7fphi3g9i0cwh47ak0k5h2"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; @@ -51,28 +51,23 @@ }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; - version = "1.2.8"; - sha256 = "1zqbhz80q004py8qwd4ma0fm9yd0rkza5r2dap6sfwpvng2c82fj"; + version = "1.3.1"; + sha256 = "165p1246fn628hlwdrx7sanlxa6qqpn480rq1asn5r1602w21844"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; - version = "1.2.10"; - sha256 = "1gqnsxbclvbkjhpwxdqpxcvjkzrardxzfkm6fadwa4jr2y5nhdkq"; + version = "1.3.1"; + sha256 = "1vlwm5mw8wffp00xhkx19yavk59b5x540sg81vis3q7hjvvgca5c"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; - version = "1.0.1"; - sha256 = "0b3psykci3jjwx0gbw6zwzsviph40bn46xb21dnd64djbq2iaa6p"; + version = "1.3.1"; + sha256 = "0qga34vi4fzfr0g4qk0ad8xkqdig2ishmdj9i32s5yrrjrkx7c8d"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; - version = "1.2.14"; - sha256 = "1lmlakpr67zgwx4qm86ylnivkxfyvq2ypjry17pfiwr11z8p5jih"; - }) - (fetchNuGet { - pname = "BTCPayServer.Lightning.Ptarmigan"; - version = "1.2.8"; - sha256 = "1l68n5mk918mfmpr1dkq1m7ql4zc2c4y7vglghna5pfy6jq7ryni"; + version = "1.3.1"; + sha256 = "1b70jlyzy9xjvfywzi6i3l3sd4mkknxpni9akdi0phsfqysmy0wl"; }) (fetchNuGet { pname = "BuildBundlerMinifier"; @@ -839,11 +834,6 @@ version = "6.0.15"; sha256 = "038dcl2k88w4cijws3pdnjflgy4lmqx70z0l7yqz355kmxjz8ain"; }) - (fetchNuGet { - pname = "NBitcoin"; - version = "6.0.19"; - sha256 = "1vd9hcavqkh0yhzmwnyyk8yd4i205217k90m7w0lln5vqvmq14kk"; - }) (fetchNuGet { pname = "NBitcoin"; version = "6.0.3"; @@ -854,6 +844,11 @@ version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) + (fetchNuGet { + pname = "NBitcoin"; + version = "7.0.1"; + sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; + }) (fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; @@ -1091,8 +1086,8 @@ }) (fetchNuGet { pname = "Selenium.WebDriver.ChromeDriver"; - version = "96.0.4664.4500"; - sha256 = "1kfnrimy49mab6v4afkk290djjyldnn683wdj15dax2mv8yxbyxs"; + version = "98.0.4758.10200"; + sha256 = "10mc50gm78zbxrwvxlygzmj2a29liiacv8haax0534c26vj9dwkl"; }) (fetchNuGet { pname = "Selenium.WebDriver"; From f20f185b8f6e8c180fe42fb6c231cd809657652a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 22 Feb 2022 04:20:00 +0000 Subject: [PATCH 07/20] git-gone: 0.3.7 -> 0.3.8 --- .../git-and-tools/git-gone/default.nix | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index 47d6cc023b80..449634ae6992 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,36 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: +{ lib +, stdenv +, fetchFromGitea +, rustPlatform +, libiconv +, Security +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.3.7"; + version = "0.3.8"; - src = fetchFromGitHub { - owner = "lunaryorn"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "flausch"; repo = pname; rev = "v${version}"; - sha256 = "0hhy1yazda9r4n753a5m9jf31fbzmm4v8wvl3pksspj2syglmll8"; + sha256 = "sha256-hKbq2rJwEZI3391RsZXsQSjjp7rSqglUckRDYAu42KE="; }; - cargoSha256 = "0mbc1742szpxnqqah6q0yhkn4fyyxqzg830bd1vzr07v273wr06r"; + cargoSha256 = "sha256-gBQ4V8Bwx6Di8aVnOYwx0UZZIIOFxZAXT7Tl1Yli0Fk="; - nativeBuildInputs = [ pkg-config makeWrapper installShellFiles ]; + nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' installManPage git-gone.1 ''; - postFixup = '' - wrapProgram $out/bin/git-gone --prefix PATH : "${lib.makeBinPath [ git ]}" - ''; - meta = with lib; { - description = "Cleanup stale Git branches of pull requests"; - homepage = "https://github.com/lunaryorn/git-gone"; + description = "Cleanup stale Git branches of merge requests"; + homepage = "https://codeberg.org/flausch/git-gone"; + changelog = "https://codeberg.org/flausch/git-gone/raw/tag/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; - platforms = platforms.unix; }; } From 6a353243b8cf5fe3dc0a41e7182910ae137a4f9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 08:03:27 +0000 Subject: [PATCH 08/20] jackett: 0.20.596 -> 0.20.604 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 799b812047dc..282ee8e9f85b 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.596"; + version = "0.20.604"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "wIJSqsIb3/SOicjLgnv0Lt3Wv1qKPHslRcDlZCvckUs="; + sha256 = "a2hJOu/TvT+6mQEt+9JB4l/Niz2+r8JuxANv4JUSM6U="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From 95ca2ce47a571fb6683574c48f79c135eeb441c2 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Thu, 16 Sep 2021 09:23:29 +0200 Subject: [PATCH 09/20] lispPackages.mmap: init at 20201220-git --- .../quicklisp-to-nix-output/mmap.nix | 33 +++++++++++++++++++ .../lisp-modules/quicklisp-to-nix-systems.txt | 1 + .../lisp-modules/quicklisp-to-nix.nix | 14 ++++++++ 3 files changed, 48 insertions(+) create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix new file mode 100644 index 000000000000..f5425cf549ff --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix @@ -0,0 +1,33 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "mmap"; + version = "20201220-git"; + + description = "Portable mmap (file memory mapping) utility library."; + + deps = [ args."alexandria" args."babel" args."cffi" args."documentation-utils" args."trivial-features" args."trivial-indent" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/mmap/2020-12-20/mmap-20201220-git.tgz"; + sha256 = "147xw351xh90k3yvc1fn7k418afmgngd56i8a6d7p41fzs54g6ij"; + }; + + packageName = "mmap"; + + asdFilesToKeep = ["mmap.asd"]; + overrides = x: x; +} +/* (SYSTEM mmap DESCRIPTION + Portable mmap (file memory mapping) utility library. SHA256 + 147xw351xh90k3yvc1fn7k418afmgngd56i8a6d7p41fzs54g6ij URL + http://beta.quicklisp.org/archive/mmap/2020-12-20/mmap-20201220-git.tgz MD5 + e2dbeb48b59735bd2ed54ea7f9cdfe0f NAME mmap FILENAME mmap DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) + (NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES + (alexandria babel cffi documentation-utils trivial-features trivial-indent) + VERSION 20201220-git SIBLINGS (mmap-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 4eb9be0b972e..81859abaf464 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -178,6 +178,7 @@ mgl-pax minheap misc-extensions mk-string-metrics +mmap moptilities more-conditions mt19937 diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 60338d0ea091..55081a5ccd0c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -2702,6 +2702,20 @@ let quicklisp-to-nix-packages = rec { })); + "mmap" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."mmap" or (x: {})) + (import ./quicklisp-to-nix-output/mmap.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + "mk-string-metrics" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."mk-string-metrics" or (x: {})) From 74f880ab5823cd98a587ac628881896b786c9e8c Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sat, 25 Sep 2021 13:23:39 +0200 Subject: [PATCH 10/20] lispPackages.slynk: init at sly-20210411-git --- .../quicklisp-to-nix-output/slynk.nix | 30 +++++++++++++++++++ .../lisp-modules/quicklisp-to-nix-systems.txt | 1 + .../lisp-modules/quicklisp-to-nix.nix | 8 +++++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix new file mode 100644 index 000000000000..02b641043eca --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix @@ -0,0 +1,30 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "slynk"; + version = "sly-20210411-git"; + + parasites = [ "slynk/arglists" "slynk/fancy-inspector" "slynk/indentation" "slynk/mrepl" "slynk/package-fu" "slynk/profiler" "slynk/retro" "slynk/stickers" "slynk/trace-dialog" ]; + + description = "System lacks description"; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/sly/2021-04-11/sly-20210411-git.tgz"; + sha256 = "1a96aapsz3fhnnnb8njn8v2ddrh6kwisppd90cc7v8knh043xgks"; + }; + + packageName = "slynk"; + + asdFilesToKeep = ["slynk.asd"]; + overrides = x: x; +} +/* (SYSTEM slynk DESCRIPTION System lacks description SHA256 + 1a96aapsz3fhnnnb8njn8v2ddrh6kwisppd90cc7v8knh043xgks URL + http://beta.quicklisp.org/archive/sly/2021-04-11/sly-20210411-git.tgz MD5 + 7f0ff6b8a07d23599c77cd33c6d59ea6 NAME slynk FILENAME slynk DEPS NIL + DEPENDENCIES NIL VERSION sly-20210411-git SIBLINGS NIL PARASITES + (slynk/arglists slynk/fancy-inspector slynk/indentation slynk/mrepl + slynk/package-fu slynk/profiler slynk/retro slynk/stickers + slynk/trace-dialog)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 81859abaf464..d723903c0ee3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -208,6 +208,7 @@ salza2 serapeum simple-date simple-date-time +slynk smart-buffer smug spinneret diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 55081a5ccd0c..a43351b1aff1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -2338,6 +2338,14 @@ let quicklisp-to-nix-packages = rec { })); + "slynk" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."slynk" or (x: {})) + (import ./quicklisp-to-nix-output/slynk.nix { + inherit fetchurl; + })); + + "simple-date-time" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."simple-date-time" or (x: {})) From 98035afeb8346fbb2d3bab9d875f2ef529f213ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 10:25:39 +0000 Subject: [PATCH 11/20] mdzk: 0.5.0 -> 0.5.1 --- pkgs/applications/misc/mdzk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix index f4d242346e9e..5e98aca96a72 100644 --- a/pkgs/applications/misc/mdzk/default.nix +++ b/pkgs/applications/misc/mdzk/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdzk"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "mdzk-rs"; repo = "mdzk"; rev = version; - sha256 = "sha256-NkoKQKcww5ktEbxbOY6WP8OemCB+rvXbuN9oSPjLE3Y="; + sha256 = "sha256-UiJ28VI4qXo04WojNaExTVQ3aTIXCQrdMbNM0DDy8A4="; }; - cargoSha256 = "sha256-uJ00tGiKtcYghFUh0fcYg4nZc/o8yhvlVs+6/aRNY5s="; + cargoSha256 = "sha256-CiA8Z1+S6+Lwms70IiRvIN83gValHuy6kHOukR2O7/Q="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 60b70fec0b966a4711328703005f69f470a06b39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 10:50:49 +0000 Subject: [PATCH 12/20] mpd-discord-rpc: 1.2.3 -> 1.3.0 --- pkgs/tools/audio/mpd-discord-rpc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/tools/audio/mpd-discord-rpc/default.nix index 9b8fc94d2edc..052488dc795b 100644 --- a/pkgs/tools/audio/mpd-discord-rpc/default.nix +++ b/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "mpd-discord-rpc"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "JakeStanger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FkdndkXj48JLKRwZ9lLVQrGU7QvBZvYC9Y2iYS0RiCY="; + sha256 = "sha256-b6V9puPFufQcTI5o88MbHf5+j+agJAr+DPYieVy+T6M="; }; - cargoSha256 = "sha256-w6Usc86yn7mq/wxljSpko/JPnLHmkyeILKa31YsQrFg="; + cargoSha256 = "sha256-U4wbKfRUC0sL9SistPNZjAGuXZB+XD1llAru33EAOHE="; meta = with lib; { description = "Rust application which displays your currently playing song / album / artist from MPD in Discord using Rich Presence"; From 25db9143c4dcdb2d419ad349f3fc23a40e33dffd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 11:26:19 +0000 Subject: [PATCH 13/20] python310Packages.sphinxext-opengraph: 0.5.1 -> 0.6.0 --- .../python-modules/sphinxext-opengraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 8b8cb4cdbb53..a64ad184a634 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "v${version}"; - sha256 = "sha256-US0UXxcTlN7x5v2ilpL+umTr7tadqthqhvfaQnm7tCc="; + sha256 = "sha256-FLou/Ag+uf6uTjzSAAAFbQScgRtHvMT21ZwlKBYNhlU="; }; propagatedBuildInputs = [ From d76955da6899b4cddcd28e7383f5d67c73fffde3 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Tue, 22 Feb 2022 12:35:57 +0100 Subject: [PATCH 14/20] netdata: add protobuf support --- pkgs/tools/system/netdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 79f829ffdfb1..0ae4e77910ef 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper , CoreFoundation, IOKit, libossp_uuid , nixosTests -, curl, libcap, libuuid, lm_sensors, zlib +, curl, libcap, libuuid, lm_sensors, zlib, protobuf , withCups ? false, cups , withDBengine ? true, libuv, lz4, judy , withIpmi ? (!stdenv.isDarwin), freeipmi @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; - buildInputs = [ curl.dev zlib.dev ] + buildInputs = [ curl.dev zlib.dev protobuf ] ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ] ++ optionals withCups [ cups ] From ec9dcce541319b164b8e6370dc141815518cd07f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 11:44:46 +0000 Subject: [PATCH 15/20] python310Packages.beartype: 0.9.1 -> 0.10.1 --- pkgs/development/python-modules/beartype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index d77a4db3e331..51479bbe3231 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "beartype"; - version = "0.9.1"; + version = "0.10.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "YjYw3CQ7DaWoTw+kFOaqryYT5WetGav+aoHBfqWrYvE="; + sha256 = "sha256-7yKOZpOLT0SH2LMGodGaCTi8TvJEthYjCfQjzMjO/HY="; }; checkInputs = [ From 9f2d210fde8e647bcfd92e70098faffb7ae0636d Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Tue, 22 Feb 2022 12:58:50 +0100 Subject: [PATCH 16/20] elmPackages.elm: explicitely use ghc8107 --- pkgs/development/compilers/elm/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 149d81150548..ab19ac42d24c 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -7,7 +7,7 @@ let fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; - hsPkgs = self: pkgs.haskellPackages.override { + hsPkgs = self: pkgs.haskell.packages.ghc8107.override { overrides = self: super: with pkgs.haskell.lib.compose; with lib; let elmPkgs = rec { elm = overrideCabal (drv: { @@ -200,4 +200,3 @@ in lib.makeScope pkgs.newScope (self: with self; { inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse elm-git-install; }) ) - From dd00116269179f636a29191af1e3cfce9ca84a0b Mon Sep 17 00:00:00 2001 From: linsui Date: Tue, 22 Feb 2022 22:46:05 +0800 Subject: [PATCH 17/20] dotter: init at 0.12.9 --- pkgs/tools/misc/dotter/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/dotter/default.nix diff --git a/pkgs/tools/misc/dotter/default.nix b/pkgs/tools/misc/dotter/default.nix new file mode 100644 index 000000000000..fdfabf8f778a --- /dev/null +++ b/pkgs/tools/misc/dotter/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, rustPlatform, which }: + +rustPlatform.buildRustPackage rec { + pname = "dotter"; + version = "0.12.9"; + + src = fetchFromGitHub { + owner = "SuperCuber"; + repo = "dotter"; + rev = version; + sha256 = "0rxinrm110i5cbkl7c7vgk7dl0x79cg6g23bdjixsg7h0572c2gi"; + }; + + cargoSha256 = "0fr2dvzbpwqvf98wwrxv76nwbrv4m9ppx7br4x78gm8dhf2nj4zx"; + + checkInputs = [ which ]; + + meta = with lib; { + description = "A dotfile manager and templater written in rust 🦀"; + homepage = "https://github.com/SuperCuber/dotter"; + license = licenses.unlicense; + maintainers = with maintainers; [ linsui ]; + mainProgram = "dotter"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f0df4384763..b69adcd4c524 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1752,6 +1752,8 @@ with pkgs; doona = callPackage ../tools/security/doona { }; + dotter = callPackage ../tools/misc/dotter { }; + droidcam = callPackage ../applications/video/droidcam { }; ecdsautils = callPackage ../tools/security/ecdsautils { }; From 67574bd99457d0971357baded8274c4442d8c2f7 Mon Sep 17 00:00:00 2001 From: Stephen Hassard Date: Mon, 21 Feb 2022 14:51:34 -0800 Subject: [PATCH 18/20] nim: 1.6.2 -> 1.6.4 --- pkgs/development/compilers/nim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 06b19b547b67..4f3b200477f0 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -98,12 +98,12 @@ in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.6.2"; + version = "1.6.4"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - hash = "sha256-msRxT6bDFdaR2n9diUHBsZDU1Dc5fZdC4yfC1RiT43M="; + hash = "sha256-f8MJKFW1wiAM2f7tEz0EYFgj8lDXO01KxQEwA3DgoMI="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ]; From e71f3a7ef823decbfc9efe46231c849804c241b3 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 22 Feb 2022 14:13:02 +0000 Subject: [PATCH 19/20] pinta: re-added missing runtime icons On PR #155224, we switched to `dotnet build` to copy the Pinta assets to the derivation. This worked mostly fine, however it seems to have missed the runtime icons. We didn't catch the issue on #155224 neither, probably because of some resource cache somewhere. This commit re-adds the missing runtime icons by copying them manually. --- pkgs/applications/graphics/pinta/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index ed2aae72d47a..b598c53b8947 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -63,6 +63,10 @@ buildDotnetModule rec { # Rename the binary mv "$out/bin/Pinta" "$out/bin/pinta" + # Copy runtime icons + mkdir -p $out/share/icons/hicolor/16x16/ + cp -r Pinta.Resources/icons/hicolor/16x16/* $out/share/icons/hicolor/16x16/ + # Install dotnet build installer/linux/install.proj \ -target:Install \ From 50323b2c9b95b85ad9fc5a51dafd15fb427d001b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 17:23:33 +0000 Subject: [PATCH 20/20] ticker: 4.4.4 -> 4.5.0 --- pkgs/applications/misc/ticker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index e345c344f902..ebc9b4996685 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ticker"; - version = "4.4.4"; + version = "4.5.0"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KICxcfZLBwCo12p5R9wt7Tk440wkUIE7G6lGfWIdxR8="; + sha256 = "sha256-THVzurv1LB2lxGsCw0ZPUF5QLgtUfN4ZNp8ak05I2Es="; }; - vendorSha256 = "sha256-1FnewgsKlOnBAdm7vyBngrFsDHNCzpZA3IDccxALeJ8="; + vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; ldflags = [ "-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}"