From a7479419d3c35feb6345d9d40d424793c8b04e71 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Sun, 6 Dec 2020 13:01:43 +0100 Subject: [PATCH] Remove outdated stuff --- default.nix | 16 +------- flightgear/default.nix | 83 ------------------------------------------ kelpie/default.nix | 12 ------ obnam/default.nix | 24 ------------ obnam/gpg-name.patch | 14 ------- openscenegraph.nix | 39 -------------------- pijul.nix | 30 --------------- rq/default.nix | 19 ---------- simgear.nix | 29 --------------- 9 files changed, 1 insertion(+), 265 deletions(-) delete mode 100644 flightgear/default.nix delete mode 100644 kelpie/default.nix delete mode 100644 obnam/default.nix delete mode 100644 obnam/gpg-name.patch delete mode 100644 openscenegraph.nix delete mode 100644 pijul.nix delete mode 100644 rq/default.nix delete mode 100644 simgear.nix diff --git a/default.nix b/default.nix index fe213fb..554459b 100644 --- a/default.nix +++ b/default.nix @@ -23,13 +23,7 @@ let toLissA321 = callPackage ./x-plane/toliss-A321.nix {}; vividSky = callPackage ./x-plane/vivid-sky.nix {}; - # flightgear = libsForQt5.callPackage ./flightgear { }; - # openscenegraph = callPackage ./openscenegraph.nix { inherit (xorg) libX11 libXrandr; }; - # simgear = callPackage ./simgear.nix { inherit (xorg) libX11 libXext libXi libICE - # libSM libXmu xextproto inputproto - # xproto libXt; }; - # obnam = callPackage ./obnam { }; - #pdfchain = callPackage ./pdfchain { }; + pdfchain = callPackage ./pdfchain { }; # z3 = callPackage ./z3 { }; # stormChecker = callPackage ./storm-checker { ltoSupport = false; tbbSupport = false; mathsatSupport = false; z3Support = false; }; # carl = callPackage ./carl { }; @@ -43,14 +37,6 @@ let pharo-with-libs = callPackage ./pharo.nix { libgit2_32 = super.pkgsi686Linux.libgit2; }; - # latest.rustChannels = - # flip mapAttrs self.latest.rustChannels (name: value: value // { - # rust = value.rust.override { - # extensions = ["rust-src"]; - # }; - # }); - # # pijul = callPackage ./pijul.nix { rustPlatform = super.makeRustPlatform { inherit (self.rustChannelOf { date = "2019-01-04"; channel = "nightly"; }) rustc cargo; }; }; - # pijul = callPackage ./pijul.nix { rustPlatform = super.makeRustPlatform { inherit (_self.latest.rustChannels.nightly) rustc cargo; }; }; myR = super.rWrapper.override { packages = with super.rPackages; [ ggplot2 lintr tikzDevice rlang ]; }; ledgerTools = callPackage ./ledger-tools { }; }; diff --git a/flightgear/default.nix b/flightgear/default.nix deleted file mode 100644 index 84e52de..0000000 --- a/flightgear/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig -, freeglut, freealut, libGLU, libICE, libjpeg, openal, openscenegraph, plib -, libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto -, libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr -, makeDesktopItem, qtbase, qtdeclarative, glew, sqlite, speex -}: - -let - version = "2017.2.1"; - shortVersion = "2017.2"; - data = stdenv.mkDerivation rec { - name = "flightgear-base-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; - sha256 = "196imk6ppin98djrci52ixm75a4183kvjysya6y7xnd1012hwdf9"; - }; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p "$out/share/FlightGear" - tar xf "${src}" -C "$out/share/FlightGear/" --strip-components=1 - ''; - }; -in -stdenv.mkDerivation rec { - name = "flightgear-${version}"; - # inheriting data for `nix-prefetch-url -A pkgs.flightgear.data.src` - inherit version data; - - src = fetchurl { - url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2"; - sha256 = "0nqz66xlqfyip9srbx4wk0d4m21npghzil07cwih5zfa6qvsdnf7"; - }; - - # Of all the files in the source and data archives, there doesn't seem to be - # a decent icon :-) - iconsrc = fetchurl { - url = "http://wiki.flightgear.org/images/6/62/FlightGear_logo.png"; - sha256 = "1ikz413jia55vfnmx8iwrlxvx8p16ggm81mbrj66wam3q7s2dm5p"; - }; - - desktopItem = makeDesktopItem { - name = "flightgear"; - exec = "fgfs"; - icon = "${iconsrc}"; - comment = "FlightGear Flight Simulator"; - desktopName = "FlightGear"; - genericName = "Flight simulator"; - categories = "Game;Simulation"; - }; - - buildInputs = [ - makeWrapper pkgconfig - freeglut freealut libGLU libICE libjpeg openal openscenegraph plib - libSM libunwind libX11 xproto libXext xextproto libXi inputproto - libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qtbase - qtdeclarative glew sqlite speex - ]; - - cmakeFlags="-DFG_BUILD_TYPE=Release -DSYSTEM_SQLITE=ON -DSYSTEM_SPEEX=ON"; - - postInstall = '' - mkdir -p "$out/share/applications/" - cp "${desktopItem}"/share/applications/* "$out/share/applications/" #*/ - - for f in $out/bin/* #*/ - do - wrapProgram $f --set FG_ROOT "${data}/share/FlightGear" - done - - - ''; - - meta = with stdenv.lib; { - description = "Flight simulator"; - maintainers = with maintainers; [ raskin the-kenny ]; - platforms = platforms.linux; - hydraPlatforms = []; # disabled from hydra because it's so big - license = licenses.gpl2; - }; -} diff --git a/kelpie/default.nix b/kelpie/default.nix deleted file mode 100644 index 58c1707..0000000 --- a/kelpie/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, unzip, jdk8, jre8, ant }: - -stdenv.mkDerivation rec { - name = "kelpie-${version}"; - version = "1.2.0"; - src = fetchurl { - url = "mirror://sourceforge/fgflightplanner/${version}/fgfp-src.${version}.zip"; - sha256 = "1qnnjk7h47sryb8dj0lz8qs9jpzzzskz1hjn92b8yi7ccxk24zhn"; - }; - - buildInputs = [ jdk8 jre8 ant unzip ]; -} diff --git a/obnam/default.nix b/obnam/default.nix deleted file mode 100644 index a7b4844..0000000 --- a/obnam/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, python2Packages, gnupg }: - -python2Packages.buildPythonApplication rec { - name = "obnam-${version}"; - version = "1.22"; - - src = fetchurl { - url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz"; - sha256 = "0z3absbcpdk8zmmi6n3vwmwyv0pnzy7lp1rcsymb292p04alcn3x"; - }; - - patches = [ ./gpg-name.patch ]; - propagatedBuildInputs = with python2Packages; [ cliapp cmdtest fuse larch paramiko pyyaml tracing ttystatus ]; - - makeWrapperArgs = [ "--prefix PATH : ${gnupg}/bin" ]; - - meta = with stdenv.lib; { - description = "Backup program supporting GPG encryption, SFTP, deduplication, generations."; - homepage = "https://obnam.org"; - download = "https://code.liw.fi/debian/pool/main/o/obnam/"; - license = licenses.gpl3; - maintainers = [ maintainers.spacefrogg ]; - }; -} diff --git a/obnam/gpg-name.patch b/obnam/gpg-name.patch deleted file mode 100644 index 5f3f3db..0000000 --- a/obnam/gpg-name.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -u obnam-1.22/obnamlib/encryption.py.orig obnam-1.22/obnamlib/encryption.py ---- obnam-1.22/obnamlib/encryption.py.orig 2017-07-21 17:57:59.323647221 +0200 -+++ obnam-1.22/obnamlib/encryption.py 2017-07-21 17:58:35.817783095 +0200 -@@ -122,7 +122,7 @@ - env['GNUPGHOME'] = gpghome - tracing.trace('gpghome=%s' % gpghome) - -- argv = ['gpg', '-q', '--batch', '--no-textmode'] + args -+ argv = ['gpg2', '-q', '--batch', '--no-textmode'] + args - tracing.trace('argv=%s', repr(argv)) - p = subprocess.Popen(argv, stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, env=env) - -Diff finished. Fri Jul 21 17:58:49 2017 diff --git a/openscenegraph.nix b/openscenegraph.nix deleted file mode 100644 index 8d08390..0000000 --- a/openscenegraph.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip -, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11 -, cairo, poppler, librsvg, libpng, libtiff, libXrandr -, xineLib, boost -, withApps ? false -, withSDL ? false, SDL -, withQt4 ? false, qt4 -}: - -stdenv.mkDerivation rec { - name = "openscenegraph-${version}"; - version = "3.4.0"; - - src = fetchurl { - url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip"; - sha256 = "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw"; - }; - - nativeBuildInputs = [ pkgconfig cmake doxygen unzip ]; - - buildInputs = [ - freetype libjpeg jasper libxml2 zlib gdal curl libX11 - cairo poppler librsvg libpng libtiff libXrandr boost - xineLib - ] ++ lib.optional withSDL SDL - ++ lib.optional withQt4 qt4; - - enableParallelBuilding = true; - - cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF"; - - meta = with stdenv.lib; { - description = "A 3D graphics toolkit"; - homepage = http://www.openscenegraph.org/; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - license = "OpenSceneGraph Public License - free LGPL-based license"; - }; -} diff --git a/pijul.nix b/pijul.nix deleted file mode 100644 index 7123573..0000000 --- a/pijul.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, rustPlatform, darwin, libsodium, pkgconfig, openssl }: - -with rustPlatform; - -buildRustPackage rec { - name = "pijul-${version}"; - version = "0.11.0"; - - src = fetchurl { - url = "https://pijul.org/releases/${name}.tar.gz"; - sha256 = "1rdmnvl9mg3782b4sdmmzarfn1z5pan9i5jhsp0m942f2amr61z6"; - }; - - sourceRoot = "${name}"; - - buildInputs = (stdenv.lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ Security ])) ++ [ libsodium pkgconfig openssl ]; - - doCheck = false; - - cargoSha256 = "1r76azmka1d76ff0ddfhzr24b0ry496qrp13945i3vs0fgzk2sdz"; - - meta = with stdenv.lib; { - description = "A distributed version control system"; - homepage = https://pijul.org; - license = with licenses; [ gpl2Plus ]; - maintainers = [ maintainers.gal_bolle ]; - platforms = platforms.all; - }; -} diff --git a/rq/default.nix b/rq/default.nix deleted file mode 100644 index f7752c0..0000000 --- a/rq/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, python2Packages, gnupg }: - -python2Packages.buildPythonPackage rec { - pname = "rq"; - version = "0.11.0"; - - src = python2Packages.fetchPypi { - inherit pname version; - sha256 = "0ny1phglqp884phzl3nh9kzxx9r4qiw2ymv2j67g7bk9bs6d55zr"; - }; - - buildInputs = with python2Packages; [ click redis ]; - - meta = with stdenv.lib; { - maintainers = [ maintainers.spacefrogg ]; - description = "Simple and lightweight library for creating background jobs using redis"; - license = licenses.bsd2; - }; -} diff --git a/simgear.nix b/simgear.nix deleted file mode 100644 index 1ecd371..0000000 --- a/simgear.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, plib, freeglut, xproto, libX11, libXext, xextproto, libXi -, inputproto, libICE, libSM, libXt, libXmu, libGLU, boost, zlib, libjpeg, freealut -, openscenegraph, openal, expat, cmake, apr -, curl -}: - -stdenv.mkDerivation rec { - name = "simgear-${version}"; - version = "2017.2.1"; - shortVersion = "2017.2"; - - src = fetchurl { - url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2"; - sha256 = "17ksghj6rqip8r73ygapzdlyrkkqfqxw87gzl1kashfb04n5j94r"; - }; - - buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto - libICE libSM libXt libXmu libGLU boost zlib libjpeg freealut - openscenegraph openal expat cmake apr curl ]; - - meta = with stdenv.lib; { - description = "Simulation construction toolkit"; - homepage = https://gitorious.org/fg/simgear; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - license = licenses.lgpl2; - }; -} -