pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

resholve: 0.10.5 -> 0.10.6

Also:
- use nixfmt style for examples in README.md
- drop passthru consumer test for ix removed in #397949

Travis A. Everett 8a1b0296 39c08228

+67 -43
+55 -37
pkgs/development/misc/resholve/README.md
··· 41 41 <!-- TODO: figure out how to pull this externally? --> 42 42 43 43 ```nix 44 - { lib 45 - , fetchFromGitHub 46 - , resholve 47 - , bash 48 - , coreutils 49 - , goss 50 - , which 44 + { 45 + bash, 46 + coreutils, 47 + gnused, 48 + goss, 49 + lib, 50 + resholve, 51 + which, 51 52 }: 52 53 53 54 resholve.mkDerivation rec { 54 55 pname = "dgoss"; 55 - version = "0.4.2"; 56 - 57 - src = fetchFromGitHub { 58 - owner = "goss-org"; 59 - repo = "goss"; 60 - rev = "refs/tags/v${version}"; 61 - hash = "sha256-FDn1OETkYIpMenk8QAAHvfNZcSzqGl5xrD0fAZPVmRM="; 62 - }; 56 + version = goss.version; 57 + src = goss.src; 63 58 64 59 dontConfigure = true; 65 60 dontBuild = true; ··· 73 68 default = { 74 69 scripts = [ "bin/dgoss" ]; 75 70 interpreter = "${bash}/bin/bash"; 76 - inputs = [ coreutils which ]; 71 + inputs = [ 72 + coreutils 73 + gnused 74 + which 75 + ]; 77 76 keep = { 78 77 "$CONTAINER_RUNTIME" = true; 79 78 }; 80 79 }; 81 80 }; 82 81 83 - meta = with lib; { 82 + meta = { 84 83 homepage = "https://github.com/goss-org/goss/blob/v${version}/extras/dgoss/README.md"; 85 84 changelog = "https://github.com/goss-org/goss/releases/tag/v${version}"; 86 85 description = "Convenience wrapper around goss that aims to bring the simplicity of goss to docker containers"; 87 - license = licenses.asl20; 88 - platforms = platforms.linux; 89 - maintainers = with maintainers; [ hyzual anthonyroussel ]; 86 + license = lib.licenses.asl20; 87 + platforms = lib.platforms.linux; 88 + maintainers = with lib.maintainers; [ 89 + hyzual 90 + anthonyroussel 91 + ]; 90 92 mainProgram = "dgoss"; 91 93 }; 92 94 } ··· 101 103 102 104 ```nix 103 105 { 104 - resholvedScript = resholve.writeScript "name" { 105 - inputs = [ file ]; 106 - interpreter = "${bash}/bin/bash"; 107 - } '' 108 - echo "Hello" 109 - file . 110 - ''; 111 - resholvedScriptBin = resholve.writeScriptBin "name" { 112 - inputs = [ file ]; 113 - interpreter = "${bash}/bin/bash"; 114 - } '' 115 - echo "Hello" 116 - file . 117 - ''; 106 + resholvedScript = 107 + resholve.writeScript "name" 108 + { 109 + inputs = [ file ]; 110 + interpreter = "${bash}/bin/bash"; 111 + } 112 + '' 113 + echo "Hello" 114 + file . 115 + ''; 116 + resholvedScriptBin = 117 + resholve.writeScriptBin "name" 118 + { 119 + inputs = [ file ]; 120 + interpreter = "${bash}/bin/bash"; 121 + } 122 + '' 123 + echo "Hello" 124 + file . 125 + ''; 118 126 } 119 127 ``` 120 128 ··· 125 133 trivial for now. If you have a real usage that you find helpful, please PR it. 126 134 127 135 ```nix 128 - { stdenv, resholve, module1 }: 136 + { 137 + stdenv, 138 + resholve, 139 + module1, 140 + }: 129 141 130 142 stdenv.mkDerivation { 131 143 # pname = "testmod3"; ··· 140 152 interpreter = "${bash}/bin/bash"; 141 153 inputs = [ module1 ]; 142 154 fake = { 143 - external = [ "jq" "openssl" ]; 155 + external = [ 156 + "jq" 157 + "openssl" 158 + ]; 144 159 }; 145 160 }} 146 161 ''; ··· 220 235 fake = { 221 236 # fake accepts the initial of valid identifier types as a CLI convenience. 222 237 # Use full names in the Nix API. 223 - function = [ "setUp" "tearDown" ]; 238 + function = [ 239 + "setUp" 240 + "tearDown" 241 + ]; 224 242 builtin = [ "setopt" ]; 225 243 source = [ "/etc/bashrc" ]; 226 244 };
+9 -2
pkgs/development/misc/resholve/resholve-utils.nix
··· 39 39 else if builtins.isList val then 40 40 "${name}:${semicolons (map lib.escapeShellArg val)}" 41 41 else 42 - nope [ solution env name ] "unexpected type: ${builtins.typeOf val}"; 42 + nope [ 43 + solution 44 + env 45 + name 46 + ] "unexpected type: ${builtins.typeOf val}"; 43 47 44 48 # Build fake/fix/keep directives from Nix types 45 49 phraseDirectives = ··· 68 72 else if builtins.isAttrs val then 69 73 spaces (phraseDirectives solution env val) 70 74 else 71 - nope [ solution env ] "unexpected type: ${builtins.typeOf val}"; 75 + nope [ 76 + solution 77 + env 78 + ] "unexpected type: ${builtins.typeOf val}"; 72 79 73 80 # Shell-format each env value 74 81 shellEnv =
+2 -2
pkgs/development/misc/resholve/source.nix
··· 4 4 }: 5 5 6 6 rec { 7 - version = "0.10.5"; 7 + version = "0.10.6"; 8 8 rSrc = fetchFromGitHub { 9 9 owner = "abathur"; 10 10 repo = "resholve"; 11 11 rev = "v${version}"; 12 - hash = "sha256-SzJbA0wLeSwvXnAE4bTNqh0tnpFPkn6N1hp7sZGAkB4="; 12 + hash = "sha256-iJEkfW60QO4nFp+ib2+DeDRsZviYFhWRQoBw1VAhzJY="; 13 13 }; 14 14 }
+1 -2
pkgs/development/misc/resholve/test.nix
··· 42 42 bashup-events32, 43 43 dgoss, 44 44 git-ftp, 45 - ix, 46 45 lesspipe, 47 46 locate-dominating-file, 48 47 mons, ··· 77 76 rlwrap 78 77 gnutar 79 78 bc 79 + msmtp 80 80 ]; 81 81 in 82 82 rec { ··· 326 326 inherit bashup-events32; 327 327 inherit bats; 328 328 inherit git-ftp; 329 - inherit ix; 330 329 inherit lesspipe; 331 330 inherit locate-dominating-file; 332 331 inherit mons;