From 2c5e45c35c42ff06a30addc44f2e260b1651b02d Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:23:53 +0700 Subject: [PATCH 01/25] bypass403: remove --- pkgs/tools/security/bypass403/default.nix | 28 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/tools/security/bypass403/default.nix diff --git a/pkgs/tools/security/bypass403/default.nix b/pkgs/tools/security/bypass403/default.nix deleted file mode 100644 index 3d1569cf5577..000000000000 --- a/pkgs/tools/security/bypass403/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -}: - -buildGoModule rec { - pname = "bypass403"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "drsigned"; - repo = pname; - rev = "v${version}"; - sha256 = "1x3a4lnxjxbv80kaydy57809n9r7vzci9ki4f98smf3w04s86rcl"; - }; - - vendorSha256 = "1bp6bf99rxlyg91pn1y228q18lawpykmvkl22cydmclms0q0n238"; - - meta = with lib; { - description = "Tool to bypass 403 Forbidden responses"; - homepage = "https://github.com/drsigned/bypass403"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - - # https://github.com/drsigned/bypass403 no longer exists - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3517f43fbeee..16c461dec84a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -104,6 +104,7 @@ mapAliases ({ buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 buildkite-agent3 = buildkite-agent; # added 2018-09-26 bundler_HEAD = bundler; # added 2015-11-15 + bypass403 = throw "bypass403 has been removed: deleted by upstream"; # added 2022-01-07 calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13 calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13 caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # added 2020-10-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82bd5f88666f..61fbc3b0c3b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2372,8 +2372,6 @@ with pkgs; textual-window-manager = tmux; }; - bypass403 = callPackage ../tools/security/bypass403 { }; - bsh = fetchurl { url = "http://www.beanshell.org/bsh-2.0b5.jar"; sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2"; From f9bbc840e3fd93cd0a66de54ef81cb3fe70e3193 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:24:44 +0700 Subject: [PATCH 02/25] aqbanking: update homepage --- pkgs/development/libraries/aqbanking/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 1e11661b0098..2db69f8028c4 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "An interface to banking tasks, file formats and country information"; - homepage = "https://www.aquamaniac.de/"; + homepage = "https://www.aquamaniac.de/rdm/"; hydraPlatforms = []; license = licenses.gpl2Plus; maintainers = with maintainers; [ goibhniu ]; From f2a8126dcc0b4024804eac136c23fe72450598e0 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:25:43 +0700 Subject: [PATCH 03/25] argtable: update homepage --- pkgs/development/libraries/argtable/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/argtable/default.nix b/pkgs/development/libraries/argtable/default.nix index f22f81c87709..9752b9600397 100644 --- a/pkgs/development/libraries/argtable/default.nix +++ b/pkgs/development/libraries/argtable/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://argtable.org"; + homepage = "https://github.com/argtable/argtable3"; description = "A single-file, ANSI C command-line parsing library"; longDescription = '' Argtable is an open source ANSI C library that parses GNU-style From 801c41bd296e224042b0d967144fe45633031916 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:33:07 +0700 Subject: [PATCH 04/25] asn1c: remove --- pkgs/development/compilers/asn1c/default.nix | 33 -------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/development/compilers/asn1c/default.nix diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix deleted file mode 100644 index a4e822eec6da..000000000000 --- a/pkgs/development/compilers/asn1c/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, perl }: - -stdenv.mkDerivation rec { - pname = "asn1c"; - version = "0.9.28"; - - src = fetchurl { - url = "https://lionet.info/soft/asn1c-${version}.tar.gz"; - sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0"; - }; - - outputs = [ "out" "doc" "man" ]; - - buildInputs = [ perl ]; - - preConfigure = '' - patchShebangs examples/crfc2asn1.pl - ''; - - postInstall = '' - cp -r skeletons/standard-modules $out/share/asn1c - ''; - - doCheck = true; - - meta = with lib; { - homepage = "http://lionet.info/asn1c/compiler.html"; - description = "Open Source ASN.1 Compiler"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = [ maintainers.montag451 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 16c461dec84a..92a6f6a283f1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -61,6 +61,7 @@ mapAliases ({ ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # added 2021-09-28 arora = throw "arora has been removed."; # added 2020-09-09 asciidocFull = asciidoc-full; # added 2014-06-22 + asn1c = throw "asn1c has been removed: deleted by upstream"; # added 2022-01-07 asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # added 2020-10-07 at_spi2_atk = at-spi2-atk; # added 2018-02-25 at_spi2_core = at-spi2-core; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61fbc3b0c3b8..ad2863bda3eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11596,8 +11596,6 @@ with pkgs; tex = texlive.combined.scheme-medium; }; - asn1c = callPackage ../development/compilers/asn1c { }; - aspectj = callPackage ../development/compilers/aspectj { }; atasm = callPackage ../development/compilers/atasm { }; From 0bc6122a2ac6e8ea045076b386422baeac66c750 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:33:50 +0700 Subject: [PATCH 05/25] astyle: update homepage --- pkgs/development/tools/misc/astyle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 66e972826cb9..4ce8c1edffd4 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; - homepage = "https://astyle.sourceforge.net/"; + homepage = "http://astyle.sourceforge.net/"; license = licenses.lgpl3; platforms = platforms.unix; }; From ce4535e01eef55cb5e653b20144b617d5011a319 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:35:04 +0700 Subject: [PATCH 06/25] banking: update homepage --- pkgs/applications/office/banking/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/applications/office/banking/default.nix index c71c1eafa66c..e6c5192b0f94 100644 --- a/pkgs/applications/office/banking/default.nix +++ b/pkgs/applications/office/banking/default.nix @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Banking application for small screens"; - homepage = "https://tabos.gitlab.io/project/banking/"; + homepage = "https://tabos.gitlab.io/projects/banking/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; }; From c9339da1d11f784b198d80d59177fbdc6b5a977e Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:35:51 +0700 Subject: [PATCH 07/25] banner: update homepage --- pkgs/games/banner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index 613947c677a5..befb29f6ffc9 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://software.cedar-solutions.com/utilities.html"; + homepage = "https://github.com/pronovic/banner"; description = "Print large banners to ASCII terminals"; license = licenses.gpl2Only; From 16091bda7974cd56ae07511860aabd77ce4ce12e Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:40:04 +0700 Subject: [PATCH 08/25] bashburn: remove --- pkgs/tools/cd-dvd/bashburn/default.nix | 63 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 pkgs/tools/cd-dvd/bashburn/default.nix diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix deleted file mode 100644 index d9664f1072fb..000000000000 --- a/pkgs/tools/cd-dvd/bashburn/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchurl, util-linux -, cdparanoia, cdrdao, dvdplusrwtools, flac, lame, mpg123, normalize -, vorbis-tools, xorriso }: - -stdenv.mkDerivation rec { - pname = "bashburn"; - version = "3.1.0"; - - src = fetchurl { - sha256 = "0g5va5rjdrvacanmqr6pbxk2rl565ahkfbsvxsp1jvhvxvhmv3dp"; - url = "http://bashburn.dose.se/index.php?s=file_download&id=25"; - name = "${pname}-${version}.tar.gz"; - }; - - nativeBuildInputs = [ util-linux ]; - - postPatch = '' - for path in \ - BB_CDBURNCMD=${xorriso}/bin/"xorriso -as cdrecord" \ - BB_DVDBURNCMD=${dvdplusrwtools}/bin/growisofs \ - BB_ISOCMD=${xorriso}/bin/"xorriso -as mkisofs" \ - BB_DVDBLANK=${dvdplusrwtools}/bin/dvd+rw-format \ - BB_CDIMAGECMD=${cdrdao}/bin/cdrdao \ - BB_CDAUDIORIP=${cdparanoia}/bin/cdparanoia \ - BB_READCD=${xorriso}/bin/"xorriso -as mkisofs" \ - BB_MP3ENC=${lame}/bin/lame \ - BB_MP3DEC=${mpg123}/bin/mpg123 \ - BB_OGGENC=${vorbis-tools}/bin/oggenc \ - BB_OGGDEC=${vorbis-tools}/bin/oggdec \ - BB_FLACCMD=${flac.bin}/bin/flac \ - BB_EJECT=${util-linux}/bin/eject \ - BB_NORMCMD=${normalize}/bin/normalize \ - ; do - echo $path - sed -i BashBurn.sh \ - -e "s,\(''${path%%=*}:\).*,\1 ''${path#*=}," - sed -i menus/advanced.sh \ - -e "s,\(''${path%%=*}|\).*\('.*\),\1''${path#*=}\2," - done - ''; - - installPhase = '' - sh Install.sh --prefix $out - ''; - - meta = with lib; { - description = "Bash script CD Burner Writer"; - longDescription = '' - It might not be the best looking application out there, but it works. - It’s simple, fast and small, and can handle most things you throw at it. - Currently (and with the right dependencies installed), BashBurn can: - - burn data CDs/DVDs (Including CDRWs) - - burn music CDs - - burn CD/DVD-images - - rip data/music CDs - - manipulate ISO-files - - and probably more... - ''; - homepage = "http://bashburn.dose.se/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 92a6f6a283f1..c58e2bdae774 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -71,6 +71,7 @@ mapAliases ({ azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # added 2021-08-02 badtouch = authoscope; # Project was renamed, added 20210626 bar-xft = lemonbar-xft; # added 2015-01-16 + bashburn = throw "bashburn has been removed: deleted by upstream"; # added 2022-01-07 bashCompletion = bash-completion; # Added 2016-09-28 bash_5 = bash; # added 2021-08-20 bashInteractive_5 = bashInteractive; # added 2021-08-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad2863bda3eb..5fbbefba0bf0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2135,8 +2135,6 @@ with pkgs; barcode = callPackage ../tools/graphics/barcode {}; - bashburn = callPackage ../tools/cd-dvd/bashburn { }; - bashmount = callPackage ../tools/filesystems/bashmount {}; bat = callPackage ../tools/misc/bat { From 5aeec27082e4375970bdad13c0e521160a015df6 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:41:12 +0700 Subject: [PATCH 09/25] beancount: update homepage --- pkgs/development/python-modules/beancount/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 31f8a24d8b76..665fd6806bfa 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "http://furius.ca/beancount/"; + homepage = "https://github.com/beancount/beancount"; description = "Double-entry bookkeeping computer language"; longDescription = '' A double-entry bookkeeping computer language that lets you define From e62da01a80d8af422d33cc397592bf636a1448eb Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:42:23 +0700 Subject: [PATCH 10/25] bee: update homepage --- pkgs/applications/networking/bee/bee.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/bee/bee.nix b/pkgs/applications/networking/bee/bee.nix index 0e269bf9ab3f..d2f1740a573d 100644 --- a/pkgs/applications/networking/bee/bee.nix +++ b/pkgs/applications/networking/bee/bee.nix @@ -62,7 +62,7 @@ buildGoModule { ''; meta = with lib; { - homepage = "https://swarm.ethereum.org/"; + homepage = "https://github.com/ethersphere/bee"; description = "Ethereum Swarm Bee"; longDescription = '' A decentralised storage and communication system for a sovereign digital society. From 05745bdae39fb46e0eef3c93fa0a714c2526d395 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:44:21 +0700 Subject: [PATCH 11/25] bin_replace_string: remove --- .../tools/misc/bin_replace_string/default.nix | 31 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/development/tools/misc/bin_replace_string/default.nix diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix deleted file mode 100644 index a732d6e732c5..000000000000 --- a/pkgs/development/tools/misc/bin_replace_string/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, libelf, txt2man }: - -stdenv.mkDerivation { - pname = "bin_replace_string"; - version = "0.2"; - - src = fetchurl { - sha256 = "1gnpddxwpsfrg4l76x5yplsvbcdbviybciqpn22yq3g3qgnr5c2a"; - url = "ftp://ohnopub.net/mirror/bin_replace_string-0.2.tar.bz2"; - }; - - buildInputs = [ libelf ]; - nativeBuildInputs = [ txt2man ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Edit precompiled binaries"; - longDescription = '' - bin_replace_string edits C-style strings in precompiled binaries. This is - intended to be useful to replace arbitrary strings in binaries whose - source code is not available. However, because of the nature of compiled - binaries, bin_replace_string may only replace a given C-string with a - shorter C-string. - ''; - homepage = "http://ohnopub.net/~ohnobinki/bin_replace_string/"; - downloadPage = "ftp://ohnopub.net/mirror/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c58e2bdae774..6f8a879e1b4d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -83,6 +83,7 @@ mapAliases ({ beret = throw "beret has been removed"; # added 2021-11-16 blastem = throw "blastem has been removed from nixpkgs as it would still require python2."; # added 2022-01-01 bluezFull = bluez; # Added 2019-12-03 + bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # added 2022-01-07 bpftool = bpftools; # Added 2021-05-03 brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24 bridge_utils = bridge-utils; # added 2015-02-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fbbefba0bf0..0b1c105c3a23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14231,8 +14231,6 @@ with pkgs; stdenv; }; - bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; - bingrep = callPackage ../development/tools/analysis/bingrep { }; binutils-unwrapped = callPackage ../development/tools/misc/binutils { From 95d3bdb7a6999f3fd39972463b7a5dcd6eccdcda Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:44:55 +0700 Subject: [PATCH 12/25] bitcoin: update homepage --- pkgs/applications/blockchains/bitcoin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index e1a0dd207a0a..35ab9791ec73 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. ''; - homepage = "https://bitcoin.org/"; + homepage = "https://bitcoin.org/en/"; downloadPage = "https://bitcoincore.org/bin/bitcoin-core-${version}/"; changelog = "https://bitcoincore.org/en/releases/${version}/"; maintainers = with maintainers; [ prusnak roconnor ]; From 45e81e03ac57a51c57485761af8151af6e15c1e2 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:47:07 +0700 Subject: [PATCH 13/25] bsod: remove --- pkgs/misc/emulators/bsod/default.nix | 32 ---------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pkgs/misc/emulators/bsod/default.nix diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix deleted file mode 100644 index 869440856f9a..000000000000 --- a/pkgs/misc/emulators/bsod/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{lib, stdenv, fetchurl, ncurses}: - -stdenv.mkDerivation rec { - pname = "bsod"; - version = "0.1"; - - src = fetchurl { - url = "https://www.vanheusden.com/bsod/bsod-${version}.tgz"; - sha256 = "0hqwacazyq5rhc04j8w8w0j0dgb6ca8k66c9lxf6bsyi6wvbhvmd"; - }; - - buildInputs = [ ncurses ]; - - installPhase = '' - mkdir -p $out/bin - cp bsod $out/bin - ''; - - meta = { - description = "Blue Screen Of Death emulator for Unix"; - longDescription = " - This program will let you UNIX user experience the authentic - microsoft windows experience. Bsod displays the famous windows xp - blue screen of death on the console. Errors and drivers causing the - error are selected randomly from a large set of examples."; - homepage = "http://www.vanheusden.com/bsod/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.antono ]; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6f8a879e1b4d..f7e74c6b4076 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -101,6 +101,7 @@ mapAliases ({ bitwarden_rs-vault = vaultwarden-vault; bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # added 2021-01-02 + bsod = throw "bsod has been removed: deleted by upstream"; # added 2022-01-07 btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b1c105c3a23..51bd0e1a519f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2333,8 +2333,6 @@ with pkgs; breakpointHook = assert stdenv.isLinux; makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; - bsod = callPackage ../misc/emulators/bsod { }; - py65 = python3Packages.callPackage ../misc/emulators/py65 { }; simh = callPackage ../misc/emulators/simh { }; From ea793d9eccff4642d8f423cdc7b3ea4609e9b775 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:48:14 +0700 Subject: [PATCH 14/25] bunny: remove --- .../package-management/bunny/default.nix | 25 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/tools/package-management/bunny/default.nix diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix deleted file mode 100644 index 8ef808610db7..000000000000 --- a/pkgs/tools/package-management/bunny/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitLab }: - -stdenv.mkDerivation rec { - pname = "bunny"; - version = "1.3"; - - src = fetchFromGitLab { - owner = "tim241"; - repo = "bunny"; - rev = version; - sha256 = "0nh2h5kj9b0nkb6yrzf4if7anfdmy9vijzy4bl3s7qck0nzbpy8s"; - }; - - dontBuild = true; - - makeFlags = [ "prefix=$(out)" ]; - - meta = with lib; { - description = "A simple shell script wrapper around multiple package managers"; - homepage = "https://gitlab.com/tim241/bunny"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ buffet ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7e74c6b4076..a87c6b5d10a0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -108,6 +108,7 @@ mapAliases ({ buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 buildkite-agent3 = buildkite-agent; # added 2018-09-26 bundler_HEAD = bundler; # added 2015-11-15 + bunny = throw "bunny has been removed: deleted by upstream"; # added 2022-01-07 bypass403 = throw "bypass403 has been removed: deleted by upstream"; # added 2022-01-07 calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13 calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51bd0e1a519f..27da81ef92a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1572,8 +1572,6 @@ with pkgs; buildbot-full = with python3Packages; toPythonApplication buildbot-full; buildbot-worker = with python3Packages; toPythonApplication buildbot-worker; - bunny = callPackage ../tools/package-management/bunny { }; - bunyan-rs = callPackage ../development/tools/bunyan-rs { }; callaudiod = callPackage ../applications/audio/callaudiod { }; From 184340bff50ce8f12eb4fb140ddfd2ed0f9f9fc5 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:55:27 +0700 Subject: [PATCH 15/25] caudec: update homepage and fix source URL --- pkgs/applications/audio/caudec/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 15ebb85136b0..a595f285c68a 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -1,15 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, bash, bc, findutils, flac, lame, opusTools, procps, sox }: -let - version = "1.7.5"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "caudec"; - inherit version; + version = "1.7.5"; src = fetchurl { - url = "http://caudec.net/downloads/caudec-${version}.tar.gz"; + url = "http://caudec.cocatre.net/downloads/caudec-${version}.tar.gz"; sha256 = "5d1f5ab3286bb748bd29cbf45df2ad2faf5ed86070f90deccf71c60be832f3d5"; }; @@ -31,7 +27,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://caudec.net/"; + homepage = "https://caudec.cocatre.net/"; description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; From a90680e06f77892311fb6cc45e8179ed32fccb92 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:56:39 +0700 Subject: [PATCH 16/25] cayley: update homepage --- pkgs/servers/cayley/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index 13bf9326c22b..97aac4272cea 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { ]; meta = { - homepage = "https://cayley.io/"; + homepage = "https://github.com/cayleygraph/cayley"; description = "A graph database inspired by Freebase and Knowledge Graph"; maintainers = with lib.maintainers; [ sigma ]; license = lib.licenses.asl20; From 84ee8e02f45cb4b4182c53b0c7aacf64f2219902 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 13:57:33 +0700 Subject: [PATCH 17/25] cde: update homepage --- pkgs/tools/package-management/cde/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix index f2c308de5a76..acebe4726755 100644 --- a/pkgs/tools/package-management/cde/default.nix +++ b/pkgs/tools/package-management/cde/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://pg.ucsd.edu/cde/manual/"; + homepage = "https://github.com/usnistgov/corr-CDE"; description = "A packaging tool for building portable packages"; license = licenses.gpl3Plus; maintainers = [ maintainers.rlupton20 ]; From 5e04dac5d6fdd4cce69e73946dbb39ce3f0e925b Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 14:01:51 +0700 Subject: [PATCH 18/25] ceph: update homepage --- pkgs/tools/filesystems/ceph/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 2c6175bec13e..1162c4e69b12 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -85,7 +85,7 @@ let }; getMeta = description: with lib; { - homepage = "https://ceph.io/"; + homepage = "https://ceph.io/en/"; inherit description; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; maintainers = with maintainers; [ adev ak johanot krav ]; From 8641b298b126a289aadfdafa0d2939cd8a65e96d Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 14:03:36 +0700 Subject: [PATCH 19/25] chunkwm: remove --- pkgs/os-specific/darwin/chunkwm/default.nix | 36 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/os-specific/darwin/chunkwm/default.nix diff --git a/pkgs/os-specific/darwin/chunkwm/default.nix b/pkgs/os-specific/darwin/chunkwm/default.nix deleted file mode 100644 index c0229ba3ae23..000000000000 --- a/pkgs/os-specific/darwin/chunkwm/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchzip, Carbon, Cocoa, ScriptingBridge }: - -stdenv.mkDerivation rec { - pname = "chunkwm"; - version = "0.4.9"; - src = fetchzip { - url = "https://github.com/koekeishiya/chunkwm/archive/v${version}.tar.gz"; - sha256 = "0w8q92q97fdvbwc3qb5w44jn4vi3m65ssdvjp5hh6b7llr17vspl"; - }; - - buildInputs = [ Carbon Cocoa ScriptingBridge ]; - outputs = [ "bin" "out" ]; - - buildPhase = '' - for d in . src/chunkc src/plugins/*; do - pushd $d - buildPhase - popd - done - ''; - - installPhase = '' - mkdir -p $bin/bin $out/bin $out/lib/chunkwm/plugins - cp src/chunkc/bin/chunkc $bin/bin/chunkc - cp bin/chunkwm $out/bin - cp plugins/*.so $out/lib/chunkwm/plugins - ''; - - meta = with lib; { - description = "Tiling window manager for macOS based on plugin architecture"; - homepage = "https://github.com/koekeishiya/chunkwm"; - platforms = platforms.darwin; - maintainers = with maintainers; [ lnl7 ]; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a87c6b5d10a0..be5e1c6b0d76 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -121,6 +121,7 @@ mapAliases ({ cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05 checkbashism = checkbashisms; # added 2016-08-16 chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # added 2020-08-15 + chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # added 2022-01-07 cide = throw "cide was deprecated on 2019-09-11: abandoned by upstream"; cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 cifs_utils = cifs-utils; # added 2016-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27da81ef92a6..0df53768e038 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1951,10 +1951,6 @@ with pkgs; kwakd = callPackage ../servers/kwakd { }; - chunkwm = callPackage ../os-specific/darwin/chunkwm { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa ScriptingBridge; - }; - kwm = callPackage ../os-specific/darwin/kwm { }; khd = callPackage ../os-specific/darwin/khd { From 9fdcccb613693c84ac464c1d31f890f72c801601 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 14:04:34 +0700 Subject: [PATCH 20/25] circus: update homepage --- pkgs/tools/networking/circus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix index f24c0e629cb0..c9aba8dc4e8b 100644 --- a/pkgs/tools/networking/circus/default.nix +++ b/pkgs/tools/networking/circus/default.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { meta = with lib; { description = "A process and socket manager"; - homepage = "https://github.circus.com/circus-tent/circus"; + homepage = "https://github.com/circus-tent/circus"; license = licenses.asl20; }; } From 5e09daba1be25edf68f344da2bc8ab71b264debd Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 14:10:27 +0700 Subject: [PATCH 21/25] comic-relief: update homepage --- pkgs/data/fonts/comic-relief/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix index 1f5ce7f642fa..b5a7e8878876 100644 --- a/pkgs/data/fonts/comic-relief/default.nix +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -19,7 +19,7 @@ in fetchzip rec { sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff"; meta = with lib; { - homepage = "http://loudifier.com/comic-relief/"; + homepage = "https://fontlibrary.org/en/font/comic-relief"; description = "A font metric-compatible with Microsoft Comic Sans"; longDescription = '' Comic Relief is a typeface designed to be metrically equivalent From 28d7cd8c46a9afec083f5c08c82e117d054a5eb3 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 14:11:45 +0700 Subject: [PATCH 22/25] coqPackages.CoLoR: update homepage --- pkgs/development/coq-modules/CoLoR/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 46738343431a..24a7f125599d 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -23,7 +23,7 @@ with lib; mkCoqDerivation { enableParallelBuilding = false; meta = { - homepage = "http://color.inria.fr/"; + homepage = "https://github.com/fblanqui/color"; description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant."; maintainers = with maintainers; [ jpas jwiegley ]; }; From af6a78c0cafd67d7c8a21418ddbf2f332a8c3d04 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 14:14:15 +0700 Subject: [PATCH 23/25] cpuminer-multi: remove --- pkgs/tools/misc/cpuminer-multi/default.nix | 30 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 pkgs/tools/misc/cpuminer-multi/default.nix diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix deleted file mode 100644 index 3fbdcfae0fe4..000000000000 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, curl, jansson, autoconf, automake -, aesni ? stdenv.hostPlatform.aesSupport }: - -stdenv.mkDerivation { - pname = "cpuminer-multi"; - version = "unstable-2016-03-16"; - - src = fetchFromGitHub { - owner = "hyc"; - repo = "cpuminer-multi"; - rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4"; - sha256 = "11dg4rra4dgfb9x6q85irn0hrkx2lkwyrdpgdh10pag09s3vhy4v"; - }; - - buildInputs = [ autoconf automake curl jansson ]; - - preConfigure = '' - ./autogen.sh - ''; - - configureFlags = [ (if aesni then "--enable-aes-ni" else "--disable-aes-ni") ]; - - meta = with lib; { - description = "Multi-algo CPUMiner"; - homepage = "https://github.com/wolf9466/cpuminer-multi"; - license = licenses.gpl2; - # does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27 - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index be5e1c6b0d76..82b902567ca2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -155,6 +155,7 @@ mapAliases ({ couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03 coredumper = throw "coredumper has been removed: abandoned by upstream."; # added 2019-11-16 cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30 + cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # added 2022-01-07 cryptol = throw "cryptol was removed due to prolonged broken build"; # added 2020-08-21 cpp-gsl = microsoft_gsl; # added 2019-05-24 cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # added 2021-02-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0df53768e038..ae4b3bca5841 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4171,8 +4171,6 @@ with pkgs; cpuminer = callPackage ../tools/misc/cpuminer { }; - cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { }; - crabz = callPackage ../tools/compression/crabz { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; From 9334785442ec4a50921f3a46ba5593e99ca8ff0b Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 7 Jan 2022 14:15:19 +0700 Subject: [PATCH 24/25] crafty: remove --- pkgs/games/crafty/default.nix | 73 --------------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 pkgs/games/crafty/default.nix diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix deleted file mode 100644 index b5b53aa3c413..000000000000 --- a/pkgs/games/crafty/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib, stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - pname = "crafty"; - version = "25.0.1"; - - src = fetchurl { - url = "http://www.craftychess.com/downloads/source/crafty-${version}.zip"; - sha256 = "0aqgj2q7kdlgbha01qs869cwyja13bc7q2lh4nfhlba2pklknsm8"; - }; - - bookBin = fetchurl { - url = "http://www.craftychess.com/downloads/book/book.bin"; - sha256 = "10rrgkr3hxm7pxdbc2jq8b5g74gfhzk4smahks3k8am1cmyq4p7r"; - }; - - startPgn = fetchurl { - url = "http://craftychess.com/downloads/book/start.pgn.gz"; - sha256 = "12g70mgfifwssfvndzq94pin34dizlixhsga75vgj7dakysi2p7f"; - }; - - nativeBuildInputs = [ unzip ]; - - unpackPhase = '' - mkdir "craftysrc" - unzip $src -d craftysrc - gunzip -c $startPgn > "craftysrc/start.pgn" - ''; - - buildPhase = '' - cd craftysrc - make unix-gcc - ''; - - installPhase = '' - BUILDDIR="$PWD" - mkdir -p $out/bin - cp -p ./crafty $out/bin - - mkdir -p $out/share/crafty - cd $out/share/crafty - - $out/bin/crafty "books create $BUILDDIR/start.pgn 60" - rm -f *.001 - - cp -p ${bookBin} $out/share/crafty/book.bin - - mv $out/bin/crafty $out/bin/.crafty-wrapped - - cat - > $out/bin/crafty < Date: Fri, 7 Jan 2022 14:17:03 +0700 Subject: [PATCH 25/25] crda: update homepage --- pkgs/os-specific/linux/crda/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index d12bba4e1645..ffed5fc36a78 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { to the system configuration. ''; - homepage = "http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/"; + homepage = "https://wireless.wiki.kernel.org/en/developers/regulatory/crda"; license = licenses.free; # "copyleft-next 0.3.0", as yet without a web site platforms = platforms.linux; };