diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2014-11-05 11:12:35 +0300 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2014-11-05 11:56:19 +0300 |
commit | bc5f55cc91e70896c99fb55d4b299c286a6a935b (patch) | |
tree | f5e1dee31f9fa311d41b7f75f74244d773b78fb1 /pkgs | |
parent | 167115f1a26644d00b8d942166c964ac6dc4b1e9 (diff) |
Adopt a few packages
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/data/fonts/clearlyU/default.nix | 1 | ||||
-rw-r--r-- | pkgs/data/fonts/ucs-fonts/default.nix | 1 | ||||
-rw-r--r-- | pkgs/games/fsg/default.nix | 3 | ||||
-rw-r--r-- | pkgs/games/xsokoban/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/X11/xlaunch/default.nix | 108 | ||||
-rw-r--r-- | pkgs/tools/archivers/p7zip/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/archivers/xarchive/default.nix | 2 |
7 files changed, 64 insertions, 54 deletions
diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index 2761ed6f3e69..b4750c90faad 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { meta = { description = "A Unicode font"; + maintainers = [stdenv.lib.maintainers.raskin]; }; } diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index 1d2aa5e62d3b..bcba39571098 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -34,5 +34,6 @@ wrapFonts (stdenv.mkDerivation { meta = { description = "Unicode bitmap fonts"; + maintainers = [stdenv.lib.maintainers.raskin]; }; }) diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index a4579ad2ae36..12182b8712c5 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand"; + description = "Cellular automata engine tuned towards the likes of Falling Sand"; + maintainers = [stdenv.lib.maintainers.raskin]; }; } diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index b8c6096b756f..3a2cdb44d553 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -45,5 +45,7 @@ rec { name = "xsokoban-" + version; meta = { description = "X sokoban"; + license = a.stdemv.lib.licenses.publicDomain; + maintainers = [ a.stdenv.lib.maintainers.raskin ]; }; } diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix index b97c9def8227..06dfd28b7399 100644 --- a/pkgs/tools/X11/xlaunch/default.nix +++ b/pkgs/tools/X11/xlaunch/default.nix @@ -3,57 +3,61 @@ # !!! What does this package do, and does it belong in Nixpkgs? stdenv.mkDerivation { - name = "xlaunch"; - inherit xorgserver; - buildCommand = " - cat << EOF > realizeuid.c - #include <sys/types.h> - #include <unistd.h> - #include <stdio.h> - int main(int argc, char ** argv, char ** envp) - { - uid_t a,b,c; - int i; - char *nargv[10000]; - char arg1 [10]; - nargv[0]=argv[0]; - for (i=1; i<=argc; i++){ - nargv[i+1]=argv[i]; - } - nargv[1]=arg1; - getresuid (&a,&b,&c); - snprintf(arg1,8,\"%d\",a); - setresuid(c,c,c); - execve(\"\$out/libexec/xlaunch\", nargv, envp); - } + name = "xlaunch"; + inherit xorgserver; + buildCommand = " + cat << EOF > realizeuid.c + #include <sys/types.h> + #include <unistd.h> + #include <stdio.h> + int main(int argc, char ** argv, char ** envp) + { + uid_t a,b,c; + int i; + char *nargv[10000]; + char arg1 [10]; + nargv[0]=argv[0]; + for (i=1; i<=argc; i++){ + nargv[i+1]=argv[i]; + } + nargv[1]=arg1; + getresuid (&a,&b,&c); + snprintf(arg1,8,\"%d\",a); + setresuid(c,c,c); + execve(\"\$out/libexec/xlaunch\", nargv, envp); + } EOF - mkdir -p \$out/bin - mkdir -p \$out/libexec - gcc realizeuid.c -o \$out/bin/xlaunch - echo '#! ${stdenv.shell} - USER=\$(egrep '\\''^[-a-z0-9A-Z_]*:[^:]*:'\\''\$1'\\'':'\\'' /etc/passwd | sed -e '\\''s/:.*//'\\'' ) - shift - case \"\$1\" in - :*) export _display=\"\$1\"; - shift - esac - _display=\${_display:-:0} - _display=\${_display#:} - echo Using :\$_display - if [ -n \"\$DO_X_RESET\" ]; then - RESET_OPTION=\"-once\" - else - RESET_OPTION=\"-noreset\" - fi; - XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" - PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\" - echo \"\$PRE_XCMD\" - echo \"\$PRE_XCMD\" | bash - echo \"\$XCMD\" - echo \"\$XCMD\" | bash & - while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done - su -l \${USER:-identityless-shelter} -c \"DISPLAY=:\$_display \$*\"; - ' >\$out/libexec/xlaunch - chmod a+x \$out/libexec/xlaunch - "; + mkdir -p \$out/bin + mkdir -p \$out/libexec + gcc realizeuid.c -o \$out/bin/xlaunch + echo '#! ${stdenv.shell} + USER=\$(egrep '\\''^[-a-z0-9A-Z_]*:[^:]*:'\\''\$1'\\'':'\\'' /etc/passwd | sed -e '\\''s/:.*//'\\'' ) + shift + case \"\$1\" in + :*) export _display=\"\$1\"; + shift + esac + _display=\${_display:-:0} + _display=\${_display#:} + echo Using :\$_display + if [ -n \"\$DO_X_RESET\" ]; then + RESET_OPTION=\"-once\" + else + RESET_OPTION=\"-noreset\" + fi; + XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" + PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\" + echo \"\$PRE_XCMD\" + echo \"\$PRE_XCMD\" | bash + echo \"\$XCMD\" + echo \"\$XCMD\" | bash & + while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done + su -l \${USER:-identityless-shelter} -c \"DISPLAY=:\$_display \$*\"; + ' >\$out/libexec/xlaunch + chmod a+x \$out/libexec/xlaunch + "; + meta = { + description = ''Wrapper to parse NixOS-specific X environment and launch a custom X session''; + maintainers = [ stdenv.lib.maintainers.raskin ]; + }; } diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index cd0cea13a14d..0bf1ec736fca 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "A port of the 7-zip archiver"; # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction" platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.raskin ]; }; } diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix index 2b60bef197ab..ed60e3147a8f 100644 --- a/pkgs/tools/archivers/xarchive/default.nix +++ b/pkgs/tools/archivers/xarchive/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "A GTK+ front-end for command line archiving tools"; - mainatainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = [ stdenv.lib.maintainers.iElectric ]; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; |