···5454 # We hard-code this by providing a little patch and then passing the absolute path to syminfo.lib as a
5555 # preprocessor flag.
5656 preBuild = ''
5757- makeFlagsArray+=(CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"$out/share/syminfo.lib\"')
5757+ makeFlagsArray+=(CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/syminfo.lib\"')
5858 export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS";
5959 '';
6060 makeFlags = [ "CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/syminfo.lib\"" ];
···1616 extraArgs = removeAttrs args ([ "name" ] ++ builtins.attrNames androidSdkFormalArgs);
1717in
1818stdenv.mkDerivation ({
1919- name = lib.replaceChars [" "] [""] name; # Android APKs may contain white spaces in their names, but Nix store paths cannot
1919+ name = lib.replaceStrings [" "] [""] name; # Android APKs may contain white spaces in their names, but Nix store paths cannot
2020 ANDROID_HOME = "${androidsdk}/libexec/android-sdk";
2121 buildInputs = [ jdk ant ];
2222 buildPhase = ''
···5353 extraArgs = removeAttrs args ([ "name" "scheme" "xcodeFlags" "release" "certificateFile" "certificatePassword" "provisioningProfile" "signMethod" "generateIPA" "generateXCArchive" "enableWirelessDistribution" "installURL" "bundleId" "version" ] ++ builtins.attrNames xcodewrapperFormalArgs);
5454in
5555stdenv.mkDerivation ({
5656- name = lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed
5656+ name = lib.replaceStrings [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed
5757 buildPhase = ''
5858 # Be sure that the Xcode wrapper has priority over everything else.
5959 # When using buildInputs this does not seem to be the case.
···7272 '';
73737474 meta = with lib; {
7575- homepage = "https://hostap.epitest.fi";
7575+ homepage = "https://w1.fi/hostapd/";
7676 description = "A user space daemon for access point and authentication servers";
7777 license = licenses.gpl2;
7878 maintainers = with maintainers; [ ninjatrappeur hexa ];
···32323333let
34343535+ moduleNames = map (mod: mod.name or (throw "The nginx module with source ${toString mod.src} does not have a `name` attribute. This prevents duplicate module detection and is no longer supported."))
3636+ modules;
3737+3538 mapModules = attrPath: flip concatMap modules
3639 (mod:
3740 let supports = mod.supports or (_: true);
···4043 else throw "Module at ${toString mod.src} does not support nginx version ${nginxVersion}!");
41444245in
4646+4747+assert assertMsg (unique moduleNames == moduleNames)
4848+ "nginx: duplicate modules: ${concatStringsSep ", " moduleNames}. A common cause for this is that services.nginx.additionalModules adds a module which the nixos module itself already adds.";
43494450stdenv.mkDerivation {
4551 inherit pname;
···11-{ lib, buildGoPackage, fetchFromGitHub }:
11+{ lib, buildGoModule, fetchFromGitHub }:
2233-buildGoPackage rec {
33+buildGoModule {
44 pname = "morty";
55- version = "0.2.0";
66-77- goPackagePath = "github.com/asciimoo/morty";
55+ version = "unstable-2021-04-22";
8697 src = fetchFromGitHub {
108 owner = "asciimoo";
119 repo = "morty";
1212- rev = "v${version}";
1313- sha256 = "sha256-NWfsqJKJcRPKR8gWQbgal1JsenDesczPcz/+uzhtefM=";
1010+ rev = "f5bff1e285d3f973cacf73318e55175edafd633f";
1111+ sha256 = "sha256-ik2VAPdxllt76UVFt77c1ltxIwFNahAKjn3FuErNFYo=";
1412 };
15131616- goDeps = ./deps.nix;
1414+ vendorSha256 = "sha256-3sllcoTDYQBAyAT7e9KeKNrlTEbgnoZc0Vt0ksQByvo=";
17151816 meta = with lib; {
1919- homepage = "https://github.com/asciimoo/morty";
2020- maintainers = with maintainers; [ leenaars ];
2121- license = licenses.agpl3;
2217 description = "Privacy aware web content sanitizer proxy as a service";
2318 longDescription = ''
2424- Morty is a web content sanitizer proxy as a service. It rewrites web
2525- pages to exclude malicious HTML tags and attributes. It also replaces
2626- external resource references to prevent third party information leaks.
2727-2828- The main goal of morty is to provide a result proxy for searx, but it
2929- can be used as a standalone sanitizer service too.
1919+ Morty rewrites web pages to exclude malicious HTML tags and attributes.
2020+ It also replaces external resource references to prevent third party information leaks.
30213131- Features:
3232-3333- * HTML sanitization
3434- * Rewrites HTML/CSS external references to locals
3535- * JavaScript blocking
3636- * No Cookies forwarded
3737- * No Referrers
3838- * No Caching/Etag
3939- * Supports GET/POST forms and IFrames
4040- * Optional HMAC URL verifier key to prevent service abuse
2222+ The main goal of morty is to provide a result proxy for searx, but it can be used as a standalone sanitizer service too.
4123 '';
2424+ homepage = "https://github.com/asciimoo/morty";
2525+ maintainers = with maintainers; [ leenaars SuperSandro2000 ];
2626+ license = licenses.agpl3;
4227 };
4328}
···3838 anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
3939 argon2_cffi = argon2-cffi; # added 2022-05-09
4040 asyncio-nats-client = nats-py; # added 2022-02-08
4141+ awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13
4142 Babel = babel; # added 2022-05-06
4243 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15
4344 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29
···219220 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30
220221 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30
221222 unittest2 = throw "unittest2 has been removed as it's a backport of unittest that's unmaintained and not needed beyond Python 3.4."; # added 2022-12-01
223223+ uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13
224224+ uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13
222225 Wand = wand; # added 2022-11-13
223226 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
224227 weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01