From 20a1c1ccb532986cec5952fd505d1fd4738d32ce Mon Sep 17 00:00:00 2001 From: niten Date: Tue, 16 May 2023 15:46:50 -0700 Subject: [PATCH] update deps with the new deps manager --- deps-lock.json | 47 --------- deps.edn | 1 + flake.lock | 251 +++++++++++++++++++++++++++++++++++++++++++++++-- flake.nix | 23 +++-- 4 files changed, 259 insertions(+), 63 deletions(-) diff --git a/deps-lock.json b/deps-lock.json index 5af7d0d..d5a169d 100644 --- a/deps-lock.json +++ b/deps-lock.json @@ -14,13 +14,6 @@ "rev": "ae81b91f0c710632f55b43f0193e16ab0dd81dde", "git-dir": "https/git.fudo.org/fudo-public/milquetoast", "hash": "sha256-8YF4ZLqlFGKyXWNB1u04qxCZIaI6/N25YIt7iIvSTh0=" - }, - { - "lib": "org.fudo/notifier", - "url": "https://git.fudo.org/fudo-public/notifier.git", - "rev": "9142e3d8e9084fa2eb0d2e569b9b9165aac5a09a", - "git-dir": "https/git.fudo.org/fudo-public/notifier", - "hash": "sha256-J43OJj33vVMBdrzc0WgTD7DIjQVh//+H/1R61MOv6gA=" } ], "mvn-deps": [ @@ -74,31 +67,6 @@ "mvn-repo": "https://repo.clojars.org/", "hash": "sha256-ahZELYfCkwwDImtKo9KYkVfVi5TtPnyNZ2aLDrZYOJs=" }, - { - "mvn-path": "com/github/hypfvieh/dbus-java-core/4.3.0/dbus-java-core-4.3.0.jar", - "mvn-repo": "https://repo1.maven.org/maven2/", - "hash": "sha256-k1la5yyTxvZd1HzfYtW86jGs6AzX6BTI+PbcSNtAJL4=" - }, - { - "mvn-path": "com/github/hypfvieh/dbus-java-core/4.3.0/dbus-java-core-4.3.0.pom", - "mvn-repo": "https://repo1.maven.org/maven2/", - "hash": "sha256-ED//T8q3ej/DCG14WkMfMaDcUMU+i6ncBxrRHE3popI=" - }, - { - "mvn-path": "com/github/hypfvieh/dbus-java-parent/4.3.0/dbus-java-parent-4.3.0.pom", - "mvn-repo": "https://repo1.maven.org/maven2/", - "hash": "sha256-gZmhnlhJxUUKP6gxvIKPG4cNFUBH4y3aDVnosZp7EiY=" - }, - { - "mvn-path": "com/github/hypfvieh/dbus-java-transport-native-unixsocket/4.3.0/dbus-java-transport-native-unixsocket-4.3.0.jar", - "mvn-repo": "https://repo1.maven.org/maven2/", - "hash": "sha256-cYXILkQt1h0Tl2FqTzz6fSapiFz3S2rsnFvk47mItAs=" - }, - { - "mvn-path": "com/github/hypfvieh/dbus-java-transport-native-unixsocket/4.3.0/dbus-java-transport-native-unixsocket-4.3.0.pom", - "mvn-repo": "https://repo1.maven.org/maven2/", - "hash": "sha256-qAiYVOWFQkr2alSEqYiX5FMrnSoqt6AkFqKozQOhX5U=" - }, { "mvn-path": "com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar", "mvn-repo": "https://repo1.maven.org/maven2/", @@ -599,21 +567,6 @@ "mvn-repo": "https://repo1.maven.org/maven2/", "hash": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" }, - { - "mvn-path": "org/slf4j/slf4j-api/2.0.6/slf4j-api-2.0.6.jar", - "mvn-repo": "https://repo1.maven.org/maven2/", - "hash": "sha256-LyqS1BCyaBOdfWO3XtJeIZlc/kEAwZvyNXfP28gHe9o=" - }, - { - "mvn-path": "org/slf4j/slf4j-api/2.0.6/slf4j-api-2.0.6.pom", - "mvn-repo": "https://repo1.maven.org/maven2/", - "hash": "sha256-i06GxT0ng2CPGuohPZBsW6xcBDPgCxkjm7FnZLn6NzY=" - }, - { - "mvn-path": "org/slf4j/slf4j-parent/2.0.6/slf4j-parent-2.0.6.pom", - "mvn-repo": "https://repo1.maven.org/maven2/", - "hash": "sha256-FIJlDL4x5AjB3IkCHLrh0wRK1KAb+PYro2C2qBOhMSQ=" - }, { "mvn-path": "org/sonatype/oss/oss-parent/7/oss-parent-7.pom", "mvn-repo": "https://repo1.maven.org/maven2/", diff --git a/deps.edn b/deps.edn index 62123eb..ea4390e 100644 --- a/deps.edn +++ b/deps.edn @@ -7,6 +7,7 @@ org.fudo/notifier { :git/url "https://git.fudo.org/fudo-public/notifier.git" :git/sha "9142e3d8e9084fa2eb0d2e569b9b9165aac5a09a" + ;; :local/root "/nix/store/zjbl2l2az2qdanxqqqp8mzyj4p3nvgh6-notifier-0.1/notifier-uber-0.1.jar" } org.fudo/fudo-clojure { :git/url "https://git.fudo.org/fudo-public/fudo-clojure.git" diff --git a/flake.lock b/flake.lock index cc58b0d..ea78294 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,30 @@ "type": "github" } }, + "clj-nix_2": { + "inputs": { + "devshell": "devshell_2", + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "notifierClj", + "helpers", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1677342613, + "narHash": "sha256-BqhKj7jQahSVThEwLHt164kJHGx9LXzBARFZaFNLPW8=", + "owner": "jlesquembre", + "repo": "clj-nix", + "rev": "7d9e244ea96988524ba3bd6c2bbafdf0a5340b96", + "type": "github" + }, + "original": { + "owner": "jlesquembre", + "repo": "clj-nix", + "type": "github" + } + }, "clj2nix": { "inputs": { "flake-compat": "flake-compat", @@ -43,6 +67,26 @@ "type": "github" } }, + "clj2nix_2": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_3", + "utils": "utils_3" + }, + "locked": { + "lastModified": 1673786922, + "narHash": "sha256-MrwSNEXpq20/AvMxW49MRbuqf8C2M4Vei3jtZeXYjJk=", + "owner": "hlolli", + "repo": "clj2nix", + "rev": "04b0dfbfc69c6316b8613d061e3fe4619d79cd9f", + "type": "github" + }, + "original": { + "owner": "hlolli", + "repo": "clj2nix", + "type": "github" + } + }, "devshell": { "inputs": { "flake-utils": [ @@ -70,6 +114,35 @@ "type": "github" } }, + "devshell_2": { + "inputs": { + "flake-utils": [ + "notifierClj", + "helpers", + "clj-nix", + "flake-utils" + ], + "nixpkgs": [ + "notifierClj", + "helpers", + "clj-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658746384, + "narHash": "sha256-CCJcoMOcXyZFrV1ag4XMTpAPjLWb4Anbv+ktXFI1ry0=", + "owner": "numtide", + "repo": "devshell", + "rev": "0ffc7937bb5e8141af03d462b468bd071eb18e1b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -86,6 +159,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1656928814, @@ -101,6 +190,21 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "helpers": { "inputs": { "clj-nix": "clj-nix", @@ -111,15 +215,41 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1677792046, - "narHash": "sha256-GU7czTodGN+6ijrz5MuREJMyfPo9aDsXRjaZA+nl+ys=", - "ref": "refs/heads/master", - "rev": "d54fa928c37e7f260c2b99bc733634347e83d9fd", - "revCount": 32, + "lastModified": 1684277086, + "narHash": "sha256-ZVolilPIqfhev+2txay6R+v57m8n5LW7IW7etSj38jI=", + "ref": "with-deps", + "rev": "dfec8f49de6a4cf4e3597d617cf8295cd987b60c", + "revCount": 57, "type": "git", "url": "https://git.fudo.org/fudo-public/nix-helpers.git" }, "original": { + "ref": "with-deps", + "type": "git", + "url": "https://git.fudo.org/fudo-public/nix-helpers.git" + } + }, + "helpers_2": { + "inputs": { + "clj-nix": "clj-nix_2", + "clj2nix": "clj2nix_2", + "nixpkgs": [ + "notifierClj", + "nixpkgs" + ], + "utils": "utils_4" + }, + "locked": { + "lastModified": 1684274921, + "narHash": "sha256-RH12Qx4u5LMomcBZaTBii1EhlHQ3TUgaKUcn+cqiClA=", + "ref": "with-deps", + "rev": "056710d1ef79ee9fabcd6808d3179779f65f45fd", + "revCount": 55, + "type": "git", + "url": "https://git.fudo.org/fudo-public/nix-helpers.git" + }, + "original": { + "ref": "with-deps", "type": "git", "url": "https://git.fudo.org/fudo-public/nix-helpers.git" } @@ -141,24 +271,62 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1682600000, - "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=", + "lastModified": 1684171562, + "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", + "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "type": "indirect" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1673785507, + "narHash": "sha256-EPUT8yVdvJhhjhbgnFWXXd4IUPKSOmww2+z4AmOdyPI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d06d765eeac716d8f1ca80f0935fd6fc951816ad", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "notifierClj": { + "inputs": { + "helpers": "helpers_2", + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils_5" + }, + "locked": { + "lastModified": 1684275076, + "narHash": "sha256-8+1ZkJo/k/7j5uJF7PN8IOv5Z9niuO1cw1m4zyvrv9Y=", + "ref": "refs/heads/master", + "rev": "8b1327f66a31873dc0cac3d6eb2fa5c957723757", + "revCount": 6, + "type": "git", + "url": "https://git.fudo.org/fudo-public/notifier.git" + }, + "original": { + "type": "git", + "url": "https://git.fudo.org/fudo-public/notifier.git" + } + }, "root": { "inputs": { "helpers": "helpers", "nixpkgs": "nixpkgs_2", - "utils": "utils_3" + "notifierClj": "notifierClj", + "utils": "utils_6" } }, "systems": { @@ -176,6 +344,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1667395993, @@ -207,6 +390,36 @@ } }, "utils_3": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_4": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_5": { "inputs": { "systems": "systems" }, @@ -223,6 +436,24 @@ "repo": "flake-utils", "type": "github" } + }, + "utils_6": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1cadd42..4d300de 100644 --- a/flake.nix +++ b/flake.nix @@ -2,24 +2,35 @@ description = "Tattler Notification Listener"; inputs = { - nixpkgs.url = "nixpkgs/nixos-22.05"; + nixpkgs.url = "nixpkgs/nixos-22.11"; utils.url = "github:numtide/flake-utils"; helpers = { - url = "git+https://git.fudo.org/fudo-public/nix-helpers.git"; + url = + "git+https://git.fudo.org/fudo-public/nix-helpers.git?ref=with-deps"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + notifierClj = { + url = "git+https://git.fudo.org/fudo-public/notifier.git"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, utils, helpers, ... }: + outputs = { self, nixpkgs, utils, helpers, notifierClj, ... }: utils.lib.eachDefaultSystem (system: - let pkgs = nixpkgs.legacyPackages."${system}"; + let + inherit (helpers.packages."${system}") mkClojureBin; + pkgs = nixpkgs.legacyPackages."${system}"; + cljLibs = { + "org.fudo/notifier" = "${notifierClj.packages."${system}".notifier}"; + }; in { packages = rec { default = tattler; - tattler = helpers.packages."${system}".mkClojureBin { + tattler = mkClojureBin { name = "org.fudo/tattler"; primaryNamespace = "tattler.cli"; src = ./.; + inherit cljLibs; }; }; @@ -27,7 +38,7 @@ default = updateDeps; updateDeps = pkgs.mkShell { buildInputs = with helpers.packages."${system}"; - [ updateClojureDeps ]; + [ (updateCljDeps cljLibs) ]; }; tattler = pkgs.mkShell { buildInputs = with self.packages."${system}"; [ tattler-server ];