diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/tomlcpp | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/tomlcpp')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/tomlcpp/0001-missing-headers.diff | 15 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/tomlcpp/default.nix | 16 |
2 files changed, 4 insertions, 27 deletions
diff --git a/nixpkgs/pkgs/development/libraries/tomlcpp/0001-missing-headers.diff b/nixpkgs/pkgs/development/libraries/tomlcpp/0001-missing-headers.diff deleted file mode 100644 index 3559facf3b54..000000000000 --- a/nixpkgs/pkgs/development/libraries/tomlcpp/0001-missing-headers.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur old-source/tomlcpp.hpp new-source/tomlcpp.hpp ---- tomlcpp/tomlcpp.hpp 1969-12-31 21:00:01.000000000 -0300 -+++ tomlcpp/tomlcpp.hpp 2022-04-14 12:50:14.269775437 -0300 -@@ -25,6 +25,11 @@ - #ifndef TOML_HPP - #define TOML_HPP - -+#include <memory> -+#include <string> -+#include <utility> -+#include <vector> -+ - struct toml_table_t; - struct toml_array_t; - diff --git a/nixpkgs/pkgs/development/libraries/tomlcpp/default.nix b/nixpkgs/pkgs/development/libraries/tomlcpp/default.nix index 96559f04541b..f782719f2b63 100644 --- a/nixpkgs/pkgs/development/libraries/tomlcpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/tomlcpp/default.nix @@ -1,24 +1,16 @@ -{ lib -, stdenv -, fetchFromGitHub -}: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "tomlcpp"; - version = "0.pre+date=2022-05-01"; + version = "0.pre+date=2022-06-25"; src = fetchFromGitHub { owner = "cktan"; repo = pname; - rev = "59fcc6dc89fb3f4130a2865e41e1fa5b8c502e45"; - hash = "sha256-Uc6R5KnGIZXY0EJgFM4Xi7Jtxcu6l8yGh5xgFZPoJDM="; + rev = "4212f1fccf530e276a2e1b63d3f99fbfb84e86a4"; + hash = "sha256-PM3gURXhyTZr59BWuLHvltjKOlKUSBT9/rqTeX5V//k="; }; - patches = [ - # Self-explaining - ./0001-missing-headers.diff - ]; - dontConfigure = true; installFlags = [ |