From 2981bd7f98f1230848b116d3d4f5c18cb8d665ac Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 4 Dec 2017 21:30:43 -0500 Subject: [PATCH] assorted patches --- default.nix | 1 - factoids.toml | 3 ++- ircbot/Cargo.lock | 2 +- nix/ircbot-carnix.nix | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index faf61da..3df3ab5 100644 --- a/default.nix +++ b/default.nix @@ -13,7 +13,6 @@ in { ofborg.rs = stripDeps (pkgs.callPackage ./nix/ofborg-carnix.nix {}).ofborg_0_1_0; ircbot = stripDeps (pkgs.callPackage ./nix/ircbot-carnix.nix {}).ircbot_0_1_0; - # /nix/store/a4xfsgh5bwh5w4m9y1j40ry4dq892gl4-ofborg/ ofborg.php = pkgs.runCommand "ofborg" { diff --git a/factoids.toml b/factoids.toml index 566a233..b795940 100644 --- a/factoids.toml +++ b/factoids.toml @@ -1,3 +1,4 @@ [factoids] +"!factoids" = "Have a helpful Nix factoid? Send a PR! https://github.com/grahamc/ofborg/blob/master/factoids.toml" "!cloudfront" = "https://gist.github.com/grahamc/df1bb806eb3552650d03eef7036a72ba" -"!which channel" = "https://gist.github.com/grahamc/c60578c6e6928043d29a427361634df6#which-channel-is-right-for-me" \ No newline at end of file +"!which channel" = "https://gist.github.com/grahamc/c60578c6e6928043d29a427361634df6#which-channel-is-right-for-me" diff --git a/ircbot/Cargo.lock b/ircbot/Cargo.lock index a13d3dd..139523b 100644 --- a/ircbot/Cargo.lock +++ b/ircbot/Cargo.lock @@ -53,7 +53,7 @@ dependencies = [ [[package]] name = "amqp" version = "0.1.0" -source = "git+https://github.com/grahamc/rust-amqp.git#7aedd23b36a44bf8820e708639273f19989ef688" +source = "git+https://github.com/grahamc/rust-amqp.git#8f40d623cf94af15a2e1e120cdf1d8c6f157e881" dependencies = [ "amq-proto 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/nix/ircbot-carnix.nix b/nix/ircbot-carnix.nix index 574119d..522ed59 100644 --- a/nix/ircbot-carnix.nix +++ b/nix/ircbot-carnix.nix @@ -42,8 +42,8 @@ let kernel = buildPlatform.parsed.kernel.name; authors = [ "Andrii Dmytrenko " ]; src = fetchgit { url = "https://github.com/grahamc/rust-amqp.git"; - rev = "7aedd23b36a44bf8820e708639273f19989ef688"; - sha256 = "13j5b6ndl3kplr55bmc2knzxxh7nggxr8xajrqnnds77iyqlcl8i"; + rev = "8f40d623cf94af15a2e1e120cdf1d8c6f157e881"; + sha256 = "1wqxw81cwarhfxp5mgfa8ygswj4rzi0xj4q6wsg93p6hcj2h3aib"; }; inherit dependencies buildDependencies features; };