From a54d720d0e2c81ae2375553418968f70a44be680 Mon Sep 17 00:00:00 2001 From: tdro Date: Sat, 13 Jan 2024 07:59:40 -0500 Subject: .config/nixpkgs: default.nix -> package.nix --- .config/nixpkgs/packages/boomer/default.nix | 55 ----------- .config/nixpkgs/packages/boomer/package.nix | 55 +++++++++++ .config/nixpkgs/packages/chromexup/default.nix | 29 ------ .config/nixpkgs/packages/chromexup/package.nix | 29 ++++++ .config/nixpkgs/packages/csstidy/default.nix | 33 ------- .config/nixpkgs/packages/csstidy/package.nix | 33 +++++++ .config/nixpkgs/packages/dmenu/default.nix | 32 ------- .config/nixpkgs/packages/dmenu/package.nix | 32 +++++++ .../packages/emacs-batch-indent/default.nix | 30 ------ .../packages/emacs-batch-indent/package.nix | 30 ++++++ .config/nixpkgs/packages/mkbootfs/default.nix | 26 ------ .config/nixpkgs/packages/mkbootfs/package.nix | 26 ++++++ .config/nixpkgs/packages/mkbootimg/default.nix | 27 ------ .config/nixpkgs/packages/mkbootimg/package.nix | 27 ++++++ .../nerdfonts-dejavu-sans-mono/default.nix | 29 ------ .../nerdfonts-dejavu-sans-mono/package.nix | 29 ++++++ .config/nixpkgs/packages/nixpkgs.lib/default.nix | 59 ------------ .config/nixpkgs/packages/nixpkgs.lib/package.nix | 59 ++++++++++++ .config/nixpkgs/packages/ntrviewer/default.nix | 39 -------- .config/nixpkgs/packages/ntrviewer/package.nix | 39 ++++++++ .config/nixpkgs/packages/pdf2htmlex/default.nix | 17 ---- .config/nixpkgs/packages/pdf2htmlex/package.nix | 17 ++++ .config/nixpkgs/packages/phar-composer/default.nix | 29 ------ .config/nixpkgs/packages/phar-composer/package.nix | 29 ++++++ .config/nixpkgs/packages/qprompt/default.nix | 30 ------ .config/nixpkgs/packages/qprompt/package.nix | 30 ++++++ .config/nixpkgs/packages/redbean/default.nix | 29 ------ .config/nixpkgs/packages/redbean/package.nix | 29 ++++++ .config/nixpkgs/packages/rofi/default.nix | 49 ---------- .config/nixpkgs/packages/rofi/package.nix | 49 ++++++++++ .../nixpkgs/packages/ruamel.yaml.cmd/default.nix | 85 ----------------- .../nixpkgs/packages/ruamel.yaml.cmd/package.nix | 85 +++++++++++++++++ .config/nixpkgs/packages/rxvt-unicode/default.nix | 102 --------------------- .config/nixpkgs/packages/rxvt-unicode/package.nix | 102 +++++++++++++++++++++ .config/nixpkgs/packages/sowon/default.nix | 30 ------ .config/nixpkgs/packages/sowon/package.nix | 30 ++++++ .config/nixpkgs/packages/systemd2nix/default.nix | 33 ------- .config/nixpkgs/packages/systemd2nix/package.nix | 33 +++++++ .config/nixpkgs/packages/tiemu/default.nix | 45 --------- .config/nixpkgs/packages/tiemu/package.nix | 45 +++++++++ .config/nixpkgs/packages/wf-shell/default.nix | 32 ------- .config/nixpkgs/packages/wf-shell/package.nix | 32 +++++++ .config/nixpkgs/packages/yaml2nix/default.nix | 20 ---- .config/nixpkgs/packages/yaml2nix/package.nix | 20 ++++ 44 files changed, 860 insertions(+), 860 deletions(-) delete mode 100644 .config/nixpkgs/packages/boomer/default.nix create mode 100644 .config/nixpkgs/packages/boomer/package.nix delete mode 100644 .config/nixpkgs/packages/chromexup/default.nix create mode 100644 .config/nixpkgs/packages/chromexup/package.nix delete mode 100644 .config/nixpkgs/packages/csstidy/default.nix create mode 100644 .config/nixpkgs/packages/csstidy/package.nix delete mode 100644 .config/nixpkgs/packages/dmenu/default.nix create mode 100644 .config/nixpkgs/packages/dmenu/package.nix delete mode 100644 .config/nixpkgs/packages/emacs-batch-indent/default.nix create mode 100644 .config/nixpkgs/packages/emacs-batch-indent/package.nix delete mode 100644 .config/nixpkgs/packages/mkbootfs/default.nix create mode 100644 .config/nixpkgs/packages/mkbootfs/package.nix delete mode 100644 .config/nixpkgs/packages/mkbootimg/default.nix create mode 100644 .config/nixpkgs/packages/mkbootimg/package.nix delete mode 100644 .config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/default.nix create mode 100644 .config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/package.nix delete mode 100644 .config/nixpkgs/packages/nixpkgs.lib/default.nix create mode 100644 .config/nixpkgs/packages/nixpkgs.lib/package.nix delete mode 100644 .config/nixpkgs/packages/ntrviewer/default.nix create mode 100644 .config/nixpkgs/packages/ntrviewer/package.nix delete mode 100644 .config/nixpkgs/packages/pdf2htmlex/default.nix create mode 100644 .config/nixpkgs/packages/pdf2htmlex/package.nix delete mode 100644 .config/nixpkgs/packages/phar-composer/default.nix create mode 100644 .config/nixpkgs/packages/phar-composer/package.nix delete mode 100644 .config/nixpkgs/packages/qprompt/default.nix create mode 100644 .config/nixpkgs/packages/qprompt/package.nix delete mode 100644 .config/nixpkgs/packages/redbean/default.nix create mode 100644 .config/nixpkgs/packages/redbean/package.nix delete mode 100644 .config/nixpkgs/packages/rofi/default.nix create mode 100644 .config/nixpkgs/packages/rofi/package.nix delete mode 100644 .config/nixpkgs/packages/ruamel.yaml.cmd/default.nix create mode 100644 .config/nixpkgs/packages/ruamel.yaml.cmd/package.nix delete mode 100644 .config/nixpkgs/packages/rxvt-unicode/default.nix create mode 100644 .config/nixpkgs/packages/rxvt-unicode/package.nix delete mode 100644 .config/nixpkgs/packages/sowon/default.nix create mode 100644 .config/nixpkgs/packages/sowon/package.nix delete mode 100644 .config/nixpkgs/packages/systemd2nix/default.nix create mode 100644 .config/nixpkgs/packages/systemd2nix/package.nix delete mode 100644 .config/nixpkgs/packages/tiemu/default.nix create mode 100644 .config/nixpkgs/packages/tiemu/package.nix delete mode 100644 .config/nixpkgs/packages/wf-shell/default.nix create mode 100644 .config/nixpkgs/packages/wf-shell/package.nix delete mode 100644 .config/nixpkgs/packages/yaml2nix/default.nix create mode 100644 .config/nixpkgs/packages/yaml2nix/package.nix (limited to '.config/nixpkgs/packages') diff --git a/.config/nixpkgs/packages/boomer/default.nix b/.config/nixpkgs/packages/boomer/default.nix deleted file mode 100644 index 885de27..0000000 --- a/.config/nixpkgs/packages/boomer/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchgit, makeWrapper, nim, libX11, libXrandr, libGL }: - -let - - x11-nim = fetchgit { - url = "https://github.com/nim-lang/x11"; - rev = "b7bae7dffa4e3f12370d5a18209359422ae8bedd"; - sha256 = "1j3kyp0vf2jl20c67gcm759jnfskdf0wc4ajrdbvfxias285c5sb"; - }; - - opengl-nim = fetchgit { - url = "https://github.com/nim-lang/opengl"; - rev = "a6fb649e5bd94d8420d4a11287092a4dc3e922b4"; - sha256 = "0w62lfrdms2vb24kd4jnypwmqvdk5x9my1dinnqdq82yl4nz6d0s"; - }; - -in stdenv.mkDerivation rec { - - pname = "boomer"; - version = "cc0f5311193da8361ee782a421d6bc4ad8541cf3"; - - src = fetchgit { - url = "https://github.com/tsoding/boomer"; - rev = version; - sha256 = "sha256-3yg0nuJE0Rrw13VEQ/CjjjPN5G4ytssgiesdXwlHaF8="; - }; - - buildInputs = [ nim libX11 libXrandr libGL makeWrapper ]; - - buildPhase = '' - runHook preBuild - HOME=$TMPDIR - nim -p:${x11-nim}/ -p:${opengl-nim}/src c -d:release src/boomer.nim - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -Dt $out/bin src/boomer - runHook postInstall - ''; - - fixupPhase = '' - runHook preFixup - patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc libX11 libXrandr libGL ]} $out/bin/boomer - wrapProgram "$out/bin/boomer" --set LIBGL_ALWAYS_SOFTWARE 1 - runHook postFixup - ''; - - meta = with lib; { - license = licenses.mit; - platforms = platforms.linux; - homepage = "https://github.com/tsoding/boomer"; - }; -} diff --git a/.config/nixpkgs/packages/boomer/package.nix b/.config/nixpkgs/packages/boomer/package.nix new file mode 100644 index 0000000..885de27 --- /dev/null +++ b/.config/nixpkgs/packages/boomer/package.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, fetchgit, makeWrapper, nim, libX11, libXrandr, libGL }: + +let + + x11-nim = fetchgit { + url = "https://github.com/nim-lang/x11"; + rev = "b7bae7dffa4e3f12370d5a18209359422ae8bedd"; + sha256 = "1j3kyp0vf2jl20c67gcm759jnfskdf0wc4ajrdbvfxias285c5sb"; + }; + + opengl-nim = fetchgit { + url = "https://github.com/nim-lang/opengl"; + rev = "a6fb649e5bd94d8420d4a11287092a4dc3e922b4"; + sha256 = "0w62lfrdms2vb24kd4jnypwmqvdk5x9my1dinnqdq82yl4nz6d0s"; + }; + +in stdenv.mkDerivation rec { + + pname = "boomer"; + version = "cc0f5311193da8361ee782a421d6bc4ad8541cf3"; + + src = fetchgit { + url = "https://github.com/tsoding/boomer"; + rev = version; + sha256 = "sha256-3yg0nuJE0Rrw13VEQ/CjjjPN5G4ytssgiesdXwlHaF8="; + }; + + buildInputs = [ nim libX11 libXrandr libGL makeWrapper ]; + + buildPhase = '' + runHook preBuild + HOME=$TMPDIR + nim -p:${x11-nim}/ -p:${opengl-nim}/src c -d:release src/boomer.nim + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dt $out/bin src/boomer + runHook postInstall + ''; + + fixupPhase = '' + runHook preFixup + patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc libX11 libXrandr libGL ]} $out/bin/boomer + wrapProgram "$out/bin/boomer" --set LIBGL_ALWAYS_SOFTWARE 1 + runHook postFixup + ''; + + meta = with lib; { + license = licenses.mit; + platforms = platforms.linux; + homepage = "https://github.com/tsoding/boomer"; + }; +} diff --git a/.config/nixpkgs/packages/chromexup/default.nix b/.config/nixpkgs/packages/chromexup/default.nix deleted file mode 100644 index c6c4622..0000000 --- a/.config/nixpkgs/packages/chromexup/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchgit, python38 }: - -with python38.pkgs; - -buildPythonApplication rec { - - pname = "chromexup"; - version = "8eae4e04a3d6fa4838bb8e782b84cdb2edc8540f"; - - src = fetchgit { - rev = version; - url = "https://github.com/xsmile/chromexup.git"; - sha256 = "0kiqh5zc2rs73amrmj0hrpxccd2qpd3f9zwj7q9i6k7ii5mzw357"; - }; - - propagatedBuildInputs = [ requests ]; - - postInstall = '' - cp config.ini.example $out - cp -rT scripts/systemd $out - ''; - - meta = with lib; { - license = licenses.mit; - inherit (src.meta) homepage; - platforms = platforms.linux; - description = "External extension updater for Chromium based browsers"; - }; -} diff --git a/.config/nixpkgs/packages/chromexup/package.nix b/.config/nixpkgs/packages/chromexup/package.nix new file mode 100644 index 0000000..c6c4622 --- /dev/null +++ b/.config/nixpkgs/packages/chromexup/package.nix @@ -0,0 +1,29 @@ +{ lib, fetchgit, python38 }: + +with python38.pkgs; + +buildPythonApplication rec { + + pname = "chromexup"; + version = "8eae4e04a3d6fa4838bb8e782b84cdb2edc8540f"; + + src = fetchgit { + rev = version; + url = "https://github.com/xsmile/chromexup.git"; + sha256 = "0kiqh5zc2rs73amrmj0hrpxccd2qpd3f9zwj7q9i6k7ii5mzw357"; + }; + + propagatedBuildInputs = [ requests ]; + + postInstall = '' + cp config.ini.example $out + cp -rT scripts/systemd $out + ''; + + meta = with lib; { + license = licenses.mit; + inherit (src.meta) homepage; + platforms = platforms.linux; + description = "External extension updater for Chromium based browsers"; + }; +} diff --git a/.config/nixpkgs/packages/csstidy/default.nix b/.config/nixpkgs/packages/csstidy/default.nix deleted file mode 100644 index 5ccf7ff..0000000 --- a/.config/nixpkgs/packages/csstidy/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchgit, sconsPackages, gcc }: - -stdenv.mkDerivation rec { - - pname = "csstidy"; - version = "8a5e5d4885bb5eda1d6035a7e5c9cfb163714048"; - - src = fetchgit { - rev = version; - url = "https://github.com/dmitryleskov/csstidy-cpp.git"; - sha256 = "1bf4b7cywrdb5kbnh98f5r2l2wxy5ny9snfw7czr44mykzwdjayr"; - }; - - buildInputs = [ sconsPackages.scons_3_0_1 ]; - - preBuild = '' - sed --in-place "/env = Environment()/a env.Replace(CXX='${gcc}/bin/g++')" SConstruct - ''; - - installPhase = '' - runHook preInstall - mkdir --parents $out/bin - cp release/csstidy/csstidy $out/bin - runHook postInstall - ''; - - meta = with lib; { - license = licenses.lgpl21; - inherit (src.meta) homepage; - platforms = platforms.linux; - description = "Fork of CSSTidy: A program that optimises, formats and fixes CSS code"; - }; -} diff --git a/.config/nixpkgs/packages/csstidy/package.nix b/.config/nixpkgs/packages/csstidy/package.nix new file mode 100644 index 0000000..5ccf7ff --- /dev/null +++ b/.config/nixpkgs/packages/csstidy/package.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchgit, sconsPackages, gcc }: + +stdenv.mkDerivation rec { + + pname = "csstidy"; + version = "8a5e5d4885bb5eda1d6035a7e5c9cfb163714048"; + + src = fetchgit { + rev = version; + url = "https://github.com/dmitryleskov/csstidy-cpp.git"; + sha256 = "1bf4b7cywrdb5kbnh98f5r2l2wxy5ny9snfw7czr44mykzwdjayr"; + }; + + buildInputs = [ sconsPackages.scons_3_0_1 ]; + + preBuild = '' + sed --in-place "/env = Environment()/a env.Replace(CXX='${gcc}/bin/g++')" SConstruct + ''; + + installPhase = '' + runHook preInstall + mkdir --parents $out/bin + cp release/csstidy/csstidy $out/bin + runHook postInstall + ''; + + meta = with lib; { + license = licenses.lgpl21; + inherit (src.meta) homepage; + platforms = platforms.linux; + description = "Fork of CSSTidy: A program that optimises, formats and fixes CSS code"; + }; +} diff --git a/.config/nixpkgs/packages/dmenu/default.nix b/.config/nixpkgs/packages/dmenu/default.nix deleted file mode 100644 index f0f933c..0000000 --- a/.config/nixpkgs/packages/dmenu/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchgit, libX11, libXinerama, libXft, zlib }: - -stdenv.mkDerivation rec { - name = "dmenu"; - version = "9b0be7712e2aae65b459f758a080c56983056021"; - - src = fetchgit { - rev = version; - url = "https://www.thedroneely.com/git/thedroneely/dmenu/"; - sha256 = "0sbwwxbm5bcn0m4s1y2gl90wc224kf6755d1xdr23bz5ihy3jzg2"; - }; - - buildInputs = [ libX11 libXinerama zlib libXft ]; - - postPatch = '' - sed -ri -e 's!\<(dmenu|dmenu_path|stest)\>!'"$out/bin"'/&!g' dmenu_run - sed -ri -e 's!\!'"$out/bin"'/&!g' dmenu_path - ''; - - preConfigure = '' - sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk - ''; - - makeFlags = [ "CC:=$(CC)" ]; - - meta = { - license = lib.licenses.mit; - platforms = lib.platforms.all; - homepage = "https://tools.suckless.org/dmenu"; - description = "A generic, highly customizable, and efficient menu for the X Window System"; - }; -} diff --git a/.config/nixpkgs/packages/dmenu/package.nix b/.config/nixpkgs/packages/dmenu/package.nix new file mode 100644 index 0000000..f0f933c --- /dev/null +++ b/.config/nixpkgs/packages/dmenu/package.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchgit, libX11, libXinerama, libXft, zlib }: + +stdenv.mkDerivation rec { + name = "dmenu"; + version = "9b0be7712e2aae65b459f758a080c56983056021"; + + src = fetchgit { + rev = version; + url = "https://www.thedroneely.com/git/thedroneely/dmenu/"; + sha256 = "0sbwwxbm5bcn0m4s1y2gl90wc224kf6755d1xdr23bz5ihy3jzg2"; + }; + + buildInputs = [ libX11 libXinerama zlib libXft ]; + + postPatch = '' + sed -ri -e 's!\<(dmenu|dmenu_path|stest)\>!'"$out/bin"'/&!g' dmenu_run + sed -ri -e 's!\!'"$out/bin"'/&!g' dmenu_path + ''; + + preConfigure = '' + sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk + ''; + + makeFlags = [ "CC:=$(CC)" ]; + + meta = { + license = lib.licenses.mit; + platforms = lib.platforms.all; + homepage = "https://tools.suckless.org/dmenu"; + description = "A generic, highly customizable, and efficient menu for the X Window System"; + }; +} diff --git a/.config/nixpkgs/packages/emacs-batch-indent/default.nix b/.config/nixpkgs/packages/emacs-batch-indent/default.nix deleted file mode 100644 index 92042af..0000000 --- a/.config/nixpkgs/packages/emacs-batch-indent/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchgit }: - -stdenv.mkDerivation rec { - - name = "emacs-batch-indent"; - version = "145e8771b9709a82e3df82cdc06c6d9505de905d"; - url = "https://github.com/cwfoo/emacs-batch-indent"; - - src = fetchgit { - inherit url; - rev = version; - sha256 = "sha256-Qqg/ZLbfTZnH2aO7ZW2XiiVBqEvK2+LMo2Kz6HSnOCE="; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - runHook preInstall - mkdir --parents $out/bin - cp emacs-batch-indent $out/bin - runHook postInstall - ''; - - meta = with lib; { - homepage = url; - license = licenses.gpl3; - platforms = platforms.linux; - description = "Indent Common Lisp, Emacs Lisp, and Scheme from the command line using Emacs."; - }; -} diff --git a/.config/nixpkgs/packages/emacs-batch-indent/package.nix b/.config/nixpkgs/packages/emacs-batch-indent/package.nix new file mode 100644 index 0000000..92042af --- /dev/null +++ b/.config/nixpkgs/packages/emacs-batch-indent/package.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchgit }: + +stdenv.mkDerivation rec { + + name = "emacs-batch-indent"; + version = "145e8771b9709a82e3df82cdc06c6d9505de905d"; + url = "https://github.com/cwfoo/emacs-batch-indent"; + + src = fetchgit { + inherit url; + rev = version; + sha256 = "sha256-Qqg/ZLbfTZnH2aO7ZW2XiiVBqEvK2+LMo2Kz6HSnOCE="; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + runHook preInstall + mkdir --parents $out/bin + cp emacs-batch-indent $out/bin + runHook postInstall + ''; + + meta = with lib; { + homepage = url; + license = licenses.gpl3; + platforms = platforms.linux; + description = "Indent Common Lisp, Emacs Lisp, and Scheme from the command line using Emacs."; + }; +} diff --git a/.config/nixpkgs/packages/mkbootfs/default.nix b/.config/nixpkgs/packages/mkbootfs/default.nix deleted file mode 100644 index b8c6050..0000000 --- a/.config/nixpkgs/packages/mkbootfs/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchgit }: - -stdenv.mkDerivation rec { - - pname = "mkbootfs"; - url = "https://github.com/osm0sis/mkbootfs.git"; - version = "be612778c72ce848141eda99563960da5ff61389"; - - src = fetchgit { - inherit url; - rev = version; - sha256 = "09m9wblk9vnp10x9agqz1iaxp56xnpgvpncm949lcy5pbjlnvsnf"; - }; - - installPhase = '' - mkdir -p $out/bin - cp mkbootfs $out/bin - ''; - - meta = with lib; { - homepage = url; - platforms = platforms.linux; - license = licenses.unlicense; - description = "mkbootfs, forked and updated"; - }; -} diff --git a/.config/nixpkgs/packages/mkbootfs/package.nix b/.config/nixpkgs/packages/mkbootfs/package.nix new file mode 100644 index 0000000..b8c6050 --- /dev/null +++ b/.config/nixpkgs/packages/mkbootfs/package.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchgit }: + +stdenv.mkDerivation rec { + + pname = "mkbootfs"; + url = "https://github.com/osm0sis/mkbootfs.git"; + version = "be612778c72ce848141eda99563960da5ff61389"; + + src = fetchgit { + inherit url; + rev = version; + sha256 = "09m9wblk9vnp10x9agqz1iaxp56xnpgvpncm949lcy5pbjlnvsnf"; + }; + + installPhase = '' + mkdir -p $out/bin + cp mkbootfs $out/bin + ''; + + meta = with lib; { + homepage = url; + platforms = platforms.linux; + license = licenses.unlicense; + description = "mkbootfs, forked and updated"; + }; +} diff --git a/.config/nixpkgs/packages/mkbootimg/default.nix b/.config/nixpkgs/packages/mkbootimg/default.nix deleted file mode 100644 index 738fd33..0000000 --- a/.config/nixpkgs/packages/mkbootimg/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchgit }: - -stdenv.mkDerivation rec { - - pname = "mkbootimg"; - url = "https://github.com/osm0sis/mkbootimg.git"; - version = "8dd5b5b5c68bcf8ecdb5859aa7036df276efcc79"; - - src = fetchgit { - inherit url; - rev = version; - sha256 = "0l1xg2ifaznpkhi74kyrjr2sqsihzp99bdn1c6y0qwfxn6rgbxn2"; - }; - - installPhase = '' - mkdir -p $out/bin - cp mkbootimg $out/bin - cp unpackbootimg $out/bin - ''; - - meta = with lib; { - homepage = url; - platforms = platforms.linux; - license = licenses.unlicense; - description = "mkbootimg + unpackbootimg, forked and updated"; - }; -} diff --git a/.config/nixpkgs/packages/mkbootimg/package.nix b/.config/nixpkgs/packages/mkbootimg/package.nix new file mode 100644 index 0000000..738fd33 --- /dev/null +++ b/.config/nixpkgs/packages/mkbootimg/package.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchgit }: + +stdenv.mkDerivation rec { + + pname = "mkbootimg"; + url = "https://github.com/osm0sis/mkbootimg.git"; + version = "8dd5b5b5c68bcf8ecdb5859aa7036df276efcc79"; + + src = fetchgit { + inherit url; + rev = version; + sha256 = "0l1xg2ifaznpkhi74kyrjr2sqsihzp99bdn1c6y0qwfxn6rgbxn2"; + }; + + installPhase = '' + mkdir -p $out/bin + cp mkbootimg $out/bin + cp unpackbootimg $out/bin + ''; + + meta = with lib; { + homepage = url; + platforms = platforms.linux; + license = licenses.unlicense; + description = "mkbootimg + unpackbootimg, forked and updated"; + }; +} diff --git a/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/default.nix b/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/default.nix deleted file mode 100644 index 866a6af..0000000 --- a/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - - pname = "nerdfonts-dejavu-sans-mono"; - version = "2.1.0"; - buildInputs = [ unzip ]; - - src = fetchurl { - url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/DejaVuSansMono.zip"; - sha256 = "03qfrkzmhnn8dwgx4qhiigbz4dxs3957hydlr0j8vxl89j8c9g1z"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - unpackPhase = '' unzip ${src} ''; - - installPhase = '' - runHook preInstall - mkdir --parents $out/share/fonts/nerdfonts-dejavu-sans-mono - cp --recursive * $out/share/fonts/nerdfonts-dejavu-sans-mono - runHook postInstall - ''; - - meta = with lib; { - license = licenses.mit; - platforms = platforms.all; - homepage = "https://github.com/ryanoasis/nerd-fonts"; - }; -} diff --git a/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/package.nix b/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/package.nix new file mode 100644 index 0000000..866a6af --- /dev/null +++ b/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/package.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + + pname = "nerdfonts-dejavu-sans-mono"; + version = "2.1.0"; + buildInputs = [ unzip ]; + + src = fetchurl { + url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/DejaVuSansMono.zip"; + sha256 = "03qfrkzmhnn8dwgx4qhiigbz4dxs3957hydlr0j8vxl89j8c9g1z"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + unpackPhase = '' unzip ${src} ''; + + installPhase = '' + runHook preInstall + mkdir --parents $out/share/fonts/nerdfonts-dejavu-sans-mono + cp --recursive * $out/share/fonts/nerdfonts-dejavu-sans-mono + runHook postInstall + ''; + + meta = with lib; { + license = licenses.mit; + platforms = platforms.all; + homepage = "https://github.com/ryanoasis/nerd-fonts"; + }; +} diff --git a/.config/nixpkgs/packages/nixpkgs.lib/default.nix b/.config/nixpkgs/packages/nixpkgs.lib/default.nix deleted file mode 100644 index 6f5c4e8..0000000 --- a/.config/nixpkgs/packages/nixpkgs.lib/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv, fetchgit, writeTextFile }: - -stdenv.mkDerivation rec { - - pname = "nixpkgs.lib"; - version = "f9d58ee370835f4c658cd0a62e8def4bda8b1f32"; - - src = fetchgit { - url = "https://github.com/nix-community/nixpkgs.lib.git"; - sha256 = "sha256-KnumcE6UuNQPapsr32KjcRVDVuRGWB5PnAczHoo9nJc="; - rev = version; - }; - - installPhase = '' - runHook preInstall - mkdir --parents $out - cp --recursive --no-target-directory $src $out - runHook postInstall - ''; - - patches = [ - (writeTextFile { - name = "remove-nonexistent-external-calls.patch"; - text = '' - --- a/lib/default.nix - +++ b/lib/default.nix - @@ -24,8 +24,8 @@ let - # packaging - customisation = callLibs ./customisation.nix; - derivations = callLibs ./derivations.nix; - - maintainers = import ../maintainers/maintainer-list.nix; - - teams = callLibs ../maintainers/team-list.nix; - + maintainers = { }; - + teams = { }; - meta = callLibs ./meta.nix; - sources = callLibs ./sources.nix; - versions = callLibs ./versions.nix; - diff --git a/lib/trivial.nix b/lib/trivial.nix - index 5d4fad8..d679563 100644 - --- a/lib/trivial.nix - +++ b/lib/trivial.nix - @@ -164,7 +164,7 @@ rec { - version = release + versionSuffix; - - /* Returns the current nixpkgs release number as string. */ - - release = lib.strings.fileContents ../.version; - + release = ""; - - /* The latest release that is supported, at the time of release branch-off, - if applicable. - ''; - }) - ]; - - meta = with lib; { - description = "nixpkgs lib for cheap instantiation "; - homepage = "https://github.com/nix-community/nixpkgs.lib"; - }; -} diff --git a/.config/nixpkgs/packages/nixpkgs.lib/package.nix b/.config/nixpkgs/packages/nixpkgs.lib/package.nix new file mode 100644 index 0000000..6f5c4e8 --- /dev/null +++ b/.config/nixpkgs/packages/nixpkgs.lib/package.nix @@ -0,0 +1,59 @@ +{ lib, stdenv, fetchgit, writeTextFile }: + +stdenv.mkDerivation rec { + + pname = "nixpkgs.lib"; + version = "f9d58ee370835f4c658cd0a62e8def4bda8b1f32"; + + src = fetchgit { + url = "https://github.com/nix-community/nixpkgs.lib.git"; + sha256 = "sha256-KnumcE6UuNQPapsr32KjcRVDVuRGWB5PnAczHoo9nJc="; + rev = version; + }; + + installPhase = '' + runHook preInstall + mkdir --parents $out + cp --recursive --no-target-directory $src $out + runHook postInstall + ''; + + patches = [ + (writeTextFile { + name = "remove-nonexistent-external-calls.patch"; + text = '' + --- a/lib/default.nix + +++ b/lib/default.nix + @@ -24,8 +24,8 @@ let + # packaging + customisation = callLibs ./customisation.nix; + derivations = callLibs ./derivations.nix; + - maintainers = import ../maintainers/maintainer-list.nix; + - teams = callLibs ../maintainers/team-list.nix; + + maintainers = { }; + + teams = { }; + meta = callLibs ./meta.nix; + sources = callLibs ./sources.nix; + versions = callLibs ./versions.nix; + diff --git a/lib/trivial.nix b/lib/trivial.nix + index 5d4fad8..d679563 100644 + --- a/lib/trivial.nix + +++ b/lib/trivial.nix + @@ -164,7 +164,7 @@ rec { + version = release + versionSuffix; + + /* Returns the current nixpkgs release number as string. */ + - release = lib.strings.fileContents ../.version; + + release = ""; + + /* The latest release that is supported, at the time of release branch-off, + if applicable. + ''; + }) + ]; + + meta = with lib; { + description = "nixpkgs lib for cheap instantiation "; + homepage = "https://github.com/nix-community/nixpkgs.lib"; + }; +} diff --git a/.config/nixpkgs/packages/ntrviewer/default.nix b/.config/nixpkgs/packages/ntrviewer/default.nix deleted file mode 100644 index af155bf..0000000 --- a/.config/nixpkgs/packages/ntrviewer/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libjpeg, ffmpeg, SDL }: - -stdenv.mkDerivation rec { - pname = "ntrviewer"; - version = "f1a8300d25a9e4253b2193c9ef12d08bd5334133"; - - src = fetchFromGitHub { - sha256 = "09csb3ra9yfskwzbjaqpnyy8nl7752k7jy7l9dw45jpgliav1fa2"; - rev = version; - repo = pname; - owner = "44670"; - }; - - buildInputs = [ libjpeg ffmpeg SDL ]; - - patches = [ - (fetchpatch { - name = "ntrviewer.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/ntrviewer.patch?h=ntrviewer-git&id=7ae6776d6db1476ee9df8cac7a933167a1bc3d25"; - sha256 = "0lw1zmm4fdjb09iqsw593pdv4p36q77zq5lb2qh0xqcaf2ll84z5"; - }) - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - cp dist/Debug/GNU-Linux/ntrviewer $out/bin - cp ntrviewer.1 $out/share/man/man1 - runHook postInstall - ''; - - meta = with lib; { - license = licenses.gpl3; - inherit (src.meta) homepage; - platforms = platforms.linux; - description = "PC Viewer for 3DS NTR CFW's streaming feature."; - }; -} diff --git a/.config/nixpkgs/packages/ntrviewer/package.nix b/.config/nixpkgs/packages/ntrviewer/package.nix new file mode 100644 index 0000000..af155bf --- /dev/null +++ b/.config/nixpkgs/packages/ntrviewer/package.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, libjpeg, ffmpeg, SDL }: + +stdenv.mkDerivation rec { + pname = "ntrviewer"; + version = "f1a8300d25a9e4253b2193c9ef12d08bd5334133"; + + src = fetchFromGitHub { + sha256 = "09csb3ra9yfskwzbjaqpnyy8nl7752k7jy7l9dw45jpgliav1fa2"; + rev = version; + repo = pname; + owner = "44670"; + }; + + buildInputs = [ libjpeg ffmpeg SDL ]; + + patches = [ + (fetchpatch { + name = "ntrviewer.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/ntrviewer.patch?h=ntrviewer-git&id=7ae6776d6db1476ee9df8cac7a933167a1bc3d25"; + sha256 = "0lw1zmm4fdjb09iqsw593pdv4p36q77zq5lb2qh0xqcaf2ll84z5"; + }) + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + cp dist/Debug/GNU-Linux/ntrviewer $out/bin + cp ntrviewer.1 $out/share/man/man1 + runHook postInstall + ''; + + meta = with lib; { + license = licenses.gpl3; + inherit (src.meta) homepage; + platforms = platforms.linux; + description = "PC Viewer for 3DS NTR CFW's streaming feature."; + }; +} diff --git a/.config/nixpkgs/packages/pdf2htmlex/default.nix b/.config/nixpkgs/packages/pdf2htmlex/default.nix deleted file mode 100644 index 82021ef..0000000 --- a/.config/nixpkgs/packages/pdf2htmlex/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, fetchurl, appimageTools }: - -appimageTools.wrapType2 rec { - name = "pdf2htmlex"; - version = "0.18.8.rc1"; - - src = fetchurl { - url = "https://github.com/pdf2htmlEX/pdf2htmlEX/releases/download/v${version}/pdf2htmlEX-${version}-master-20200630-Ubuntu-focal-x86_64.AppImage"; - sha256 = "sha256-Ed4lg6Orzl8UH9f6+x/qLGexWIblRta3Z1xgABLmq4w="; - }; - - meta = with lib; { - license = licenses.gpl3; - platforms = platforms.linux; - description = "Convert PDF to HTML without losing text or format. "; - }; -} diff --git a/.config/nixpkgs/packages/pdf2htmlex/package.nix b/.config/nixpkgs/packages/pdf2htmlex/package.nix new file mode 100644 index 0000000..82021ef --- /dev/null +++ b/.config/nixpkgs/packages/pdf2htmlex/package.nix @@ -0,0 +1,17 @@ +{ lib, fetchurl, appimageTools }: + +appimageTools.wrapType2 rec { + name = "pdf2htmlex"; + version = "0.18.8.rc1"; + + src = fetchurl { + url = "https://github.com/pdf2htmlEX/pdf2htmlEX/releases/download/v${version}/pdf2htmlEX-${version}-master-20200630-Ubuntu-focal-x86_64.AppImage"; + sha256 = "sha256-Ed4lg6Orzl8UH9f6+x/qLGexWIblRta3Z1xgABLmq4w="; + }; + + meta = with lib; { + license = licenses.gpl3; + platforms = platforms.linux; + description = "Convert PDF to HTML without losing text or format. "; + }; +} diff --git a/.config/nixpkgs/packages/phar-composer/default.nix b/.config/nixpkgs/packages/phar-composer/default.nix deleted file mode 100644 index 79ee71b..0000000 --- a/.config/nixpkgs/packages/phar-composer/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, lib, php }: - -stdenv.mkDerivation rec { - - pname = "phar-composer"; - version = "1.4.0"; - - src = fetchurl { - url = "https://github.com/clue/${pname}/releases/download/v${version}/${pname}-${version}.phar"; - sha256 = "sha256-GUKo/l8b0UkQpGHsyagjgtAkZbfmjdhWOXkZT5vLB8A="; - }; - - dontUnpack = true; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - mkdir --parents $out/bin - install -D $src $out/libexec/${pname}/${pname}.phar - makeWrapper ${php}/bin/php $out/bin/${pname} --add-flags "$out/libexec/${pname}/${pname}.phar" - runHook postInstall - ''; - - meta = { - license = lib.licenses.mit; - homepage = "https://github.com/clue/phar-composer#readme"; - description = "Simple phar creation for every PHP project managed via Composer."; - }; -} diff --git a/.config/nixpkgs/packages/phar-composer/package.nix b/.config/nixpkgs/packages/phar-composer/package.nix new file mode 100644 index 0000000..79ee71b --- /dev/null +++ b/.config/nixpkgs/packages/phar-composer/package.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, makeWrapper, lib, php }: + +stdenv.mkDerivation rec { + + pname = "phar-composer"; + version = "1.4.0"; + + src = fetchurl { + url = "https://github.com/clue/${pname}/releases/download/v${version}/${pname}-${version}.phar"; + sha256 = "sha256-GUKo/l8b0UkQpGHsyagjgtAkZbfmjdhWOXkZT5vLB8A="; + }; + + dontUnpack = true; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir --parents $out/bin + install -D $src $out/libexec/${pname}/${pname}.phar + makeWrapper ${php}/bin/php $out/bin/${pname} --add-flags "$out/libexec/${pname}/${pname}.phar" + runHook postInstall + ''; + + meta = { + license = lib.licenses.mit; + homepage = "https://github.com/clue/phar-composer#readme"; + description = "Simple phar creation for every PHP project managed via Composer."; + }; +} diff --git a/.config/nixpkgs/packages/qprompt/default.nix b/.config/nixpkgs/packages/qprompt/default.nix deleted file mode 100644 index 67a4c83..0000000 --- a/.config/nixpkgs/packages/qprompt/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchgit, cmake, extra-cmake-modules, qt5, libsForQt5 }: - -stdenv.mkDerivation rec { - name = "qprompt"; - version = "v1.1.2"; - - src = fetchgit { - rev = version; - url = "https://github.com/Cuperino/QPrompt.git"; - sha256 = "sha256-EeLJC77X9lcjvbr+TkIpMHO0YFdI91tiVUplde3wEzA="; - }; - - buildInputs = [ - cmake - extra-cmake-modules - qt5.wrapQtAppsHook - qt5.qtquickcontrols2.dev - qt5.qtx11extras.dev - libsForQt5.ki18n.dev - libsForQt5.kcoreaddons.dev - libsForQt5.kiconthemes.dev - libsForQt5.kirigami2.dev - ]; - - meta = { - license = with lib.licenses; [ gpl3 cc-by-sa-40 ]; - homepage = "https://github.com/Cuperino/QPrompt#qprompt"; - description = "Personal teleprompter software for all video creators."; - }; -} diff --git a/.config/nixpkgs/packages/qprompt/package.nix b/.config/nixpkgs/packages/qprompt/package.nix new file mode 100644 index 0000000..67a4c83 --- /dev/null +++ b/.config/nixpkgs/packages/qprompt/package.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchgit, cmake, extra-cmake-modules, qt5, libsForQt5 }: + +stdenv.mkDerivation rec { + name = "qprompt"; + version = "v1.1.2"; + + src = fetchgit { + rev = version; + url = "https://github.com/Cuperino/QPrompt.git"; + sha256 = "sha256-EeLJC77X9lcjvbr+TkIpMHO0YFdI91tiVUplde3wEzA="; + }; + + buildInputs = [ + cmake + extra-cmake-modules + qt5.wrapQtAppsHook + qt5.qtquickcontrols2.dev + qt5.qtx11extras.dev + libsForQt5.ki18n.dev + libsForQt5.kcoreaddons.dev + libsForQt5.kiconthemes.dev + libsForQt5.kirigami2.dev + ]; + + meta = { + license = with lib.licenses; [ gpl3 cc-by-sa-40 ]; + homepage = "https://github.com/Cuperino/QPrompt#qprompt"; + description = "Personal teleprompter software for all video creators."; + }; +} diff --git a/.config/nixpkgs/packages/redbean/default.nix b/.config/nixpkgs/packages/redbean/default.nix deleted file mode 100644 index 7ede4c6..0000000 --- a/.config/nixpkgs/packages/redbean/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - - pname = "redbean"; - version = "2.0.1"; - - src = fetchurl { - url = "https://redbean.dev/redbean-${version}.com"; - sha256 = "sha256-W5GpecQdDwawkrkmENxSqCz40PkyrLh34FtiUwD7Kzk="; - }; - - dontFixup = true; - dontUnpack = true; - - installPhase = '' - runHook preInstall - mkdir --parents $out/bin - cp ${src} $out/bin/${pname}.com - chmod +x $out/bin/${pname}.com - runHook postInstall - ''; - - meta = with lib; { - license = licenses.isc; - platforms = platforms.all; - homepage = "https://github.com/jart/cosmopolitan"; - }; -} diff --git a/.config/nixpkgs/packages/redbean/package.nix b/.config/nixpkgs/packages/redbean/package.nix new file mode 100644 index 0000000..7ede4c6 --- /dev/null +++ b/.config/nixpkgs/packages/redbean/package.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + + pname = "redbean"; + version = "2.0.1"; + + src = fetchurl { + url = "https://redbean.dev/redbean-${version}.com"; + sha256 = "sha256-W5GpecQdDwawkrkmENxSqCz40PkyrLh34FtiUwD7Kzk="; + }; + + dontFixup = true; + dontUnpack = true; + + installPhase = '' + runHook preInstall + mkdir --parents $out/bin + cp ${src} $out/bin/${pname}.com + chmod +x $out/bin/${pname}.com + runHook postInstall + ''; + + meta = with lib; { + license = licenses.isc; + platforms = platforms.all; + homepage = "https://github.com/jart/cosmopolitan"; + }; +} diff --git a/.config/nixpkgs/packages/rofi/default.nix b/.config/nixpkgs/packages/rofi/default.nix deleted file mode 100644 index 420d2d2..0000000 --- a/.config/nixpkgs/packages/rofi/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, lib, fetchgit, autoreconfHook, pkg-config, libxkbcommon, pango -, which, git, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, xcb-util-cursor -, libstartup_notification, bison, flex, librsvg, check }: - -stdenv.mkDerivation rec { - pname = "rofi-unwrapped"; - version = "1.7.0"; - - src = fetchgit { - rev = version; - fetchSubmodules = true; - url = "https://github.com/davatorium/rofi.git"; - sha256 = "03wdy56b3g8p2czb0qydrddyyhj3x037pirnhyqr5qbfczb9a63v"; - }; - - preConfigure = '' - patchShebangs "script" - # root not present in build /etc/passwd - sed -i 's/~root/~nobody/g' test/helper-expand.c - ''; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ - libxkbcommon - pango - cairo - git - bison - flex - librsvg - check - libstartup_notification - libxcb - xcbutil - xcbutilwm - xcbutilxrm - xcb-util-cursor - which - ]; - - doCheck = false; - - meta = with lib; { - license = licenses.mit; - platforms = with platforms; linux; - homepage = "https://github.com/davatorium/rofi"; - description = "Window switcher, run dialog and dmenu replacement"; - }; -} diff --git a/.config/nixpkgs/packages/rofi/package.nix b/.config/nixpkgs/packages/rofi/package.nix new file mode 100644 index 0000000..420d2d2 --- /dev/null +++ b/.config/nixpkgs/packages/rofi/package.nix @@ -0,0 +1,49 @@ +{ stdenv, lib, fetchgit, autoreconfHook, pkg-config, libxkbcommon, pango +, which, git, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, xcb-util-cursor +, libstartup_notification, bison, flex, librsvg, check }: + +stdenv.mkDerivation rec { + pname = "rofi-unwrapped"; + version = "1.7.0"; + + src = fetchgit { + rev = version; + fetchSubmodules = true; + url = "https://github.com/davatorium/rofi.git"; + sha256 = "03wdy56b3g8p2czb0qydrddyyhj3x037pirnhyqr5qbfczb9a63v"; + }; + + preConfigure = '' + patchShebangs "script" + # root not present in build /etc/passwd + sed -i 's/~root/~nobody/g' test/helper-expand.c + ''; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ + libxkbcommon + pango + cairo + git + bison + flex + librsvg + check + libstartup_notification + libxcb + xcbutil + xcbutilwm + xcbutilxrm + xcb-util-cursor + which + ]; + + doCheck = false; + + meta = with lib; { + license = licenses.mit; + platforms = with platforms; linux; + homepage = "https://github.com/davatorium/rofi"; + description = "Window switcher, run dialog and dmenu replacement"; + }; +} diff --git a/.config/nixpkgs/packages/ruamel.yaml.cmd/default.nix b/.config/nixpkgs/packages/ruamel.yaml.cmd/default.nix deleted file mode 100644 index 362b4bd..0000000 --- a/.config/nixpkgs/packages/ruamel.yaml.cmd/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib, pkgs, python39 }: - -let - - meta = with lib; { - license = licenses.mit; - description = "Command line utility to manipulate YAML files"; - homepage = "https://sourceforge.net/p/ruamel-yaml-cmd/code/ci/default/tree"; - }; - - ruamel.std.argparse = python39.pkgs.buildPythonPackage rec { - pname = "ruamel.std.argparse"; - version = "0.8.3"; - src = python39.pkgs.fetchPypi { - inherit pname version; - sha256 = "0srv4g6jryyaz26csx315pbmfhm4rw8jhfsl7rq7krrglgqwjryi"; - }; - doCheck = false; - inherit meta; - }; - - ruamel.std.convert = python39.pkgs.buildPythonPackage rec { - pname = "ruamel.yaml.convert"; - version = "0.3.2"; - src = python39.pkgs.fetchPypi { - inherit pname version; - sha256 = "1i6919b5f5ygj7y7c4x0wi91n8y0mw4nf9f0bcfjk29i594xjph6"; - }; - propagatedBuildInputs = [ python39.pkgs.python-dateutil python39.pkgs.ruamel_yaml ]; - doCheck = false; - inherit meta; - }; - - ruamel.yaml.cmd = python39.pkgs.buildPythonPackage rec { - pname = "ruamel.yaml.cmd"; - version = "0.5.7"; - src = python39.pkgs.fetchPypi { - inherit pname version; - sha256 = "0w6ralskvjhswqsgxyqm5wpn0an7kj3v2mzf46ipp7b8xirjrc6r"; - }; - propagatedBuildInputs = [ python39.pkgs.configobj ruamel.std.argparse ruamel.std.convert ]; - patches = [ - (pkgs.writeTextFile { - name = "disable-backup-files.patch"; - text = '' - --- a/yaml_cmd.py 2020-12-14 22:13:19.000000000 -0500 - +++ b/yaml_cmd.py 2020-12-14 22:13:34.067115865 -0500 - @@ -513,8 +513,6 @@ - def round_trip_save(self, file_name): - inp = open(file_name).read() - backup_file_name = file_name + '.orig' - - if not os.path.exists(backup_file_name): - - os.rename(file_name, backup_file_name) - return self.round_trip_single(inp, out_file=file_name) - - def round_trip_input(self, inp): - ''; - }) - ]; - doCheck = false; - dontWrapPythonPrograms = true; - inherit meta; - }; - -in python39.pkgs.buildPythonApplication rec { - - pname = ruamel.yaml.cmd.pname; - version = ruamel.yaml.cmd.version; - propagatedBuildInputs = [ ruamel.yaml.cmd ]; - pythonEnvironment = python39.withPackages (_: propagatedBuildInputs); - - installPhase = '' - runHook preInstall - mkdir --parents $out/bin - cp ${ruamel.yaml.cmd}/bin/yaml $out/bin - sed --in-place 's|^#!.*$|#!${pythonEnvironment}/bin/python|' $out/bin/yaml - runHook postInstall - ''; - - dontUnpack = true; - dontBuild = true; - doCheck = false; - format = "other"; - inherit meta; -} diff --git a/.config/nixpkgs/packages/ruamel.yaml.cmd/package.nix b/.config/nixpkgs/packages/ruamel.yaml.cmd/package.nix new file mode 100644 index 0000000..362b4bd --- /dev/null +++ b/.config/nixpkgs/packages/ruamel.yaml.cmd/package.nix @@ -0,0 +1,85 @@ +{ lib, pkgs, python39 }: + +let + + meta = with lib; { + license = licenses.mit; + description = "Command line utility to manipulate YAML files"; + homepage = "https://sourceforge.net/p/ruamel-yaml-cmd/code/ci/default/tree"; + }; + + ruamel.std.argparse = python39.pkgs.buildPythonPackage rec { + pname = "ruamel.std.argparse"; + version = "0.8.3"; + src = python39.pkgs.fetchPypi { + inherit pname version; + sha256 = "0srv4g6jryyaz26csx315pbmfhm4rw8jhfsl7rq7krrglgqwjryi"; + }; + doCheck = false; + inherit meta; + }; + + ruamel.std.convert = python39.pkgs.buildPythonPackage rec { + pname = "ruamel.yaml.convert"; + version = "0.3.2"; + src = python39.pkgs.fetchPypi { + inherit pname version; + sha256 = "1i6919b5f5ygj7y7c4x0wi91n8y0mw4nf9f0bcfjk29i594xjph6"; + }; + propagatedBuildInputs = [ python39.pkgs.python-dateutil python39.pkgs.ruamel_yaml ]; + doCheck = false; + inherit meta; + }; + + ruamel.yaml.cmd = python39.pkgs.buildPythonPackage rec { + pname = "ruamel.yaml.cmd"; + version = "0.5.7"; + src = python39.pkgs.fetchPypi { + inherit pname version; + sha256 = "0w6ralskvjhswqsgxyqm5wpn0an7kj3v2mzf46ipp7b8xirjrc6r"; + }; + propagatedBuildInputs = [ python39.pkgs.configobj ruamel.std.argparse ruamel.std.convert ]; + patches = [ + (pkgs.writeTextFile { + name = "disable-backup-files.patch"; + text = '' + --- a/yaml_cmd.py 2020-12-14 22:13:19.000000000 -0500 + +++ b/yaml_cmd.py 2020-12-14 22:13:34.067115865 -0500 + @@ -513,8 +513,6 @@ + def round_trip_save(self, file_name): + inp = open(file_name).read() + backup_file_name = file_name + '.orig' + - if not os.path.exists(backup_file_name): + - os.rename(file_name, backup_file_name) + return self.round_trip_single(inp, out_file=file_name) + + def round_trip_input(self, inp): + ''; + }) + ]; + doCheck = false; + dontWrapPythonPrograms = true; + inherit meta; + }; + +in python39.pkgs.buildPythonApplication rec { + + pname = ruamel.yaml.cmd.pname; + version = ruamel.yaml.cmd.version; + propagatedBuildInputs = [ ruamel.yaml.cmd ]; + pythonEnvironment = python39.withPackages (_: propagatedBuildInputs); + + installPhase = '' + runHook preInstall + mkdir --parents $out/bin + cp ${ruamel.yaml.cmd}/bin/yaml $out/bin + sed --in-place 's|^#!.*$|#!${pythonEnvironment}/bin/python|' $out/bin/yaml + runHook postInstall + ''; + + dontUnpack = true; + dontBuild = true; + doCheck = false; + format = "other"; + inherit meta; +} diff --git a/.config/nixpkgs/packages/rxvt-unicode/default.nix b/.config/nixpkgs/packages/rxvt-unicode/default.nix deleted file mode 100644 index dd3540c..0000000 --- a/.config/nixpkgs/packages/rxvt-unicode/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, libX11, libXt, libXft, libXrender, ncurses -, fontconfig, freetype, pkg-config, gdk-pixbuf, perl, writeTextFile }: - -let - pname = "rxvt-unicode"; - version = "9.26"; - description = "A clone of the well-known terminal emulator rxvt"; - -in stdenv.mkDerivation { - - inherit pname version; - name = "${pname}-unwrapped-${version}"; - - src = fetchurl { - url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; - sha256 = "12y9p32q0v7n7rhjla0j2g9d5rj2dmwk20c9yhlssaaxlawiccb4"; - }; - - buildInputs = [ - fontconfig - freetype - gdk-pixbuf - libX11 - libXft - libXrender - libXt - ncurses - perl - pkg-config - ]; - - outputs = [ "out" "terminfo" ]; - - patches = [ - (fetchpatch { - name = "enable-wide-glyphs.patch"; - url = "https://raw.githubusercontent.com/owl4ce/nelumbonaceae/e6be9823ec9ab7c14a23f5a25dfb33ce705d9950/x11-terms/rxvt-unicode/files/enable-wide-glyphs.patch"; - sha256 = "0vfpidysc1kxr3zark2y1b8fxx7k2lck79ccb7b97mgz04mxchvd"; - }) - (fetchpatch { - name = "improve-font-rendering.patch"; - url = "https://raw.githubusercontent.com/owl4ce/nelumbonaceae/e6be9823ec9ab7c14a23f5a25dfb33ce705d9950/x11-terms/rxvt-unicode/files/improve-font-rendering.patch"; - sha256 = "0xkwvn204n679v4mgpw2dl4c30pdl622l6b2iw6sr0gijga8zqcd"; - }) - (fetchpatch { - name = "256-color-resources.patch"; - url = "https://raw.githubusercontent.com/NixOS/nixpkgs/2bb3a9da24ca60d9f5bed69f679a1ec50dbdf997/pkgs/applications/terminal-emulators/rxvt-unicode/patches/256-color-resources.patch"; - sha256 = "sha256-lz0naMdlu7+e2/+zP6KvGTI6exIS4qx+Tqr0OpUkXGI="; - }) - (fetchpatch { - name = "fixed-layout-size.patch"; - url = "https://raw.githubusercontent.com/owl4ce/nelumbonaceae/b593a0eb7bb45a0b471c2ee2aa02b0e66776b9c0/x11-terms/rxvt-unicode/files/fixed-layout-size.patch"; - sha256 = "148vpln61zs3qv4sipcc5c7fiyc4d4q6k10r7bpr0k0q4pzshljh"; - }) - (writeTextFile { - name = "silence-x-errors.patch"; - text = '' - --- a/src/main.C - +++ b/src/main.C - @@ -494,7 +494,7 @@ - #if ENABLE_MINIMAL - old_xerror_handler (display, event); - #else - - print_x_error (display, event); - + // print_x_error (display, event); - #endif - } - ''; - }) - ]; - - configureFlags = [ - "--enable-perl" - "--enable-unicode3" - "--enable-256-color" - "--enable-wide-glyphs" - "--with-terminfo=$terminfo/share/terminfo" - ]; - - CFLAGS = [ "-I${freetype.dev}/include/freetype2" ]; - LDFLAGS = [ "-lfontconfig" "-lXrender" "-lpthread" ]; - - preConfigure = '' - mkdir -p $terminfo/share/terminfo - export TERMINFO=$terminfo/share/terminfo - mkdir -p $out/$(dirname ${perl.libPrefix}) - ln -s $out/lib/urxvt $out/${perl.libPrefix} - ''; - - postInstall = '' - mkdir -p $out/nix-support - echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - ''; - - meta = { - inherit description; - license = lib.licenses.gpl3; - platforms = lib.platforms.unix; - downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; - homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; - }; -} diff --git a/.config/nixpkgs/packages/rxvt-unicode/package.nix b/.config/nixpkgs/packages/rxvt-unicode/package.nix new file mode 100644 index 0000000..dd3540c --- /dev/null +++ b/.config/nixpkgs/packages/rxvt-unicode/package.nix @@ -0,0 +1,102 @@ +{ lib, stdenv, fetchurl, fetchpatch, libX11, libXt, libXft, libXrender, ncurses +, fontconfig, freetype, pkg-config, gdk-pixbuf, perl, writeTextFile }: + +let + pname = "rxvt-unicode"; + version = "9.26"; + description = "A clone of the well-known terminal emulator rxvt"; + +in stdenv.mkDerivation { + + inherit pname version; + name = "${pname}-unwrapped-${version}"; + + src = fetchurl { + url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; + sha256 = "12y9p32q0v7n7rhjla0j2g9d5rj2dmwk20c9yhlssaaxlawiccb4"; + }; + + buildInputs = [ + fontconfig + freetype + gdk-pixbuf + libX11 + libXft + libXrender + libXt + ncurses + perl + pkg-config + ]; + + outputs = [ "out" "terminfo" ]; + + patches = [ + (fetchpatch { + name = "enable-wide-glyphs.patch"; + url = "https://raw.githubusercontent.com/owl4ce/nelumbonaceae/e6be9823ec9ab7c14a23f5a25dfb33ce705d9950/x11-terms/rxvt-unicode/files/enable-wide-glyphs.patch"; + sha256 = "0vfpidysc1kxr3zark2y1b8fxx7k2lck79ccb7b97mgz04mxchvd"; + }) + (fetchpatch { + name = "improve-font-rendering.patch"; + url = "https://raw.githubusercontent.com/owl4ce/nelumbonaceae/e6be9823ec9ab7c14a23f5a25dfb33ce705d9950/x11-terms/rxvt-unicode/files/improve-font-rendering.patch"; + sha256 = "0xkwvn204n679v4mgpw2dl4c30pdl622l6b2iw6sr0gijga8zqcd"; + }) + (fetchpatch { + name = "256-color-resources.patch"; + url = "https://raw.githubusercontent.com/NixOS/nixpkgs/2bb3a9da24ca60d9f5bed69f679a1ec50dbdf997/pkgs/applications/terminal-emulators/rxvt-unicode/patches/256-color-resources.patch"; + sha256 = "sha256-lz0naMdlu7+e2/+zP6KvGTI6exIS4qx+Tqr0OpUkXGI="; + }) + (fetchpatch { + name = "fixed-layout-size.patch"; + url = "https://raw.githubusercontent.com/owl4ce/nelumbonaceae/b593a0eb7bb45a0b471c2ee2aa02b0e66776b9c0/x11-terms/rxvt-unicode/files/fixed-layout-size.patch"; + sha256 = "148vpln61zs3qv4sipcc5c7fiyc4d4q6k10r7bpr0k0q4pzshljh"; + }) + (writeTextFile { + name = "silence-x-errors.patch"; + text = '' + --- a/src/main.C + +++ b/src/main.C + @@ -494,7 +494,7 @@ + #if ENABLE_MINIMAL + old_xerror_handler (display, event); + #else + - print_x_error (display, event); + + // print_x_error (display, event); + #endif + } + ''; + }) + ]; + + configureFlags = [ + "--enable-perl" + "--enable-unicode3" + "--enable-256-color" + "--enable-wide-glyphs" + "--with-terminfo=$terminfo/share/terminfo" + ]; + + CFLAGS = [ "-I${freetype.dev}/include/freetype2" ]; + LDFLAGS = [ "-lfontconfig" "-lXrender" "-lpthread" ]; + + preConfigure = '' + mkdir -p $terminfo/share/terminfo + export TERMINFO=$terminfo/share/terminfo + mkdir -p $out/$(dirname ${perl.libPrefix}) + ln -s $out/lib/urxvt $out/${perl.libPrefix} + ''; + + postInstall = '' + mkdir -p $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + + meta = { + inherit description; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; + downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; + homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; + }; +} diff --git a/.config/nixpkgs/packages/sowon/default.nix b/.config/nixpkgs/packages/sowon/default.nix deleted file mode 100644 index 38d06b0..0000000 --- a/.config/nixpkgs/packages/sowon/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchgit, SDL2, pkg-config }: - -stdenv.mkDerivation rec { - pname = "sowon"; - version = "85dbbd06e7f20fe0a727fcb34e5206c23894ff83"; - url = "https://github.com/tsoding/sowon.git"; - - src = fetchgit { - inherit url; - rev = version; - sha256 = "06gc1qsn5j902861qfbrixpjdmxyngrhvp312zz82k9gqjsacwyi"; - }; - - buildInputs = [ SDL2 ]; - nativeBuildInputs = [ pkg-config ]; - - installPhase = '' - runHook preInstall - mkdir --parents $out/bin - cp ${pname} $out/bin - runHook postInstall - ''; - - meta = with lib; { - homepage = url; - inherit version; - license = licenses.mit; - description = "Starting Soon Timer for Tsoding Streams"; - }; -} diff --git a/.config/nixpkgs/packages/sowon/package.nix b/.config/nixpkgs/packages/sowon/package.nix new file mode 100644 index 0000000..38d06b0 --- /dev/null +++ b/.config/nixpkgs/packages/sowon/package.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchgit, SDL2, pkg-config }: + +stdenv.mkDerivation rec { + pname = "sowon"; + version = "85dbbd06e7f20fe0a727fcb34e5206c23894ff83"; + url = "https://github.com/tsoding/sowon.git"; + + src = fetchgit { + inherit url; + rev = version; + sha256 = "06gc1qsn5j902861qfbrixpjdmxyngrhvp312zz82k9gqjsacwyi"; + }; + + buildInputs = [ SDL2 ]; + nativeBuildInputs = [ pkg-config ]; + + installPhase = '' + runHook preInstall + mkdir --parents $out/bin + cp ${pname} $out/bin + runHook postInstall + ''; + + meta = with lib; { + homepage = url; + inherit version; + license = licenses.mit; + description = "Starting Soon Timer for Tsoding Streams"; + }; +} diff --git a/.config/nixpkgs/packages/systemd2nix/default.nix b/.config/nixpkgs/packages/systemd2nix/default.nix deleted file mode 100644 index b4c6103..0000000 --- a/.config/nixpkgs/packages/systemd2nix/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, fetchgit, python38 }: - -python38.pkgs.buildPythonApplication rec { - - pname = "systemd2nix"; - url = "https://github.com/DavHau/systemd2nix"; - version = "bc9787b79187ae6ef7cd0da33a771693c99e04e1"; - - src = fetchgit { - inherit url; - rev = version; - sha256 = "03hc7v8cl8vzj1gpnxjwjkkbkh3c8g68ifvci2a5ggs0w83vrbrf"; - }; - - doCheck = false; - dontBuild = true; - format = "other"; - - installPhase = '' - runHook preInstall - mkdir --parents $out/bin $out/share/${pname} - cp ${src}/${pname}.py $out/share/${pname} - makeWrapper ${python38}/bin/python $out/bin/${pname} --add-flags $out/share/${pname}/${pname}.py - runHook postInstall - ''; - - meta = with lib; { - homepage = url; - license = licenses.mit; - platforms = platforms.linux; - description = "Convert systemd service files to Nix syntax"; - }; -} diff --git a/.config/nixpkgs/packages/systemd2nix/package.nix b/.config/nixpkgs/packages/systemd2nix/package.nix new file mode 100644 index 0000000..b4c6103 --- /dev/null +++ b/.config/nixpkgs/packages/systemd2nix/package.nix @@ -0,0 +1,33 @@ +{ lib, fetchgit, python38 }: + +python38.pkgs.buildPythonApplication rec { + + pname = "systemd2nix"; + url = "https://github.com/DavHau/systemd2nix"; + version = "bc9787b79187ae6ef7cd0da33a771693c99e04e1"; + + src = fetchgit { + inherit url; + rev = version; + sha256 = "03hc7v8cl8vzj1gpnxjwjkkbkh3c8g68ifvci2a5ggs0w83vrbrf"; + }; + + doCheck = false; + dontBuild = true; + format = "other"; + + installPhase = '' + runHook preInstall + mkdir --parents $out/bin $out/share/${pname} + cp ${src}/${pname}.py $out/share/${pname} + makeWrapper ${python38}/bin/python $out/bin/${pname} --add-flags $out/share/${pname}/${pname}.py + runHook postInstall + ''; + + meta = with lib; { + homepage = url; + license = licenses.mit; + platforms = platforms.linux; + description = "Convert systemd service files to Nix syntax"; + }; +} diff --git a/.config/nixpkgs/packages/tiemu/default.nix b/.config/nixpkgs/packages/tiemu/default.nix deleted file mode 100644 index f703981..0000000 --- a/.config/nixpkgs/packages/tiemu/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libticalcs2, libticables2 -, libtifiles2, libticonv, gnome2, gtk2, SDL, glib }: - -stdenv.mkDerivation rec { - name = "tiemu"; - version = "3.03"; - src = fetchurl { - url = "http://download.sourceforge.net/project/gtktiemu/tiemu-linux/TIEmu%20${version}/tiemu-${version}-nogdb.tar.gz"; - sha256 = "14m5p1ani7pz23z77h2hibl38sz0i5dpywdhkbr8v2i788487llj"; - }; - - hardeningDisable = [ "format" ]; - preConfigure = ''configureFlags="--without-kde --disable-gdb"''; - - buildInputs = [ - pkg-config - libticables2 - libticalcs2 - libtifiles2 - glib - libticonv - gtk2 - gnome2.libglade - SDL - ]; - - patches = [ - (fetchpatch { - name = "01-build-fix.patch"; - sha256 = "0p4qns6w1hfs3ci6pqpidd2ikjgvpvyd7bnsfj9cx06chwc9sysl"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/01-build-fix.patch?h=tiemu"; - }) - (fetchpatch { - name = "sysdeps.patch"; - sha256 = "1j6gns3vhykizxyb09670a65lafa1xd8wjyl45kvmysv250089z5"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/sysdeps.patch?h=tiemu"; - }) - ]; - - meta = with lib; { - license = licenses.gpl2; - platforms = platforms.linux; - homepage = "http://lpg.ticalc.org/prj_tiemu/"; - }; -} diff --git a/.config/nixpkgs/packages/tiemu/package.nix b/.config/nixpkgs/packages/tiemu/package.nix new file mode 100644 index 0000000..f703981 --- /dev/null +++ b/.config/nixpkgs/packages/tiemu/package.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libticalcs2, libticables2 +, libtifiles2, libticonv, gnome2, gtk2, SDL, glib }: + +stdenv.mkDerivation rec { + name = "tiemu"; + version = "3.03"; + src = fetchurl { + url = "http://download.sourceforge.net/project/gtktiemu/tiemu-linux/TIEmu%20${version}/tiemu-${version}-nogdb.tar.gz"; + sha256 = "14m5p1ani7pz23z77h2hibl38sz0i5dpywdhkbr8v2i788487llj"; + }; + + hardeningDisable = [ "format" ]; + preConfigure = ''configureFlags="--without-kde --disable-gdb"''; + + buildInputs = [ + pkg-config + libticables2 + libticalcs2 + libtifiles2 + glib + libticonv + gtk2 + gnome2.libglade + SDL + ]; + + patches = [ + (fetchpatch { + name = "01-build-fix.patch"; + sha256 = "0p4qns6w1hfs3ci6pqpidd2ikjgvpvyd7bnsfj9cx06chwc9sysl"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/01-build-fix.patch?h=tiemu"; + }) + (fetchpatch { + name = "sysdeps.patch"; + sha256 = "1j6gns3vhykizxyb09670a65lafa1xd8wjyl45kvmysv250089z5"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/sysdeps.patch?h=tiemu"; + }) + ]; + + meta = with lib; { + license = licenses.gpl2; + platforms = platforms.linux; + homepage = "http://lpg.ticalc.org/prj_tiemu/"; + }; +} diff --git a/.config/nixpkgs/packages/wf-shell/default.nix b/.config/nixpkgs/packages/wf-shell/default.nix deleted file mode 100644 index 46448b9..0000000 --- a/.config/nixpkgs/packages/wf-shell/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, lib, fetchgit, meson, ninja, pkg-config, wayland, alsa-lib, gtkmm3 -, gtk-layer-shell, pulseaudio, wayfire, wf-config, libdbusmenu-gtk3 }: - -stdenv.mkDerivation rec { - pname = "wf-shell"; - version = "9a9af00dc02780357466e27c5e77e316469e7a37"; - - src = fetchgit { - url = "https://github.com/WayfireWM/wf-shell"; - sha256 = "sha256-DoGW9rCEQFDO/SJ/ZWv2SPzC/acLFnPPncs683ugEvY="; - }; - - mesonFlags = [ "--sysconfdir" "/etc" ]; - nativeBuildInputs = [ meson ninja pkg-config wayland ]; - - buildInputs = [ - alsa-lib - gtk-layer-shell - gtkmm3 - libdbusmenu-gtk3 - pulseaudio - wayfire - wf-config - ]; - - meta = with lib; { - homepage = "https://github.com/WayfireWM/wf-shell"; - description = "GTK3-based panel for Wayfire"; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/.config/nixpkgs/packages/wf-shell/package.nix b/.config/nixpkgs/packages/wf-shell/package.nix new file mode 100644 index 0000000..46448b9 --- /dev/null +++ b/.config/nixpkgs/packages/wf-shell/package.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchgit, meson, ninja, pkg-config, wayland, alsa-lib, gtkmm3 +, gtk-layer-shell, pulseaudio, wayfire, wf-config, libdbusmenu-gtk3 }: + +stdenv.mkDerivation rec { + pname = "wf-shell"; + version = "9a9af00dc02780357466e27c5e77e316469e7a37"; + + src = fetchgit { + url = "https://github.com/WayfireWM/wf-shell"; + sha256 = "sha256-DoGW9rCEQFDO/SJ/ZWv2SPzC/acLFnPPncs683ugEvY="; + }; + + mesonFlags = [ "--sysconfdir" "/etc" ]; + nativeBuildInputs = [ meson ninja pkg-config wayland ]; + + buildInputs = [ + alsa-lib + gtk-layer-shell + gtkmm3 + libdbusmenu-gtk3 + pulseaudio + wayfire + wf-config + ]; + + meta = with lib; { + homepage = "https://github.com/WayfireWM/wf-shell"; + description = "GTK3-based panel for Wayfire"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/.config/nixpkgs/packages/yaml2nix/default.nix b/.config/nixpkgs/packages/yaml2nix/default.nix deleted file mode 100644 index af4ae38..0000000 --- a/.config/nixpkgs/packages/yaml2nix/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, rustPlatform, fetchgit }: - -rustPlatform.buildRustPackage rec { - pname = "yaml2nix"; - version = "b220acf4299376ee1b4131ca4c4248ebf0337d79"; - - src = fetchgit { - rev = version; - url = "https://github.com/euank/yaml2nix.git"; - sha256 = "1i7s18chpqckq16ljy9sh81zvambqkh4hvcyap6xi4yzp2h82198"; - }; - - cargoSha256 = "0bnkznzmyi7iyv4rlkfj8ikkx1ajfhvwd3rrmhrlbx6hbv554fkh"; - - meta = with lib; { - homepage = url; - license = licenses.gpl3; - description = "A command line tool to convert yaml into a nix expression."; - }; -} diff --git a/.config/nixpkgs/packages/yaml2nix/package.nix b/.config/nixpkgs/packages/yaml2nix/package.nix new file mode 100644 index 0000000..af4ae38 --- /dev/null +++ b/.config/nixpkgs/packages/yaml2nix/package.nix @@ -0,0 +1,20 @@ +{ lib, rustPlatform, fetchgit }: + +rustPlatform.buildRustPackage rec { + pname = "yaml2nix"; + version = "b220acf4299376ee1b4131ca4c4248ebf0337d79"; + + src = fetchgit { + rev = version; + url = "https://github.com/euank/yaml2nix.git"; + sha256 = "1i7s18chpqckq16ljy9sh81zvambqkh4hvcyap6xi4yzp2h82198"; + }; + + cargoSha256 = "0bnkznzmyi7iyv4rlkfj8ikkx1ajfhvwd3rrmhrlbx6hbv554fkh"; + + meta = with lib; { + homepage = url; + license = licenses.gpl3; + description = "A command line tool to convert yaml into a nix expression."; + }; +} -- cgit v1.2.3