From 22df63928be6a67448caf927f539f63a8341cfbc Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 25 Jul 2021 14:01:43 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 18 +++++++++--------- machines/kholinar/default.nix | 2 +- modules/programs/hledger/default.nix | 7 ++++--- modules/services/accentor/default.nix | 2 +- modules/services/accentor/package.json | 1 + modules/services/accentor/yarn.lock | 7 +++++++ modules/services/accentor/yarn.nix | 8 ++++++++ 7 files changed, 31 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 7d7a5bb3..f3289d9e 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1627117072, - "narHash": "sha256-HOsnsguL9HBPsXRTzmx55KKpBgGUm4MSnkorTcInjDI=", + "lastModified": 1627205048, + "narHash": "sha256-wlOHxuCHUWgoF4ug9DU0HY6P6+Njtb/ZBsAdE37LRR4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0772ac0f16bc09c470d002fd2c2b7f3fa6044204", + "rev": "f4626ee3cd8fb6081ae30961b86ebac5cc97ed11", "type": "github" }, "original": { @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1627079826, - "narHash": "sha256-+Bz7GgiWMm9aTuZ0fvYp4Tc4wVaN4Z7IwFS2IMJw7XA=", + "lastModified": 1627144340, + "narHash": "sha256-RzJ1fFLQ879J1okpH0WbYFY9qgHcglwVDl2bYqlRvw8=", "owner": "nix-community", "repo": "home-manager", - "rev": "996b43973969b3453e23dd06d2fc19765fb31e9d", + "rev": "0423a7b40cd29aec0bb02fa30f61ffe60f5dfc19", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1626852498, - "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=", + "lastModified": 1627128856, + "narHash": "sha256-yw3lA8zyNFhj309lmxvNByEEymRT1rRy5oE+jEPnsP4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "16105403bdd843540cbef9c63fc0f16c1c6eaa70", + "rev": "dd14e5d78e90a2ccd6007e569820de9b4861a6c2", "type": "github" }, "original": { diff --git a/machines/kholinar/default.nix b/machines/kholinar/default.nix index f2c5c00c..93c647c8 100644 --- a/machines/kholinar/default.nix +++ b/machines/kholinar/default.nix @@ -33,7 +33,7 @@ games.enable = true; graphical.enable = true; programs = { - calibre.enable = true; + calibre.enable = false; deluge.enable = true; dropbox.enable = true; eid.enable = true; diff --git a/modules/programs/hledger/default.nix b/modules/programs/hledger/default.nix index de77fa2f..a53eb312 100644 --- a/modules/programs/hledger/default.nix +++ b/modules/programs/hledger/default.nix @@ -2,10 +2,10 @@ let hledger-repo = pkgs.fetchFromGitHub { - owner = "chvp"; + owner = "Xitian9"; repo = "hledger"; - rev = "feature/gain-reports"; - sha256 = "07qsrq71pnkys11q6k2zc20xc9l3yp8dhzp1ar5bnkgcwbm69rcx"; + rev = "gain"; + sha256 = "1ppyil0byn0qrfgkjvb4wi8wb5lichddrh519v70k81gyczlbnyw"; }; in { @@ -21,6 +21,7 @@ in overrides = hself: hsuper: rec { hledger = hsuper.callCabal2nixWithOptions "hledger" hledger-repo "--subpath hledger" { }; hledger-lib = hsuper.callCabal2nixWithOptions "hledger-lib" hledger-repo "--subpath hledger-lib" { }; + doctest = hsuper.doctest_0_18_1; }; }; }) diff --git a/modules/services/accentor/default.nix b/modules/services/accentor/default.nix index 35ecbb71..220cf008 100644 --- a/modules/services/accentor/default.nix +++ b/modules/services/accentor/default.nix @@ -43,7 +43,7 @@ owner = "accentor"; repo = "web"; rev = "main"; - sha256 = "1sgj0ny0iiq1mx3x0nqb6dk67k03bbvahvn9xay3nl34kl5f1lgr"; + sha256 = "1nqjna0qvpa2r3ks5ks1p5daa692ilg5q5m2y2ypn9yfkdcysaip"; }; }); }; diff --git a/modules/services/accentor/package.json b/modules/services/accentor/package.json index 583182fb..85a4bf53 100644 --- a/modules/services/accentor/package.json +++ b/modules/services/accentor/package.json @@ -9,6 +9,7 @@ "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'" }, "dependencies": { + "@accentor/api-client-js": "^0.11.2", "@mdi/font": "^5.9.55", "@mdi/svg": "^5.9.55", "fetch-retry": "^4.1.1", diff --git a/modules/services/accentor/yarn.lock b/modules/services/accentor/yarn.lock index 7fb51a8b..29e896a1 100644 --- a/modules/services/accentor/yarn.lock +++ b/modules/services/accentor/yarn.lock @@ -2,6 +2,13 @@ # yarn lockfile v1 +"@accentor/api-client-js@^0.11.2": + version "0.11.2" + resolved "https://registry.yarnpkg.com/@accentor/api-client-js/-/api-client-js-0.11.2.tgz#1d606360cc03c50888025cede40339ece36ef5f0" + integrity sha512-uLluel1oRj+0+27wDcfAN1jGNkbWsr79T49YtV4PKOi6kjrJhWIoW8oR2sNrG4/OYy8xAg0978XTlyK/g55h7Q== + dependencies: + fetch-retry "^4.1.1" + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" diff --git a/modules/services/accentor/yarn.nix b/modules/services/accentor/yarn.nix index 91c3129b..70948663 100644 --- a/modules/services/accentor/yarn.nix +++ b/modules/services/accentor/yarn.nix @@ -1,6 +1,14 @@ { fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ + { + name = "_accentor_api_client_js___api_client_js_0.11.2.tgz"; + path = fetchurl { + name = "_accentor_api_client_js___api_client_js_0.11.2.tgz"; + url = "https://registry.yarnpkg.com/@accentor/api-client-js/-/api-client-js-0.11.2.tgz"; + sha1 = "1d606360cc03c50888025cede40339ece36ef5f0"; + }; + } { name = "_babel_code_frame___code_frame_7.12.13.tgz"; path = fetchurl {