diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix deleted file mode 100644 index df885c90371..00000000000 --- a/pkgs/applications/audio/axoloti/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip -, gnumake, gcc-arm-embedded, binutils-arm-embedded -, dfu-util-axoloti, jdk, ant, libfaketime }: - -stdenv.mkDerivation rec { - version = "1.0.12-2"; - pname = "axoloti"; - - src = fetchFromGitHub { - owner = "axoloti"; - repo = "axoloti"; - rev = version; - sha256 = "1qffis277wshldr3i939b0r2x3a2mlr53samxqmr2nk1sfm2b4w9"; - }; - - chibi_version = "2.6.9"; - chibi_name = "ChibiOS_${chibi_version}"; - - chibios = fetchurl { - url = "mirror://sourceforge/project/chibios/ChibiOS_RT%20stable/Version%20${chibi_version}/${chibi_name}.zip"; - sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj"; - }; - - nativeBuildInputs = [ - makeWrapper - unzip - gcc-arm-embedded - binutils-arm-embedded - dfu-util-axoloti - ant - ]; - buildInputs = [jdk libfaketime ]; - - patchPhase = '' - unzip ${chibios} - mv ${chibi_name} chibios - (cd chibios/ext; unzip -q -o fatfs-0.9-patched.zip) - - # Remove source of non-determinism in ChibiOS - substituteInPlace "chibios/os/various/shell.c" \ - --replace "#ifdef __DATE__" "#if 0" - - # Hardcode path to "make" - for f in "firmware/compile_firmware_linux.sh" \ - "firmware/compile_patch_linux.sh"; do - substituteInPlace "$f" \ - --replace "make" "${gnumake}/bin/make" - done - - # Hardcode dfu-util path - substituteInPlace "platform_linux/upload_fw_dfu.sh" \ - --replace "/bin/dfu-util" "" - substituteInPlace "platform_linux/upload_fw_dfu.sh" \ - --replace "./dfu-util" "${dfu-util-axoloti}/bin/dfu-util" - - # Fix build version - substituteInPlace "build.xml" \ - --replace "(git missing)" "${version}" - - # Remove build time - substituteInPlace "build.xml" \ - --replace "" "" - substituteInPlace "build.xml" \ - --replace \ - '' \ - '' - substituteInPlace "build.xml" \ - --replace "" "" - substituteInPlace "build.xml" \ - --replace \ - '{line.separator}' \ - '{line.separator} ' - ''; - - buildPhase = '' - find . -exec touch -d '1970-01-01 00:00' {} \; - (cd platform_linux; sh compile_firmware.sh) - faketime "1970-01-01 00:00:00" ant -Dbuild.runtime=true - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/axoloti - - cp -r doc firmware chibios platform_linux CMSIS *.txt $out/share/axoloti/ - install -vD dist/Axoloti.jar $out/share/axoloti/ - - makeWrapper ${jdk}/bin/java $out/bin/axoloti --add-flags "-Daxoloti_release=$out/share/axoloti -Daxoloti_runtime=$out/share/axoloti -jar $out/share/axoloti/Axoloti.jar" - ''; - - meta = with lib; { - homepage = "http://www.axoloti.com"; - description = '' - Sketching embedded digital audio algorithms. - - To fix permissions of the Axoloti USB device node, add a similar udev rule to services.udev.extraRules: - SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="0442", OWNER="someuser", GROUP="somegroup" - ''; - license = licenses.gpl3; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix deleted file mode 100644 index a8a2f8813af..00000000000 --- a/pkgs/applications/audio/axoloti/dfu-util.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libusb1-axoloti }: - -stdenv.mkDerivation rec { - pname = "dfu-util"; - version = "0.8"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1-axoloti ]; - - src = fetchurl { - url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; - sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm"; - }; - - meta = with lib; { - description = "Device firmware update (DFU) USB programmer"; - longDescription = '' - dfu-util is a program that implements the host (PC) side of the USB - DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade) protocol. - - DFU is intended to download and upload firmware to devices connected over - USB. It ranges from small devices like micro-controller boards up to mobile - phones. With dfu-util you are able to download firmware to your device or - upload firmware from it. - ''; - homepage = "http://dfu-util.sourceforge.net"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix deleted file mode 100644 index 820a8998f0b..00000000000 --- a/pkgs/applications/audio/axoloti/libusb1.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, lib, fetchurl, pkg-config, systemd, libobjc, IOKit, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "libusb"; - version = "1.0.19"; - - src = fetchurl { - url = "mirror://sourceforge/libusb/libusb-${version}.tar.bz2"; - sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c"; - }; - - outputs = [ "out" "dev" ]; # get rid of propagating systemd closure - - buildInputs = [ pkg-config ]; - propagatedBuildInputs = lib.optional stdenv.isLinux systemd - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit ]; - - patches = [ - (fetchpatch { - name = "libusb.stdfu.patch"; - url = "https://raw.githubusercontent.com/axoloti/axoloti/1.0.12/platform_linux/src/libusb.stdfu.patch"; - sha256 = "194j7j61i4q6x0ihm9ms8dxd4vliw20n2rj6cm9h17qzdl9xr33d"; - }) - ]; - - NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; - - preFixup = lib.optionalString stdenv.isLinux '' - sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la - ''; - - meta = with lib; { - homepage = "http://www.libusb.info"; - description = "User-space USB library"; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b6a629aed10..4f118f308b1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -94,6 +94,7 @@ mapAliases ({ avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18 awesome-4-0 = awesome; # Added 2022-05-05 aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05; + axoloti = throw "axoloti has been removed: abandoned by upstream"; # Added 2022-05-13 azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02 ### B ### @@ -316,6 +317,7 @@ mapAliases ({ demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 desktop_file_utils = throw "'desktop_file_utils' has been renamed to/replaced by 'desktop-file-utils'"; # Converted to throw 2022-02-22 devicemapper = throw "'devicemapper' has been renamed to/replaced by 'lvm2'"; # Converted to throw 2022-02-22 + dfu-util-axoloti = throw "dfu-util-axoloti has been removed: abandoned by upstream"; # Added 2022-05-13 dhall-text = throw "'dhall-text' has been deprecated in favor of the 'dhall text' command from 'dhall'"; # Added 2022-03-26 digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22 disper = throw "disper has been removed: abandoned by upstream"; # Added 2022-03-18 @@ -696,6 +698,7 @@ mapAliases ({ libudev = throw "'libudev' has been renamed to/replaced by 'udev'"; # Converted to throw 2022-02-22 libungif = giflib; # Added 2020-02-12 libusb = libusb1; # Added 2020-04-28 + libusb1-axoloti = throw "libusb1-axoloti has been removed: axoloti has been removed"; # Added 2022-05-13 libva-full = throw "'libva-full' has been renamed to/replaced by 'libva'"; # Converted to throw 2022-02-22 libva1-full = throw "'libva1-full' has been renamed to/replaced by 'libva1'"; # Converted to throw 2022-02-22 libwnck3 = libwnck; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 541e81833e9..cb21235e6e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2562,17 +2562,6 @@ with pkgs; libssl = openssl; }; - axoloti = callPackage ../applications/audio/axoloti { - gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; - binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - dfu-util-axoloti = callPackage ../applications/audio/axoloti/dfu-util.nix { }; - libusb1-axoloti = callPackage ../applications/audio/axoloti/libusb1.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit; - }; - b3sum = callPackage ../tools/security/b3sum {}; backblaze-b2 = callPackage ../development/tools/backblaze-b2 { };