lol
0
fork

Configure Feed

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

Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
8b35f0c1 b49be812

+152 -35
+10 -1
lib/systems/examples.nix
··· 250 250 251 251 # BSDs 252 252 253 - amd64-netbsd = { 253 + # Deprecate 254 + amd64-netbsd = x86_64-netbsd; 255 + 256 + x86_64-netbsd = { 257 + config = "x86_64-unknown-netbsd"; 258 + libc = "nblibc"; 259 + }; 260 + 261 + x86_64-netbsd-llvm = { 254 262 config = "x86_64-unknown-netbsd"; 255 263 libc = "nblibc"; 264 + useLLVM = true; 256 265 }; 257 266 258 267 #
+18
nixos/modules/programs/fish.nix
··· 8 8 9 9 cfg = config.programs.fish; 10 10 11 + fishAbbrs = concatStringsSep "\n" ( 12 + mapAttrsFlatten (k: v: "abbr -ag ${k} ${escapeShellArg v}") 13 + cfg.shellAbbrs 14 + ); 15 + 11 16 fishAliases = concatStringsSep "\n" ( 12 17 mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}") 13 18 (filterAttrs (k: v: v != null) cfg.shellAliases) ··· 81 86 description = '' 82 87 Whether fish should autoload fish functions provided by other packages. 83 88 ''; 89 + }; 90 + 91 + shellAbbrs = mkOption { 92 + default = {}; 93 + example = { 94 + gco = "git checkout"; 95 + npu = "nix-prefetch-url"; 96 + }; 97 + description = '' 98 + Set of fish abbreviations. 99 + ''; 100 + type = with types; attrsOf str; 84 101 }; 85 102 86 103 shellAliases = mkOption { ··· 205 222 # if we haven't sourced the interactive config, do it 206 223 status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced 207 224 and begin 225 + ${fishAbbrs} 208 226 ${fishAliases} 209 227 210 228 ${sourceEnv "interactiveShellInit"}
+4 -4
pkgs/applications/terminal-emulators/nimmm/default.nix
··· 4 4 noise = fetchFromGitHub { 5 5 owner = "jangko"; 6 6 repo = "nim-noise"; 7 - rev = "db1e86e312413e4348fa82c02340784316a89cc1"; 8 - sha256 = "0n9l2dww5smrsl1xfqxjnxz3f1srb72lc1wl3pdvs6xfyf44qzlh"; 7 + rev = "v0.1.14"; 8 + sha256 = "0wndiphznfyb1pac6zysi3bqljwlfwj6ziarcwnpf00sw2zni449"; 9 9 }; 10 10 11 11 nimbox = fetchFromGitHub { ··· 24 24 25 25 in stdenv.mkDerivation rec { 26 26 pname = "nimmm"; 27 - version = "0.1.2"; 27 + version = "0.2.0"; 28 28 29 29 src = fetchFromGitHub { 30 30 owner = "joachimschmidt557"; 31 31 repo = "nimmm"; 32 32 rev = "v${version}"; 33 - sha256 = "1zpq181iz6g7yfi298gjwv33b89l4fpnkjprimykah7py5cpw67w"; 33 + sha256 = "168n61avphbxsxfq8qzcnlqx6wgvz5yrjvs14g25cg3k46hj4xqg"; 34 34 }; 35 35 36 36 nativeBuildInputs = [ nim ];
+80
pkgs/development/libraries/cosmopolitan/default.nix
··· 1 + { lib, gcc9Stdenv, fetchFromGitHub, runCommand, cosmopolitan }: 2 + 3 + gcc9Stdenv.mkDerivation rec { 4 + pname = "cosmopolitan"; 5 + version = "0.3"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "jart"; 9 + repo = "cosmopolitan"; 10 + rev = version; 11 + sha256 = "sha256-OVdOObO82W6JN63OWKHaERS7y0uvgxt+WLp6Y0LsmJk="; 12 + }; 13 + 14 + postPatch = '' 15 + patchShebangs build/ 16 + rm -r third_party/gcc 17 + ''; 18 + 19 + dontConfigure = true; 20 + dontFixup = true; 21 + enableParallelBuilding = true; 22 + 23 + preBuild = '' 24 + makeFlagsArray=( 25 + SHELL=/bin/sh 26 + AS=${gcc9Stdenv.cc.targetPrefix}as 27 + CC=${gcc9Stdenv.cc.targetPrefix}gcc 28 + GCC=${gcc9Stdenv.cc.targetPrefix}gcc 29 + CXX=${gcc9Stdenv.cc.targetPrefix}g++ 30 + LD=${gcc9Stdenv.cc.targetPrefix}ld 31 + OBJCOPY=${gcc9Stdenv.cc.targetPrefix}objcopy 32 + "MKDIR=mkdir -p" 33 + ) 34 + ''; 35 + 36 + installPhase = '' 37 + runHook preInstall 38 + mkdir -p $out/{bin,lib/include} 39 + install o/cosmopolitan.h $out/lib/include 40 + install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} $out/lib 41 + cat > $out/bin/cosmoc <<EOF 42 + #!${gcc9Stdenv.shell} 43 + exec ${gcc9Stdenv.cc}/bin/${gcc9Stdenv.cc.targetPrefix}gcc \ 44 + -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone \ 45 + "\$@" \ 46 + -Wl,--oformat=binary -Wl,--gc-sections -Wl,-z,max-page-size=0x1000 \ 47 + -fuse-ld=bfd -Wl,-T,$out/lib/ape.lds \ 48 + -include $out/lib/{include/cosmopolitan.h,crt.o,ape.o,cosmopolitan.a} 49 + EOF 50 + chmod +x $out/bin/cosmoc 51 + runHook postInstall 52 + ''; 53 + 54 + passthru.tests = lib.optional (gcc9Stdenv.buildPlatform == gcc9Stdenv.hostPlatform) { 55 + hello = runCommand "hello-world" { } '' 56 + printf 'main() { printf("hello world\\n"); }\n' >hello.c 57 + ${gcc9Stdenv.cc}/bin/gcc -g -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone -o hello.com.dbg hello.c \ 58 + -fuse-ld=bfd -Wl,-T,${cosmopolitan}/lib/ape.lds \ 59 + -include ${cosmopolitan}/lib/{include/cosmopolitan.h,crt.o,ape.o,cosmopolitan.a} 60 + ${gcc9Stdenv.cc.bintools.bintools_bin}/bin/objcopy -S -O binary hello.com.dbg hello.com 61 + ./hello.com 62 + printf "test successful" > $out 63 + ''; 64 + cosmoc = runCommand "cosmoc-hello" { } '' 65 + printf 'main() { printf("hello world\\n"); }\n' >hello.c 66 + ${cosmopolitan}/bin/cosmoc hello.c 67 + ./a.out 68 + printf "test successful" > $out 69 + ''; 70 + }; 71 + 72 + meta = with lib; { 73 + homepage = "https://justine.lol/cosmopolitan/"; 74 + description = "Your build-once run-anywhere c library"; 75 + platforms = platforms.x86_64; 76 + badPlatforms = platforms.darwin; 77 + license = licenses.isc; 78 + maintainers = with maintainers; [ lourkeur tomberek ]; 79 + }; 80 + }
+2
pkgs/development/libraries/libbsd/default.nix
··· 9 9 sha256 = "11x8q45jvjvf2dvgclds64mscyg10lva33qinf2hwgc84v3svf1l"; 10 10 }; 11 11 12 + outputs = [ "out" "dev" "man" ]; 13 + 12 14 # darwin changes configure.ac which means we need to regenerate 13 15 # the configure scripts 14 16 nativeBuildInputs = [ autoreconfHook ];
+4 -2
pkgs/development/ocaml-modules/safepass/default.nix
··· 2 2 3 3 buildDunePackage rec { 4 4 pname = "safepass"; 5 - version = "3.0"; 5 + version = "3.1"; 6 + 7 + useDune2 = true; 6 8 7 9 src = fetchFromGitHub { 8 10 owner = "darioteixeira"; 9 11 repo = "ocaml-safepass"; 10 12 rev = "v${version}"; 11 - sha256 = "0i127gs9x23wzwa1q3dxa2j6hby07hvxdg1c98fc3j09rg6vy2bs"; 13 + sha256 = "1cwslwdb1774lfmhcclj9kymvidbcpjx1vp16jnjirqdqgl4zs5q"; 12 14 }; 13 15 14 16 meta = {
+8 -2
pkgs/development/python-modules/weasyprint/default.nix
··· 1 1 { buildPythonPackage, 2 2 fetchPypi, 3 + fetchpatch, 3 4 cairosvg, 4 5 pyphen, 5 6 cffi, ··· 7 8 lxml, 8 9 html5lib, 9 10 tinycss, 10 - pygobject2, 11 11 glib, 12 12 pango, 13 13 fontconfig, ··· 43 43 44 44 FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; 45 45 46 - propagatedBuildInputs = [ cairosvg pyphen cffi cssselect lxml html5lib tinycss pygobject2 ]; 46 + propagatedBuildInputs = [ cairosvg pyphen cffi cssselect lxml html5lib tinycss ]; 47 47 48 + # 47043a1fd7e50a892b9836466f521df85d597c4.patch can be removed after next release of weasyprint, see: 49 + # https://github.com/Kozea/WeasyPrint/issues/1333#issuecomment-818062970 48 50 patches = [ 51 + (fetchpatch { 52 + url = "https://github.com/Kozea/WeasyPrint/commit/47043a1fd7e50a892b9836466f521df85d597c44.patch"; 53 + sha256 = "0l9z0hrav3bcdajlg3vbzljq0lkw7hlj8ppzrq3v21hbj1il1nsb"; 54 + }) 49 55 (substituteAll { 50 56 src = ./library-paths.patch; 51 57 fontconfig = "${fontconfig.lib}/lib/libfontconfig${stdenv.hostPlatform.extensions.sharedLibrary}";
+6 -6
pkgs/servers/rippled/default.nix
··· 31 31 32 32 nudb = fetchgit rec { 33 33 url = "https://github.com/CPPAlliance/NuDB.git"; 34 - rev = "2.0.3"; 35 - sha256 = "0imd9sh6knydwa3pxa5bbvjs3bmb8650dnsvj04qgns6bynwlqh1"; 34 + rev = "2.0.5"; 35 + sha256 = "02zbd07qvdjjsm4ivvhxah5n466bncvm6m03vmq0qdbbrlnp6s37"; 36 36 leaveDotGit = true; 37 37 fetchSubmodules = true; 38 38 postFetch = "cd $out && git tag ${rev}"; ··· 40 40 41 41 rocksdb = fetchgit rec { 42 42 url = "https://github.com/facebook/rocksdb.git"; 43 - rev = "v6.5.3"; 44 - sha256 = "11kbwqph1i3w6rbhr0kl2aq4jidhai24gw420y9qi9ab7zl0zcqg"; 43 + rev = "v6.7.3"; 44 + sha256 = "16qb636qs2yxqmz30hmvq8mllf038s80p37b0vyc0bazwlr93d9z"; 45 45 deepClone = true; 46 46 fetchSubmodules = false; 47 47 leaveDotGit = true; ··· 116 116 }; 117 117 in stdenv.mkDerivation rec { 118 118 pname = "rippled"; 119 - version = "1.6.0"; 119 + version = "1.7.0"; 120 120 121 121 src = fetchgit { 122 122 url = "https://github.com/ripple/rippled.git"; 123 123 rev = version; 124 - sha256 = "176i3dm98zp5jllslpzfhh52bd2lapq9i8r7m45v8sg9icvsmyz7"; 124 + sha256 = "1rr5kxks9hsxyxrz90dw259b6fs9lywdlqv0bj2g21a6f7g60v2v"; 125 125 leaveDotGit = true; 126 126 fetchSubmodules = true; 127 127 };
+5 -1
pkgs/tools/admin/bash-my-aws/default.nix
··· 1 1 { lib, stdenv 2 + , makeWrapper 2 3 , awscli 3 4 , jq 5 + , unixtools 4 6 , fetchgit 5 7 , installShellFiles 6 8 , bashInteractive ··· 22 24 propagatedBuildInputs = [ 23 25 awscli 24 26 jq 27 + unixtools.column 25 28 bashInteractive 26 29 ]; 27 - nativeBuildInputs = [ installShellFiles ]; 30 + nativeBuildInputs = [ makeWrapper installShellFiles ]; 28 31 29 32 checkPhase = '' 30 33 pushd test ··· 50 53 --replace .bash-my-aws "" 51 54 substituteInPlace bin/bma \ 52 55 --replace '~/.bash-my-aws' $out 56 + wrapProgram $out/bin/bma --prefix PATH : ${lib.makeBinPath [awscli jq unixtools.column bashInteractive ]} 53 57 installShellCompletion --bash --name bash-my-aws.bash bash_completion.sh 54 58 chmod +x $out/lib/* 55 59 patchShebangs --host $out/lib
+2 -2
pkgs/tools/security/httpx/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "httpx"; 8 - version = "1.0.4"; 8 + version = "1.0.5"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "projectdiscovery"; 12 12 repo = "httpx"; 13 13 rev = "v${version}"; 14 - sha256 = "sha256-w5CNvtlhvm1SyAKaoA7Fw8ZSY9Z78MentrSNS4mpr1Q="; 14 + sha256 = "sha256-E7HGE+ZVUF6AK+4qVsO2t+/B8hRMd14/bZW2WXA6p6E="; 15 15 }; 16 16 17 17 vendorSha256 = "sha256-VBxGapvC2QE/0slsAiCBzmwOSMeGepZU0pYVDepSrwg=";
+11 -17
pkgs/tools/typesetting/htmldoc/default.nix
··· 1 - { lib, stdenv, fetchurl 2 - 3 - , SystemConfiguration ? null, Foundation ? null 4 - }: 5 - 6 - assert stdenv.isDarwin -> SystemConfiguration != null 7 - && Foundation != null; 1 + { lib, stdenv, fetchFromGitHub, zlib, libpng, SystemConfiguration, Foundation }: 8 2 9 3 stdenv.mkDerivation rec { 10 - version = "1.8.29"; 11 4 pname = "htmldoc"; 12 - src = fetchurl { 13 - url = "https://github.com/michaelrsweet/htmldoc/releases/download" 14 - + "/release-${version}/htmldoc-${version}-source.tar.gz"; 15 - sha256 = "15x0xdf487j4i4gfap5yr83airxnbp2v4lxaz79a4s3iirrq39p0"; 5 + version = "1.9.11"; 6 + src = fetchFromGitHub { 7 + owner = "michaelrsweet"; 8 + repo = "htmldoc"; 9 + rev = "v${version}"; 10 + sha256 = "0660829zjfdm6vzx14z7gvsfipsb7h0z74gbkyp2ncg3g2432s4n"; 16 11 }; 17 - buildInputs = with stdenv; 18 - lib.optional isDarwin SystemConfiguration 19 - ++ lib.optional isDarwin Foundation; 12 + buildInputs = [ zlib libpng ] 13 + ++ lib.optionals stdenv.isDarwin [ Foundation SystemConfiguration ]; 20 14 21 15 meta = with lib; { 22 16 description = "Converts HTML files to PostScript and PDF"; 23 17 homepage = "https://michaelrsweet.github.io/htmldoc"; 24 - license = licenses.gpl2; 18 + license = licenses.gpl2Only; 25 19 maintainers = with maintainers; [ shanemikel ]; 26 - platforms = with platforms; linux ++ darwin; 20 + platforms = platforms.unix; 27 21 28 22 longDescription = '' 29 23 HTMLDOC is a program that reads HTML source files or web pages and
+2
pkgs/top-level/all-packages.nix
··· 13952 13952 13953 13953 cog = callPackage ../development/web/cog { }; 13954 13954 13955 + cosmopolitan = callPackage ../development/libraries/cosmopolitan { }; 13956 + 13955 13957 ctl = callPackage ../development/libraries/ctl { }; 13956 13958 13957 13959 ctpp2 = callPackage ../development/libraries/ctpp2 { };