danidiaz

conflictos modify/delete

(NOTA: Los primeros "truquillos Git" fueron redactados antes de que en Git la rama por defecto pasase a ser main, y he usado --initial-branch=master como manera fácil de adaptar los ejemplos para que siguiesen funcionado. Los "truquillos" posteriores ya usan main.)

Ejecutar este script en Git Bash crea un repositorio y lo deja en un estado de conflicto de merge:

mkdir conflicto.01
cd conflicto.01
git init --initial-branch=master

echo "zzz" > foo.txt

danidiaz

	  ---			-----------------			----
	  Map			Quick Explanation			Link
	  ---			-----------------			----
<	 <F1>	Causes Netrw to issue help
	 <cr>	Netrw will enter the directory or read the file      |netrw-cr|
	 <del>	Netrw will attempt to remove the file/directory      |netrw-del|
	 <c-h>	Edit file hiding list                                |netrw-ctrl-h|
	 <c-l>	Causes Netrw to refresh the directory listing        |netrw-ctrl-l|
	 <c-r>	Browse using a gvim server                           |netrw-ctrl-r|
	 <c-tab> Shrink/expand a netrw/explore window                |netrw-c-tab|

danidiaz

Papers

Time clock and the ordering of events in a distributed system

Consensus on Transaction Commit

An empirical study on the correctness of formally verified distributed systems

Byzantizing Paxos by Refinement

danidiaz

-- https://www.reddit.com/r/haskell/comments/170f6qa/comment/k6spn9n/
-- Compare the core of 
--   ghc -O0 -c Main.hs -ddump-to-file -ddump-simpl -dsuppress-idinfo -dsuppress-coercions -dsuppress-type-applications -dsuppress-uniques -dsuppress-module-prefixes -fforce-recomp
-- with the core of
--   ghc -O2 -c Main.hs -ddump-to-file -ddump-simpl -dsuppress-idinfo -dsuppress-coercions -dsuppress-type-applications -dsuppress-uniques -dsuppress-module-prefixes -fforce-recomp
-- search for "foofun". 
module Main (main) where

data Foo = Foo
  { aaa :: Int,

danidiaz

{-# LANGUAGE BlockArguments #-}
{-# LANGUAGE LambdaCase #-}
-- | https://well-typed.com/blog/2016/09/sharing-conduit/
module Main where

import Control.Exception
import System.IO

retry :: IO a -> IO a
retry io = do

danidiaz

{-# LANGUAGE DuplicateRecordFields #-}
{-# LANGUAGE NoFieldSelectors #-}
{-# LANGUAGE OverloadedRecordDot #-}
{-# LANGUAGE RecordWildCards #-}
module Main where
import Distribution.Simple (KnownExtension(RecordWildCards))

data Foo = Foo {
    aaa :: Int,
    bbb :: Bool

danidiaz

-- code by mniip
types :: [String]
types = $(
  do
    insts <- reifyInstances ''Exception [VarT (mkName "a")]
    let
      tyConOf (AppT ty _) = tyConOf ty
      tyConOf (ConT con) = Just con
      tyConOf _ = Nothing
    tyCons <- for insts \case

danidiaz

# https://nixos.wiki/wiki/Import_From_Derivation
# https://discourse.nixos.org/t/how-to-import-a-derivation-with-import/15375
# https://nixos.org/manual/nix/stable/language/builtins#builtins-import
# https://nixos.org/manual/nix/stable/language/values.html#type-string
let
  pkgs = import <nixpkgs> {};
  derivation-to-import = pkgs.writeText "inner" "5";
  imported-nix-value = import derivation-to-import;
in pkgs.writeText "foo" ''
   The value from the inner derivation was: ${toString imported-nix-value}

danidiaz

A series of reading lists mostly related to functional programming.

danidiaz

{
  # https://nix.dev/anti-patterns/language#unquoted-urls
  inputs.nixpkgs.url = "github:NixOS/nixpkgs";

  outputs = { self, nixpkgs, ... }@attrs:
    # https://discourse.nixos.org/t/using-nixpkgs-legacypackages-system-vs-import/17462/5
    # https://discourse.nixos.org/t/recommendations-for-use-of-flakes-input-follows/17413
    let pkgs = nixpkgs.legacyPackages.aarch64-darwin;
    in {
      # https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-fmt.html